From 42ba481d49df57f3386971cd909b7a71f4feaf40 Mon Sep 17 00:00:00 2001 From: liamhuber Date: Fri, 1 Dec 2023 10:06:23 -0800 Subject: [PATCH 1/3] Remove the tests I don't care about --- .github/workflows/deploy.yml | 41 ----------------- .github/workflows/unittest-flux.yml | 67 ---------------------------- .github/workflows/unittest-mpich.yml | 61 ------------------------- .github/workflows/unittest-win.yml | 38 ---------------- .github/workflows/unittests-old.yml | 37 --------------- 5 files changed, 244 deletions(-) delete mode 100644 .github/workflows/deploy.yml delete mode 100644 .github/workflows/unittest-flux.yml delete mode 100644 .github/workflows/unittest-mpich.yml delete mode 100644 .github/workflows/unittest-win.yml delete mode 100644 .github/workflows/unittests-old.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 8315c0b5..00000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,41 +0,0 @@ -# This workflow is used to upload and deploy a new release to PyPi -# Based on https://github.com/pypa/gh-action-pypi-publish - -name: PyPi Release - -on: - push: - pull_request: - workflow_dispatch: - -jobs: - build: - if: startsWith(github.event.ref, 'refs/tags') || github.event_name == 'release' - runs-on: ubuntu-latest - environment: - name: pypi - url: https://pypi.org/p/${{ github.event.repository.name }} - permissions: - id-token: write - steps: - - uses: actions/checkout@v2 - - uses: conda-incubator/setup-miniconda@v2.2.0 - with: - python-version: 3.11 - mamba-version: "*" - channels: conda-forge - miniforge-variant: Mambaforge - channel-priority: strict - auto-update-conda: true - environment-file: .ci_support/environment-openmpi.yml - - name: Convert dependencies - run: | - cp .ci_support/environment-old.yml environment.yml - python .ci_support/release.py; cat pyproject.toml - - name: Build - shell: bash -l {0} - run: | - pip install versioneer[toml]==0.29 - python setup.py sdist bdist_wheel - - name: Publish distribution 📦 to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/.github/workflows/unittest-flux.yml b/.github/workflows/unittest-flux.yml deleted file mode 100644 index 14fca90c..00000000 --- a/.github/workflows/unittest-flux.yml +++ /dev/null @@ -1,67 +0,0 @@ -# This workflow is used to run the unittest of pyiron - -name: Unittests-flux - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - - runs-on: ${{ matrix.operating-system }} - strategy: - matrix: - include: - - operating-system: ubuntu-latest - python-version: '3.11' - label: linux-64-py-3-11-openmpi - prefix: /Users/runner/miniconda3/envs/my-env - environment-file: .ci_support/environment-openmpi.yml - - - operating-system: ubuntu-latest - python-version: '3.11' - label: linux-64-py-3-11-mich - prefix: /usr/share/miniconda3/envs/my-env - environment-file: .ci_support/environment-mpich.yml - - steps: - - uses: actions/checkout@v2 - - uses: conda-incubator/setup-miniconda@v2.2.0 - with: - python-version: ${{ matrix.python-version }} - mamba-version: "*" - channels: conda-forge - miniforge-variant: Mambaforge - channel-priority: strict - auto-update-conda: true - environment-file: ${{ matrix.environment-file }} - - name: Test - shell: bash -l {0} - timeout-minutes: 5 - run: | - mamba install -y flux-core coverage - pip install versioneer[toml]==0.29 - pip install . --no-deps --no-build-isolation - cd tests - coverage run --omit pympipool/_version.py -m unittest discover . - env: - OMPI_MCA_plm: 'isolated' - OMPI_MCA_rmaps_base_oversubscribe: 'yes' - OMPI_MCA_btl_vader_single_copy_mechanism: 'none' - - name: Test Flux - shell: bash -l {0} - timeout-minutes: 5 - run: > - flux start - coverage run --omit pympipool/_version.py -m unittest tests/test_flux.py; - coverage combine - env: - OMPI_MCA_plm: 'isolated' - OMPI_MCA_rmaps_base_oversubscribe: 'yes' - OMPI_MCA_btl_vader_single_copy_mechanism: 'none' - - name: Coveralls - if: matrix.label == 'linux-64-py-3-11-openmpi' - uses: coverallsapp/github-action@v2 diff --git a/.github/workflows/unittest-mpich.yml b/.github/workflows/unittest-mpich.yml deleted file mode 100644 index d3731c4d..00000000 --- a/.github/workflows/unittest-mpich.yml +++ /dev/null @@ -1,61 +0,0 @@ -# This workflow is used to run the unittest of pyiron - -name: Unittests-mpich - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - - runs-on: ${{ matrix.operating-system }} - strategy: - matrix: - include: - - operating-system: macos-latest - python-version: '3.11' - label: osx-64-py-3-11-mpich - prefix: /Users/runner/miniconda3/envs/my-env - - - operating-system: ubuntu-latest - python-version: '3.11' - label: linux-64-py-3-11-mpich - prefix: /usr/share/miniconda3/envs/my-env - - - operating-system: ubuntu-latest - python-version: '3.10' - label: linux-64-py-3-10-mpich - prefix: /usr/share/miniconda3/envs/my-env - - - operating-system: ubuntu-latest - python-version: 3.9 - label: linux-64-py-3-9-mpich - prefix: /usr/share/miniconda3/envs/my-env - - - operating-system: ubuntu-latest - python-version: 3.8 - label: linux-64-py-3-8-mpich - prefix: /usr/share/miniconda3/envs/my-env - - steps: - - uses: actions/checkout@v2 - - uses: conda-incubator/setup-miniconda@v2.2.0 - with: - python-version: ${{ matrix.python-version }} - mamba-version: "*" - channels: conda-forge - miniforge-variant: Mambaforge - channel-priority: strict - auto-update-conda: true - environment-file: .ci_support/environment-mpich.yml - - name: Test - shell: bash -l {0} - timeout-minutes: 5 - run: | - pip install versioneer[toml]==0.29 - pip install . --no-deps --no-build-isolation - cd tests - python -m unittest discover . diff --git a/.github/workflows/unittest-win.yml b/.github/workflows/unittest-win.yml deleted file mode 100644 index 89320cb6..00000000 --- a/.github/workflows/unittest-win.yml +++ /dev/null @@ -1,38 +0,0 @@ -# This workflow is used to run the unittest of pyiron - -name: Unittests-msmpi - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - - runs-on: ${{ matrix.operating-system }} - strategy: - matrix: - operating-system: [windows-latest] - python-version: ['3.11'] - - steps: - - uses: actions/checkout@v2 - - uses: conda-incubator/setup-miniconda@v2.2.0 - with: - python-version: ${{ matrix.python-version }} - mamba-version: "*" - channels: conda-forge - miniforge-variant: Mambaforge - channel-priority: strict - auto-update-conda: true - environment-file: .ci_support/environment-win.yml - - name: Test - shell: bash -l {0} - timeout-minutes: 5 - run: | - pip install versioneer[toml]==0.29 - pip install . --no-deps --no-build-isolation - cd tests - python -m unittest discover . diff --git a/.github/workflows/unittests-old.yml b/.github/workflows/unittests-old.yml deleted file mode 100644 index dc49dafd..00000000 --- a/.github/workflows/unittests-old.yml +++ /dev/null @@ -1,37 +0,0 @@ -# This workflow is used to run the unittest of pyiron - -name: Unittest Lower Bound - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: conda-incubator/setup-miniconda@v2.2.0 - with: - python-version: '3.9' - mamba-version: "*" - channels: conda-forge - miniforge-variant: Mambaforge - channel-priority: strict - auto-update-conda: true - environment-file: .ci_support/environment-old.yml - - name: Test - shell: bash -l {0} - timeout-minutes: 5 - run: | - pip install versioneer[toml]==0.29 - pip install . --no-deps --no-build-isolation - cd tests - python -m unittest discover . - env: - OMPI_MCA_plm: 'isolated' - OMPI_MCA_rmaps_base_oversubscribe: 'yes' - OMPI_MCA_btl_vader_single_copy_mechanism: 'none' From 6e34a01df2ef711ea219fdead59d36a50e5b4bc7 Mon Sep 17 00:00:00 2001 From: liamhuber Date: Fri, 1 Dec 2023 10:07:50 -0800 Subject: [PATCH 2/3] Change the OSs to different invokations of macos --- .github/workflows/unittest-openmpi.yml | 32 ++++++++++++-------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/unittest-openmpi.yml b/.github/workflows/unittest-openmpi.yml index d375e9ca..5a145cc7 100644 --- a/.github/workflows/unittest-openmpi.yml +++ b/.github/workflows/unittest-openmpi.yml @@ -17,28 +17,26 @@ jobs: include: - operating-system: macos-latest python-version: '3.11' - label: osx-64-py-3-11-openmpi + label: osx-latest-64-py-3-11-openmpi prefix: /Users/runner/miniconda3/envs/my-env - - - operating-system: ubuntu-latest + + + - operating-system: macos-11 python-version: '3.11' - label: linux-64-py-3-11-openmpi - prefix: /usr/share/miniconda3/envs/my-env + label: osx-11-64-py-3-11-openmpi + prefix: /Users/runner/miniconda3/envs/my-env + - - operating-system: ubuntu-latest - python-version: '3.10' - label: linux-64-py-3-10-openmpi - prefix: /usr/share/miniconda3/envs/my-env + - operating-system: macos-12 + python-version: '3.11' + label: osx-12-64-py-3-11-openmpi + prefix: /Users/runner/miniconda3/envs/my-env - - operating-system: ubuntu-latest - python-version: 3.9 - label: linux-64-py-3-9-openmpi - prefix: /usr/share/miniconda3/envs/my-env - - operating-system: ubuntu-latest - python-version: 3.8 - label: linux-64-py-3-8-openmpi - prefix: /usr/share/miniconda3/envs/my-env + - operating-system: macos-13 + python-version: '3.11' + label: osx-13-64-py-3-11-openmpi + prefix: /Users/runner/miniconda3/envs/my-env steps: - uses: actions/checkout@v2 From ea794177471f9b86f1244488188dd799620dda09 Mon Sep 17 00:00:00 2001 From: liamhuber Date: Fri, 1 Dec 2023 10:56:13 -0800 Subject: [PATCH 3/3] Run the tests totally independently --- .github/workflows/unittest-openmpi-11.yml | 45 +++++++++++++++++++ .github/workflows/unittest-openmpi-12.yml | 44 ++++++++++++++++++ .github/workflows/unittest-openmpi-13.yml | 45 +++++++++++++++++++ ...penmpi.yml => unittest-openmpi-latest.yml} | 18 -------- 4 files changed, 134 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/unittest-openmpi-11.yml create mode 100644 .github/workflows/unittest-openmpi-12.yml create mode 100644 .github/workflows/unittest-openmpi-13.yml rename .github/workflows/{unittest-openmpi.yml => unittest-openmpi-latest.yml} (70%) diff --git a/.github/workflows/unittest-openmpi-11.yml b/.github/workflows/unittest-openmpi-11.yml new file mode 100644 index 00000000..af040057 --- /dev/null +++ b/.github/workflows/unittest-openmpi-11.yml @@ -0,0 +1,45 @@ +# This workflow is used to run the unittest of pyiron + +name: Unittests-openmpi + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + + runs-on: ${{ matrix.operating-system }} + strategy: + matrix: + include: + - operating-system: macos-11 + python-version: '3.11' + label: osx-11-64-py-3-11-openmpi + prefix: /Users/runner/miniconda3/envs/my-env + + steps: + - uses: actions/checkout@v2 + - uses: conda-incubator/setup-miniconda@v2.2.0 + with: + python-version: ${{ matrix.python-version }} + mamba-version: "*" + channels: conda-forge + miniforge-variant: Mambaforge + channel-priority: strict + auto-update-conda: true + environment-file: .ci_support/environment-openmpi.yml + - name: Test + shell: bash -l {0} + timeout-minutes: 5 + run: | + pip install versioneer[toml]==0.29 + pip install . --no-deps --no-build-isolation + cd tests + python -m unittest discover . + env: + OMPI_MCA_plm: 'isolated' + OMPI_MCA_rmaps_base_oversubscribe: 'yes' + OMPI_MCA_btl_vader_single_copy_mechanism: 'none' diff --git a/.github/workflows/unittest-openmpi-12.yml b/.github/workflows/unittest-openmpi-12.yml new file mode 100644 index 00000000..33feb222 --- /dev/null +++ b/.github/workflows/unittest-openmpi-12.yml @@ -0,0 +1,44 @@ +# This workflow is used to run the unittest of pyiron + +name: Unittests-openmpi + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + + runs-on: ${{ matrix.operating-system }} + strategy: + matrix: + include: + - operating-system: macos-12 + python-version: '3.11' + label: osx-12-64-py-3-11-openmpi + prefix: /Users/runner/miniconda3/envs/my-env + steps: + - uses: actions/checkout@v2 + - uses: conda-incubator/setup-miniconda@v2.2.0 + with: + python-version: ${{ matrix.python-version }} + mamba-version: "*" + channels: conda-forge + miniforge-variant: Mambaforge + channel-priority: strict + auto-update-conda: true + environment-file: .ci_support/environment-openmpi.yml + - name: Test + shell: bash -l {0} + timeout-minutes: 5 + run: | + pip install versioneer[toml]==0.29 + pip install . --no-deps --no-build-isolation + cd tests + python -m unittest discover . + env: + OMPI_MCA_plm: 'isolated' + OMPI_MCA_rmaps_base_oversubscribe: 'yes' + OMPI_MCA_btl_vader_single_copy_mechanism: 'none' diff --git a/.github/workflows/unittest-openmpi-13.yml b/.github/workflows/unittest-openmpi-13.yml new file mode 100644 index 00000000..00d675c6 --- /dev/null +++ b/.github/workflows/unittest-openmpi-13.yml @@ -0,0 +1,45 @@ +# This workflow is used to run the unittest of pyiron + +name: Unittests-openmpi + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + + runs-on: ${{ matrix.operating-system }} + strategy: + matrix: + include: + - operating-system: macos-13 + python-version: '3.11' + label: osx-13-64-py-3-11-openmpi + prefix: /Users/runner/miniconda3/envs/my-env + + steps: + - uses: actions/checkout@v2 + - uses: conda-incubator/setup-miniconda@v2.2.0 + with: + python-version: ${{ matrix.python-version }} + mamba-version: "*" + channels: conda-forge + miniforge-variant: Mambaforge + channel-priority: strict + auto-update-conda: true + environment-file: .ci_support/environment-openmpi.yml + - name: Test + shell: bash -l {0} + timeout-minutes: 5 + run: | + pip install versioneer[toml]==0.29 + pip install . --no-deps --no-build-isolation + cd tests + python -m unittest discover . + env: + OMPI_MCA_plm: 'isolated' + OMPI_MCA_rmaps_base_oversubscribe: 'yes' + OMPI_MCA_btl_vader_single_copy_mechanism: 'none' diff --git a/.github/workflows/unittest-openmpi.yml b/.github/workflows/unittest-openmpi-latest.yml similarity index 70% rename from .github/workflows/unittest-openmpi.yml rename to .github/workflows/unittest-openmpi-latest.yml index 5a145cc7..a9d81c58 100644 --- a/.github/workflows/unittest-openmpi.yml +++ b/.github/workflows/unittest-openmpi-latest.yml @@ -20,24 +20,6 @@ jobs: label: osx-latest-64-py-3-11-openmpi prefix: /Users/runner/miniconda3/envs/my-env - - - operating-system: macos-11 - python-version: '3.11' - label: osx-11-64-py-3-11-openmpi - prefix: /Users/runner/miniconda3/envs/my-env - - - - operating-system: macos-12 - python-version: '3.11' - label: osx-12-64-py-3-11-openmpi - prefix: /Users/runner/miniconda3/envs/my-env - - - - operating-system: macos-13 - python-version: '3.11' - label: osx-13-64-py-3-11-openmpi - prefix: /Users/runner/miniconda3/envs/my-env - steps: - uses: actions/checkout@v2 - uses: conda-incubator/setup-miniconda@v2.2.0