Skip to content

Commit

Permalink
Add support for python 3.11 (#1146)
Browse files Browse the repository at this point in the history
* test py3.11 and py3.12

* Run tests for support of only 3.8, 3.9 or 3.11

* Run tests for support of only 3.8, 3.9 or 3.11
  • Loading branch information
marc-vdm authored Dec 8, 2023
1 parent 92746bc commit d5b9e75
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/install-canary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ['3.8', '3.9']
python-version: ['3.8', '3.9', '3.11']
defaults:
run:
shell: bash -l {0}
Expand All @@ -39,15 +39,15 @@ jobs:
name: env-${{ matrix.os }}-${{ matrix.python-version }}
path: env.yaml

# also run install with micromamba instead of conda to have a timining comparison
# also run install with micromamba instead of conda to have a timing comparison
canary-installs-mamba:
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ['3.9']
python-version: ['3.11']
defaults:
run:
shell: bash -l {0}
Expand Down Expand Up @@ -92,10 +92,10 @@ jobs:
ls | grep mamba | while read d; do yq -i $d/env.yaml; done
- name: diff ubuntu
run: |
diff -u env-ubuntu-latest-3.9* || :
diff -u env-ubuntu-latest-3.11* || :
- name: diff windows
run: |
diff -u env-windows-latest-3.9* || :
diff -u env-windows-latest-3.11* || :
- name: diff macos
run: |
diff -u env-macos-latest-3.9* || :
diff -u env-macos-latest-3.11* || :
8 changes: 4 additions & 4 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ['3.8', '3.9']
python-version: ['3.8', '3.9', '3.11']
defaults:
run:
shell: bash -l {0}
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
run: |
pytest
- name: Upload coverage
if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }}
if: ${{ matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest' }}
# https://github.com/lemurheavy/coveralls-public/issues/1435#issuecomment-763357004
# https://coveralls-python.readthedocs.io/en/latest/usage/configuration.html#github-actions-support
# https://github.com/TheKevJames/coveralls-python/issues/252
Expand All @@ -109,10 +109,10 @@ jobs:
PKG_NAME: "activity-browser-dev"
steps:
- uses: actions/checkout@v3
- name: Build and deploy 3.8
- name: Build and deploy 3.11
uses: conda-incubator/setup-miniconda@v2
with:
python-version: 3.8
python-version: 3.11
activate-environment: build
environment-file: .github/conda-envs/build.yml
- name: Export version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Set up conda-build environment
uses: conda-incubator/setup-miniconda@v2
with:
python-version: 3.8
python-version: 3.11
activate-environment: build
environment-file: .github/conda-envs/build.yml
- name: Build activity-browser stable
Expand Down
6 changes: 3 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ requirements:
- python
- setuptools
run:
- python >=3.8,<3.10
- python >=3.8,<=3.11,!=3.10
- arrow
- brightway2 >=2.4.4
- pyperclip
- eidl >=1.4.2
- eidl >=2.0.1
- networkx
- pyside2 >=5.15.5
- qt-webengine
- numpy =1.23.5
- numpy >=1.23.5
- salib >=1.4
- seaborn
- libxml2 <=2.10.4
Expand Down

0 comments on commit d5b9e75

Please sign in to comment.