Skip to content

Commit

Permalink
Merge pull request #186 from xylar/switch_python_test_versions
Browse files Browse the repository at this point in the history
Drop python 3.7 and add python 3.11
  • Loading branch information
xylar authored Nov 6, 2022
2 parents 40bcc98 + 5a3bf79 commit 6a8a4c0
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 20 deletions.
24 changes: 13 additions & 11 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ jobs:
vmImage: 'ubuntu-latest'
strategy:
matrix:
Python37:
python.version: '3.7'
Python38:
python.version: '3.8'
Python39:
python.version: '3.9'
Python310:
python.version: '3.10'
Python311:
python.version: '3.11'

steps:
- bash: echo "##vso[task.prependpath]$CONDA/bin"
Expand All @@ -21,10 +21,11 @@ jobs:
eval "$(conda shell.bash hook)"
conda config --add channels conda-forge
conda config --set channel_priority strict
conda install --yes python=$PYTHON_VERSION conda conda-build mamba boa
conda install --yes conda conda-build mamba boa
displayName: Update conda base environment
- bash: |
set -e
eval "$(conda shell.bash hook)"
# workaround based on recent failures
rm /usr/share/miniconda/pkgs/cache/*.json
Expand Down Expand Up @@ -107,7 +108,7 @@ jobs:
fi
popd || exit 1
fi
condition: eq(variables['python.version'], '3.8')
condition: eq(variables['python.version'], '3.10')
displayName: build and deploy docs
- job:
Expand All @@ -116,12 +117,12 @@ jobs:
vmImage: 'macOS-latest'
strategy:
matrix:
Python37:
python.version: '3.7'
Python38:
python.version: '3.8'
Python39:
python.version: '3.9'
Python310:
python.version: '3.10'
Python311:
python.version: '3.11'

steps:
- bash: echo "##vso[task.prependpath]$CONDA/bin"
Expand All @@ -135,10 +136,11 @@ jobs:
eval "$(conda shell.bash hook)"
conda config --add channels conda-forge
conda config --set channel_priority strict
conda install --yes python=$PYTHON_VERSION conda conda-build mamba boa
conda install --yes conda conda-build mamba boa
displayName: Update conda base environment
- bash: |
set -e
eval "$(conda shell.bash hook)"
conda mambabuild -m "ci/python${PYTHON_VERSION}.yaml" "recipe"
displayName: Build geometric_features
Expand Down
2 changes: 1 addition & 1 deletion ci/python3.7.yaml → ci/python3.10.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.7.* *_cpython
- 3.10.* *_cpython
2 changes: 1 addition & 1 deletion ci/python3.8.yaml → ci/python3.11.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
- 3.11.* *_cpython
2 changes: 1 addition & 1 deletion dev-spec.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $ conda create --name <env> --file <this file>

# Base
python>=3.7
python>=3.8
cartopy
matplotlib-base
numpy
Expand Down
4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ build:

requirements:
host:
- python
- python >=3.8
- pip
run:
- python
- python >=3.8
- cartopy
- matplotlib-base
- numpy
Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
'Operating System :: OS Independent',
'Intended Audience :: Science/Research',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Topic :: Scientific/Engineering',
],
packages=find_packages(include=['geometric_features',
Expand Down

0 comments on commit 6a8a4c0

Please sign in to comment.