Skip to content

Start using Python 3.10 #843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 29 additions & 16 deletions .github/workflows/conda-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

strategy:
matrix:
python: [3.8, 3.9]
python: ['3.8', '3.9', '3.10']
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:

strategy:
matrix:
python: [3.8, 3.9]
python: ['3.8', '3.9']
env:
conda-bld: C:\Miniconda\conda-bld\win-64\
steps:
Expand Down Expand Up @@ -102,13 +102,9 @@ jobs:

strategy:
matrix:
python: [3.8, 3.9]
python: ['3.8', '3.9', '3.10']
experimental: [false]
runner: [ubuntu-latest]
# include:
# - python: 3.8
# experimental: true
# runner: [self-hosted, gen9]
continue-on-error: ${{ matrix.experimental }}
env:
CHANNELS: -c intel -c defaults --override-channels
Expand Down Expand Up @@ -178,7 +174,7 @@ jobs:

strategy:
matrix:
python: [3.8, 3.9]
python: ['3.8', '3.9']
experimental: [false]
runner: [windows-latest]
continue-on-error: ${{ matrix.experimental }}
Expand All @@ -199,13 +195,23 @@ jobs:
run: conda install conda-build
- name: Create conda channel
run: |
mkdir -p $GITHUB_WORKSPACE/channel/win-64
mv ${{ env.PACKAGE_NAME }}-*.tar.bz2 ${{ env.GITHUB_WORKSPACE }}/channel/win-64
mkdir ${{ env.GITHUB_WORKSPACE }}\channel\win-64
move ${{ env.PACKAGE_NAME }}-*.tar.bz2 ${{ env.GITHUB_WORKSPACE }}\channel\win-64
conda index ${{ env.GITHUB_WORKSPACE }}/channel
# Test channel
conda search ${{ env.PACKAGE_NAME }} -c ${{ env.GITHUB_WORKSPACE }}/channel --override-channels
conda search ${{ env.PACKAGE_NAME }} -c ${{ env.GITHUB_WORKSPACE }}/channel --override-channels --info --json > ${{ env.GITHUB_WORKSPACE }}\ver.json
more ${{ env.GITHUB_WORKSPACE }}\ver.json
- name: Collect dependencies
run: conda install ${{ env.PACKAGE_NAME }} python=${{ matrix.python }} -c ${{ env.GITHUB_WORKSPACE }}/channel ${{ env.CHANNELS }} --only-deps --dry-run > lockfile
shell: cmd
run: |
@ECHO ON
copy /Y ${{ env.GITHUB_WORKSPACE }}\ver.json .
set "SCRIPT=%VER_SCRIPT1% %VER_SCRIPT2%"
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
SET PACKAGE_VERSION=%%F
)
conda install ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% python=${{ matrix.python }} -c ${{ env.GITHUB_WORKSPACE }}/channel ${{ env.CHANNELS }} --only-deps --dry-run > lockfile
more lockfile
- name: Cache conda packages
uses: actions/cache@v2
env:
Expand All @@ -220,8 +226,15 @@ jobs:
- name: Install opencl_rt
run: conda install opencl_rt -c intel --override-channels
- name: Install dpctl
shell: cmd
run: |
conda install ${{ env.PACKAGE_NAME }} pytest python=${{ matrix.python }} -c ${{ env.GITHUB_WORKSPACE }}/channel ${{ env.CHANNELS }}
@ECHO ON
copy /Y ${{ env.GITHUB_WORKSPACE }}\ver.json .
set "SCRIPT=%VER_SCRIPT1% %VER_SCRIPT2%"
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
SET PACKAGE_VERSION=%%F
)
conda install ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% pytest python=${{ matrix.python }} -c ${{ env.GITHUB_WORKSPACE }}/channel ${{ env.CHANNELS }}
# Test installed packages
conda list
- name: Add library
Expand Down Expand Up @@ -274,7 +287,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: [3.8, 3.9]
python: ['3.8', '3.9', '3.10']
steps:
- name: Download artifact
uses: actions/download-artifact@v2
Expand All @@ -299,7 +312,7 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
python: [3.8, 3.9]
python: ['3.8', '3.9', '3.10']
steps:
- name: Download artifact
uses: actions/download-artifact@v2
Expand All @@ -324,7 +337,7 @@ jobs:
runs-on: ${{ matrix.runner }}
strategy:
matrix:
python: [3.9]
python: ['3.9']
experimental: [false]
runner: [ubuntu-latest]
continue-on-error: ${{ matrix.experimental }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: '3.9'
python-version: '3.10'
architecture: x64

- name: Cache Gtest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
if: ${{ !github.event.pull_request || github.event.action != 'closed' }}
uses: actions/setup-python@v2
with:
python-version: '3.8'
python-version: '3.10'
architecture: x64
- name: Install sphinx dependencies
if: ${{ !github.event.pull_request || github.event.action != 'closed' }}
Expand Down
2 changes: 2 additions & 0 deletions conda-recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
numpy:
- 1.21
7 changes: 3 additions & 4 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ source:
build:
number: {{ GIT_DESCRIBE_NUMBER }}
script_env:
- ONEAPI_ROOT # for wheel on Linux
- WHEELS_OUTPUT_FOLDER

requirements:
Expand All @@ -22,12 +21,12 @@ requirements:
- python
- ninja
- scikit-build
- numpy 1.19
- numpy
- wheel
run:
- python
- {{ pin_compatible('numpy') }}
- dpcpp-cpp-rt >=2022.0
- {{ pin_compatible('numpy', min_pin='x.x', max_pin='x') }}
- dpcpp-cpp-rt >=2022.1

test:
requires:
Expand Down