Skip to content

Commit

Permalink
update things for py312
Browse files Browse the repository at this point in the history
  • Loading branch information
IAlibay committed Oct 27, 2023
1 parent 03a9550 commit ebce8b8
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/darkerbot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
with:
Expand Down
39 changes: 20 additions & 19 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,31 +37,32 @@ jobs:
fail-fast: false
matrix:
buildplat:
- [ubuntu-20.04, manylinux_x86_64]
- [macos-11, macosx_*]
- [windows-2019, win_amd64]
python: ["cp39", "cp310", "cp311"]
- [ubuntu-22.04, manylinux_x86_64, x86_64]
- [macos-11, macosx_*, x86_64]
- [windows-2019, win_amd64, AMD64]
python: ["cp39", "cp310", "cp311", "cp312"]
defaults:
run:
working-directory: ./package
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Build wheels
uses: pypa/cibuildwheel@v2.11.2
uses: pypa/cibuildwheel@v2.16.2
with:
package-dir: package
env:
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
CIBW_ARCHS: ${{ matrix.buildplat[2] }}
CIBW_BUILD_VERBOSITY: 1

- name: upload artifacts
if: |
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package')) ||
(github.event_name == 'release' && github.event.action == 'published')
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
path: wheelhouse/*.whl
retention-days: 7
Expand All @@ -75,7 +76,7 @@ jobs:
run:
working-directory: ./package
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -86,7 +87,7 @@ jobs:
if: |
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package')) ||
(github.event_name == 'release' && github.event.action == 'published')
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
path: package/dist/*.tar.gz
retention-days: 7
Expand All @@ -100,7 +101,7 @@ jobs:
run:
working-directory: ./testsuite
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -111,7 +112,7 @@ jobs:
if: |
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package')) ||
(github.event_name == 'release' && github.event.action == 'published')
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
path: testsuite/dist/*.tar.gz
retention-days: 7
Expand All @@ -125,7 +126,7 @@ jobs:
runs-on: ubuntu-latest
needs: [build_wheels, build_sdist, build_sdist_tests]
steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: artifact
path: dist
Expand All @@ -136,15 +137,15 @@ jobs:
mv dist/MDAnalysisTests-* testsuite/dist
- name: upload_source_and_wheels
uses: pypa/gh-action-pypi-publish@v1.5.0
uses: pypa/gh-action-pypi-publish@v1.8.10
with:
user: __token__
password: ${{ secrets.TESTPYPI_API_TOKEN_SRC }}
skip_existing: true
repository_url: https://test.pypi.org/legacy/

- name: upload_tests
uses: pypa/gh-action-pypi-publish@v1.5.0
uses: pypa/gh-action-pypi-publish@v1.8.10
with:
user: __token__
password: ${{ secrets.TESTPYPI_API_TOKEN_TEST }}
Expand All @@ -161,7 +162,7 @@ jobs:
runs-on: ubuntu-latest
needs: [build_wheels, build_sdist, build_sdist_tests]
steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: artifact
path: dist
Expand All @@ -172,13 +173,13 @@ jobs:
mv dist/MDAnalysisTests-* testsuite/dist
- name: upload_source_and_wheels
uses: pypa/gh-action-pypi-publish@v1.5.0
uses: pypa/gh-action-pypi-publish@v1.18.10
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN_SRC }}

- name: upload_tests
uses: pypa/gh-action-pypi-publish@v1.5.0
uses: pypa/gh-action-pypi-publish@v1.18.10
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN_TEST }}
Expand All @@ -196,7 +197,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
type: ["FULL", "MIN"]
exclude:
# Multiple deps don't like windows
Expand All @@ -206,7 +207,7 @@ jobs:
MPLBACKEND: agg

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: setup_micromamba
uses: mamba-org/setup-micromamba@v1
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/gh-ci-cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
timeout-minutes: 60

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: setup_os
uses: ./.github/actions/setup-os
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
timeout-minutes: 60

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: setup_os
uses: ./.github/actions/setup-os
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
os: [ubuntu-20.04, macos-11]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: setup_os
uses: ./.github/actions/setup-os
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
matrix:
python-version: ["3.10", "3.11", "3.12"]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: setup_os
uses: ./.github/actions/setup-os
Expand Down Expand Up @@ -225,7 +225,7 @@ jobs:
os: [ubuntu, macos]
python-version: ["3.9", "3.10", "3.11"]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: setup_os
uses: ./.github/actions/setup-os
Expand Down Expand Up @@ -273,7 +273,7 @@ jobs:
wheels: ['true', 'false']
steps:
# Checkout to have access to local actions (i.e. setup-os)
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# We need this here in order to make sure we assign the correct compiler (i.e. clang for macos)
- name: setup_os
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gh-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
MPLBACKEND: agg

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: setup_os
uses: ./.github/actions/setup-os
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
MPLBACKEND: agg

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: setup_micromamba
uses: mamba-org/setup-micromamba@v1
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
timeout-minutes: 30

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
shell: bash

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
with:
Expand All @@ -124,7 +124,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: setup_micromamba
uses: mamba-org/setup-micromamba@v1
Expand Down
6 changes: 3 additions & 3 deletions maintainer/ci/cirrus-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ macos_arm64_task:

ci_script: |
brew update
brew install python@3.11
/opt/homebrew/bin/python3 -m venv ~/py_311
source ~/py_311/bin/activate
brew install python@3.12
/opt/homebrew/bin/python3 -m venv ~/py_312
source ~/py_312/bin/activate
cd package
python -m pip install .
cd ../testsuite
Expand Down
8 changes: 5 additions & 3 deletions maintainer/ci/cirrus-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build_and_store_wheels: &BUILD_AND_STORE_WHEELS
install_cibuildwheel_script:
- python -m pip install cibuildwheel==2.12.3
- python -m pip install cibuildwheel==2.16.2
run_cibuildwheel_script:
- cibuildwheel ./package
wheels_artifacts:
Expand All @@ -16,7 +16,8 @@ linux_aarch64_wheel_task:
cpu: 4
memory: 4G
env:
CIBW_BUILD: cp39-manylinux* cp310-manylinux* cp311-manylinux*
CIBW_BUILD: cp39-manylinux_* cp310-manylinux_* cp311-manylinux_* cp312-manylinux_*
CIBW_ARCHS: ARM64

build_script: |
apt install -y python3-venv python-is-python3
Expand All @@ -29,7 +30,8 @@ macos_arm64_wheel_task:
macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-xcode:14
env:
CIBW_BUILD: cp39-* cp310-* cp311-*
CIBW_BUILD: cp39-* cp310-* cp311-* cp312-*
CIBW_ARCHS: ARM64
PATH: /opt/homebrew/opt/[email protected]/bin:$PATH

build_script: |
Expand Down

0 comments on commit ebce8b8

Please sign in to comment.