-
Notifications
You must be signed in to change notification settings - Fork 668
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'MDAnalysis:develop' into GROMOS11_Reader
- Loading branch information
Showing
47 changed files
with
1,180 additions
and
439 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -75,7 +76,7 @@ jobs: | |
| run: | ||
| working-directory: ./package | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
|
|
@@ -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 | ||
|
|
@@ -100,7 +101,7 @@ jobs: | |
| run: | ||
| working-directory: ./testsuite | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
|
|
@@ -111,21 +112,25 @@ 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 | ||
|
|
||
| upload_testpypi: | ||
| upload_testpypi_mdanalysis: | ||
| if: | | ||
| github.repository == 'MDAnalysis/mdanalysis' && | ||
| (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package')) | ||
| name: testpypi upload | ||
| environment: deploy | ||
| name: testpypi_upload_mdanalysis | ||
| environment: | ||
| name: deploy | ||
| url: https://test.pypi.org/p/mdanalysis | ||
| permissions: | ||
| id-token: write | ||
| 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 | ||
|
|
@@ -136,32 +141,55 @@ 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/ | ||
|
|
||
| upload_testpypi_mdanalysistests: | ||
| if: | | ||
| github.repository == 'MDAnalysis/mdanalysis' && | ||
| (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package')) | ||
| name: testpypi_upload_mdanalysistests | ||
| environment: | ||
| name: deploy | ||
| url: https://test.pypi.org/p/mdanalysis | ||
| permissions: | ||
| id-token: write | ||
| runs-on: ubuntu-latest | ||
| needs: [build_wheels, build_sdist, build_sdist_tests] | ||
| steps: | ||
| - uses: actions/download-artifact@v3 | ||
| with: | ||
| name: artifact | ||
| path: dist | ||
|
|
||
| - name: move_test_dist | ||
| run: | | ||
| mkdir -p testsuite/dist | ||
| mv dist/MDAnalysisTests-* testsuite/dist | ||
| - 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 }} | ||
| packages_dir: testsuite/dist | ||
| skip_existing: true | ||
| repository_url: https://test.pypi.org/legacy/ | ||
|
|
||
| upload_pypi: | ||
| upload_pypi_mdanalysis: | ||
| if: | | ||
| github.repository == 'MDAnalysis/mdanalysis' && | ||
| github.event_name == 'release' && github.event.action == 'published' | ||
| name: pypi upload | ||
| environment: deploy | ||
| name: pypi_upload_mdanalysis | ||
| environment: | ||
| name: deploy | ||
| url: https://pypi.org/p/mdanalysis | ||
| permissions: | ||
| id-token: write | ||
| 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 | ||
|
|
@@ -172,16 +200,34 @@ jobs: | |
| mv dist/MDAnalysisTests-* testsuite/dist | ||
| - name: upload_source_and_wheels | ||
| uses: pypa/[email protected] | ||
| uses: pypa/[email protected] | ||
|
|
||
| upload_pypi_mdanalysistests: | ||
| if: | | ||
| github.repository == 'MDAnalysis/mdanalysis' && | ||
| github.event_name == 'release' && github.event.action == 'published' | ||
| name: pypi_upload_mdanalysistests | ||
| environment: | ||
| name: deploy | ||
| url: https://pypi.org/p/mdanalysistests | ||
| permissions: | ||
| id-token: write | ||
| runs-on: ubuntu-latest | ||
| needs: [build_wheels, build_sdist, build_sdist_tests] | ||
| steps: | ||
| - uses: actions/download-artifact@v3 | ||
| with: | ||
| user: __token__ | ||
| password: ${{ secrets.PYPI_API_TOKEN_SRC }} | ||
| name: artifact | ||
| path: dist | ||
|
|
||
| - name: move_test_dist | ||
| run: | | ||
| mkdir -p testsuite/dist | ||
| mv dist/MDAnalysisTests-* testsuite/dist | ||
| - 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 }} | ||
| packages_dir: testsuite/dist | ||
|
|
||
| check_testpypi: | ||
|
|
@@ -191,12 +237,12 @@ jobs: | |
| name: testpypi check | ||
| runs-on: ${{ matrix.os }} | ||
| timeout-minutes: 60 | ||
| needs: upload_testpypi | ||
| needs: [upload_testpypi_mdanalysis, upload_testpypi_mdanalysistests] | ||
| strategy: | ||
| 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 | ||
|
|
@@ -206,7 +252,7 @@ jobs: | |
| MPLBACKEND: agg | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - name: setup_micromamba | ||
| uses: mamba-org/setup-micromamba@v1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.