From ac6a7845e6668fe03a356963c20c903be52d2905 Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Mon, 3 Jun 2024 07:29:51 -0500 Subject: [PATCH 1/3] Use conda-forge channels instead of default everywhere Use it to install conda-build, to install anaconda-client --- .github/workflows/conda-package.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 76faac0e6e..3b2bdae945 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -44,7 +44,7 @@ jobs: - name: Add conda to system path run: echo $CONDA/bin >> $GITHUB_PATH - name: Install conda-build - run: conda install conda-build + run: conda install conda-build -c conda-forge --override-channels - name: Store conda paths as envs shell: bash -l {0} run: | @@ -142,7 +142,7 @@ jobs: run: echo $CONDA/bin >> $GITHUB_PATH - name: Install conda-build # Needed to be able to run conda index - run: conda install conda-build + run: conda install conda-build -c conda-forge --override-channels - name: Create conda channel run: | mkdir -p $GITHUB_WORKSPACE/channel/linux-64 @@ -352,7 +352,7 @@ jobs: name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }} - name: Install anaconda-client - run: conda install anaconda-client + run: conda install anaconda-client -c conda-forge --override-channels - name: Add conda to system path run: echo $CONDA/bin >> $GITHUB_PATH - name: Package version @@ -393,7 +393,7 @@ jobs: activate-environment: "" - name: Install anaconda-client - run: conda install anaconda-client + run: conda install anaconda-client -c conda-forge --override-channels - name: Package version shell: bash -el {0} @@ -427,7 +427,7 @@ jobs: steps: - name: Install conda-build # Needed to be able to run conda index - run: conda install conda-build python=${{ matrix.python }} + run: conda install conda-build python=${{ matrix.python }} -c conda-forge --override-channels - name: Checkout dpctl repo uses: actions/checkout@v4.1.5 with: @@ -603,7 +603,7 @@ jobs: run: echo $CONDA/bin >> $GITHUB_PATH - name: Install conda-build # Needed to be able to run conda index - run: conda install conda-build + run: conda install conda-build -c conda-forge --override-channels - name: Create conda channel run: | mkdir -p $GITHUB_WORKSPACE/channel/linux-64 @@ -712,7 +712,7 @@ jobs: python-version: '3.11' - name: Install anaconda-client - run: conda install anaconda-client + run: conda install anaconda-client -c conda-forge --override-channels - name: Checkout repo uses: actions/checkout@v4.1.5 From d7068f04327bf562335e2d7f8d73d67809fca1b3 Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Mon, 3 Jun 2024 09:33:04 -0500 Subject: [PATCH 2/3] Install conda-index instead of conda-build when only 'conda index' is used --- .github/workflows/conda-package.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 3b2bdae945..cd3f9d8341 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -140,9 +140,9 @@ jobs: name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }} - name: Add conda to system path run: echo $CONDA/bin >> $GITHUB_PATH - - name: Install conda-build + - name: Install conda-index # Needed to be able to run conda index - run: conda install conda-build -c conda-forge --override-channels + run: conda install conda-index -c conda-forge --override-channels - name: Create conda channel run: | mkdir -p $GITHUB_WORKSPACE/channel/linux-64 @@ -425,9 +425,9 @@ jobs: BUILD_ENV_NAME: build_env steps: - - name: Install conda-build + - name: Install conda-index # Needed to be able to run conda index - run: conda install conda-build python=${{ matrix.python }} -c conda-forge --override-channels + run: conda install conda-index -c conda-forge --override-channels - name: Checkout dpctl repo uses: actions/checkout@v4.1.5 with: @@ -601,9 +601,9 @@ jobs: name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }} - name: Add conda to system path run: echo $CONDA/bin >> $GITHUB_PATH - - name: Install conda-build + - name: Install conda-index # Needed to be able to run conda index - run: conda install conda-build -c conda-forge --override-channels + run: conda install conda-index -c conda-forge --override-channels - name: Create conda channel run: | mkdir -p $GITHUB_WORKSPACE/channel/linux-64 From 5894870f522f449168ad5c91d410a64df2d7ce2d Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Thu, 6 Jun 2024 20:35:53 -0500 Subject: [PATCH 3/3] test_example_linux to mimic what test_linux does in test dependencies step --- .github/workflows/conda-package.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index cd3f9d8341..3ecea9b9f5 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -450,7 +450,9 @@ jobs: - name: Collect dependencies run: | CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}" - conda install $PACKAGE_NAME python=${{ matrix.python }} $CHANNELS --only-deps --dry-run > lockfile + export PACKAGE_VERSION=$(python -c "${VER_SCRIPT1} ${VER_SCRIPT2}") + conda create -n ${{ env.EXAMPLES_ENV_NAME }} $PACKAGE_NAME=${PACKAGE_VERSION} python=${{ matrix.python }} $CHANNELS --only-deps --dry-run > lockfile + cat lockfile - name: Set pkgs_dirs run: | echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc @@ -468,7 +470,7 @@ jobs: - name: Install example requirements shell: bash -l {0} env: - DPCPP_CMPLR: dpcpp_linux-64">=2024.0" + DPCPP_CMPLR: dpcpp_linux-64">=2024.1" run: | CHANNELS="${{ env.CHANNELS }}" . $CONDA/etc/profile.d/conda.sh