From 22e104c52579877e27ab3850a03a876253b011ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jan=C3=9Fen?= Date: Sun, 9 Feb 2025 13:07:16 +0100 Subject: [PATCH 1/2] Update continuous integration environment --- .github/workflows/benchmark.yml | 50 --- .github/workflows/black.yml | 18 - .github/workflows/format_black.yml | 33 -- .github/workflows/minimal.yml | 30 -- .github/workflows/mypy.yml | 22 -- .github/workflows/notebooks.yml | 37 -- .github/workflows/pipeline.yml | 383 ++++++++++++++++++++ .github/workflows/pypicheck.yml | 26 -- .github/workflows/unittest-flux-mpich.yml | 37 -- .github/workflows/unittest-flux-openmpi.yml | 43 --- .github/workflows/unittest-mpich.yml | 50 --- .github/workflows/unittest-openmpi.yml | 50 --- .github/workflows/unittest-win.yml | 37 -- .github/workflows/unittests-old.yml | 35 -- 14 files changed, 383 insertions(+), 468 deletions(-) delete mode 100644 .github/workflows/benchmark.yml delete mode 100644 .github/workflows/black.yml delete mode 100644 .github/workflows/format_black.yml delete mode 100644 .github/workflows/minimal.yml delete mode 100644 .github/workflows/mypy.yml delete mode 100644 .github/workflows/notebooks.yml create mode 100644 .github/workflows/pipeline.yml delete mode 100644 .github/workflows/pypicheck.yml delete mode 100644 .github/workflows/unittest-flux-mpich.yml delete mode 100644 .github/workflows/unittest-flux-openmpi.yml delete mode 100644 .github/workflows/unittest-mpich.yml delete mode 100644 .github/workflows/unittest-openmpi.yml delete mode 100644 .github/workflows/unittest-win.yml delete mode 100644 .github/workflows/unittests-old.yml diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml deleted file mode 100644 index bbbb337b..00000000 --- a/.github/workflows/benchmark.yml +++ /dev/null @@ -1,50 +0,0 @@ -# This workflow is used to run the unittest of pyiron - -name: Benchmark - -on: - push: - branches: [ main ] - pull_request: - -jobs: - build: - - runs-on: ${{ matrix.operating-system }} - strategy: - matrix: - include: - - operating-system: ubuntu-latest - python-version: '3.13' - environment-file: .ci_support/environment-openmpi.yml - - - operating-system: ubuntu-latest - python-version: '3.13' - environment-file: .ci_support/environment-mpich.yml - - steps: - - uses: actions/checkout@v4 - - name: Conda config - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: ${{ matrix.python-version }} - miniforge-version: latest - condarc-file: .condarc - environment-file: ${{ matrix.environment-file }} - - name: Test - shell: bash -l {0} - timeout-minutes: 10 - run: | - pip install versioneer[toml]==0.29 - pip install . --no-deps --no-build-isolation - python tests/benchmark/llh.py static >> timing.log - python tests/benchmark/llh.py process >> timing.log - python tests/benchmark/llh.py thread >> timing.log - mpiexec -n 4 python -m mpi4py.futures tests/benchmark/llh.py mpi4py >> timing.log - python tests/benchmark/llh.py executorlib >> timing.log - python tests/benchmark/llh.py block_allocation >> timing.log - cat timing.log - python -m unittest tests/benchmark/test_results.py - env: - PRTE_MCA_rmaps_default_mapping_policy: ':oversubscribe' diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml deleted file mode 100644 index 41abd1d4..00000000 --- a/.github/workflows/black.yml +++ /dev/null @@ -1,18 +0,0 @@ -# This workflow is used to check the differences and find conflict markers or whitespace errors - -name: Black - -on: - push: - branches: [ main ] - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: psf/black@stable - with: - options: "--check --diff" - src: ./${{ github.event.repository.name }} diff --git a/.github/workflows/format_black.yml b/.github/workflows/format_black.yml deleted file mode 100644 index f7a62e5d..00000000 --- a/.github/workflows/format_black.yml +++ /dev/null @@ -1,33 +0,0 @@ -# This workflow will checkout the branch of the PR, apply black formatting and commit the result to the PR. Does not work for forks. - -name: Format black - -on: - pull_request: - types: [labeled] - -jobs: - build: - if: contains(github.event.pull_request.labels.*.name, 'format_black' ) - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - token: ${{ secrets.DEPENDABOT_WORKFLOW_TOKEN }} - ref: ${{ github.event.pull_request.head.ref }} # Check out the head of the actual branch, not the PR - fetch-depth: 0 # otherwise, you will fail to push refs to dest repo - - name: format black - uses: psf/black@stable - with: - options: "" - src: "./${{ github.event.repository.name }}" - - name: commit - run: | - git config --local user.email "pyiron@mpie.de" - git config --local user.name "pyiron-runner" - git commit -m "Format black" -a - - name: push - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.DEPENDABOT_WORKFLOW_TOKEN }} - branch: ${{ github.event.pull_request.head.ref }} diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml deleted file mode 100644 index 9b1f60a8..00000000 --- a/.github/workflows/minimal.yml +++ /dev/null @@ -1,30 +0,0 @@ -# This workflow is used to run the unittest of pyiron - -name: Unittests-minimal - -on: - push: - branches: [ main ] - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Conda config - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: "3.13" - miniforge-version: latest - condarc-file: .condarc - environment-file: .ci_support/environment-mini.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/mypy.yml b/.github/workflows/mypy.yml deleted file mode 100644 index 5e742142..00000000 --- a/.github/workflows/mypy.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: MyPy - -on: - push: - branches: [ main ] - pull_request: - -jobs: - mypy: - runs-on: ubuntu-latest - steps: - - name: Setup Python - uses: actions/setup-python@v5 - with: - python-version: "3.13" - architecture: x64 - - name: Checkout - uses: actions/checkout@v4 - - name: Install mypy - run: pip install mypy - - name: Test - run: mypy --ignore-missing-imports ${{ github.event.repository.name }} \ No newline at end of file diff --git a/.github/workflows/notebooks.yml b/.github/workflows/notebooks.yml deleted file mode 100644 index 9cfb0934..00000000 --- a/.github/workflows/notebooks.yml +++ /dev/null @@ -1,37 +0,0 @@ -# This workflow is used to test, if the code is compatible with jupyter notebooks providing usage examples - -name: Notebooks - -on: - push: - branches: [ main ] - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Merge Notebook environment - run: | - cp binder/environment.yml environment.yml - tail --lines=+4 .ci_support/environment-notebooks.yml >> environment.yml - echo -e "channels:\n - conda-forge\n" > .condarc - - name: Setup Mambaforge - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: "3.12" - miniforge-version: latest - condarc-file: .condarc - environment-file: environment.yml - - name: Install - shell: bash -l {0} - run: | - pip install versioneer[toml]==0.29 - pip install . --no-deps --no-build-isolation - - name: Notebooks - shell: bash -l {0} - timeout-minutes: 5 - run: > - flux start - .ci_support/build_notebooks.sh diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml new file mode 100644 index 00000000..0014b66f --- /dev/null +++ b/.github/workflows/pipeline.yml @@ -0,0 +1,383 @@ +name: Pipeline + +on: + push: + branches: [ main ] + pull_request: + +jobs: + black: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: psf/black@stable + with: + options: "--check --diff" + src: ./${{ github.event.repository.name }} + + black_fix: # in most cases pre-commit is faster + needs: [black] + if: failure() + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + token: ${{ secrets.DEPENDABOT_WORKFLOW_TOKEN }} + ref: ${{ github.event.pull_request.head.ref }} # Check out the head of the actual branch, not the PR + fetch-depth: 0 # otherwise, you will fail to push refs to dest repo + - name: format black + uses: psf/black@stable + with: + options: "" + src: "./${{ github.event.repository.name }}" + - name: commit + run: | + git config --local user.email "pyiron@mpie.de" + git config --local user.name "pyiron-runner" + git commit -m "Format black" -a + - name: push + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.DEPENDABOT_WORKFLOW_TOKEN }} + branch: ${{ github.event.pull_request.head.ref }} + + mypy: + needs: [black] + runs-on: ubuntu-latest + steps: + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: "3.13" + architecture: x64 + - name: Checkout + uses: actions/checkout@v4 + - name: Install mypy + run: pip install mypy + - name: Test + run: mypy --ignore-missing-imports ${{ github.event.repository.name }} + + minimal: + needs: [black] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Conda config + run: echo -e "channels:\n - conda-forge\n" > .condarc + - uses: conda-incubator/setup-miniconda@v3 + with: + python-version: "3.13" + miniforge-version: latest + condarc-file: .condarc + environment-file: .ci_support/environment-mini.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 . + + pip_check: + needs: [black] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Conda config + run: echo -e "channels:\n - conda-forge\n" > .condarc + - uses: conda-incubator/setup-miniconda@v3 + with: + python-version: '3.13' + miniforge-version: latest + condarc-file: .condarc + environment-file: .ci_support/environment-openmpi.yml + - name: Setup + shell: bash -l {0} + run: | + pip install versioneer[toml]==0.29 + pip install . --no-deps --no-build-isolation + pip check + + benchmark: + needs: [black] + runs-on: ${{ matrix.operating-system }} + strategy: + matrix: + include: + - operating-system: ubuntu-latest + python-version: '3.13' + environment-file: .ci_support/environment-openmpi.yml + + - operating-system: ubuntu-latest + python-version: '3.13' + environment-file: .ci_support/environment-mpich.yml + + steps: + - uses: actions/checkout@v4 + - name: Conda config + run: echo -e "channels:\n - conda-forge\n" > .condarc + - uses: conda-incubator/setup-miniconda@v3 + with: + python-version: ${{ matrix.python-version }} + miniforge-version: latest + condarc-file: .condarc + environment-file: ${{ matrix.environment-file }} + - name: Test + shell: bash -l {0} + timeout-minutes: 10 + run: | + pip install versioneer[toml]==0.29 + pip install . --no-deps --no-build-isolation + python tests/benchmark/llh.py static >> timing.log + python tests/benchmark/llh.py process >> timing.log + python tests/benchmark/llh.py thread >> timing.log + mpiexec -n 4 python -m mpi4py.futures tests/benchmark/llh.py mpi4py >> timing.log + python tests/benchmark/llh.py executorlib >> timing.log + python tests/benchmark/llh.py block_allocation >> timing.log + cat timing.log + python -m unittest tests/benchmark/test_results.py + env: + PRTE_MCA_rmaps_default_mapping_policy: ':oversubscribe' + + notebooks: + needs: [black] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Merge Notebook environment + run: | + cp binder/environment.yml environment.yml + tail --lines=+4 .ci_support/environment-notebooks.yml >> environment.yml + echo -e "channels:\n - conda-forge\n" > .condarc + - name: Setup Mambaforge + uses: conda-incubator/setup-miniconda@v3 + with: + python-version: "3.12" + miniforge-version: latest + condarc-file: .condarc + environment-file: environment.yml + - name: Install + shell: bash -l {0} + run: | + pip install versioneer[toml]==0.29 + pip install . --no-deps --no-build-isolation + - name: Notebooks + shell: bash -l {0} + timeout-minutes: 5 + run: > + flux start + .ci_support/build_notebooks.sh + + unittest_flux_mpich: + needs: [black] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Extend environment + shell: bash -l {0} + timeout-minutes: 5 + run: | + echo -e '- coverage\n- flux-core =0.59.0\n- versioneer =0.28'>> .ci_support/environment-mpich.yml + cat .ci_support/environment-mpich.yml + echo -e "channels:\n - conda-forge\n" > .condarc + - uses: conda-incubator/setup-miniconda@v3 + with: + python-version: '3.12' + miniforge-version: latest + condarc-file: .condarc + environment-file: .ci_support/environment-mpich.yml + - name: Test + shell: bash -l {0} + timeout-minutes: 5 + run: | + pip install . --no-deps --no-build-isolation + python -m unittest discover tests + - name: Test Flux + shell: bash -l {0} + timeout-minutes: 5 + run: > + flux start + python -m unittest tests/test_flux_executor.py tests/test_executor_backend_flux.py tests/test_cache_executor_pysqa_flux.py tests/test_plot_dependency_flux.py; + + unittest_flux_openmpi: + needs: [black] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Extend environment + shell: bash -l {0} + timeout-minutes: 5 + run: | + echo -e '- coverage\n- flux-core =0.59.0\n- flux-pmix=0.5.0\n- versioneer =0.28' >> .ci_support/environment-openmpi.yml + cat .ci_support/environment-openmpi.yml + echo -e "channels:\n - conda-forge\n" > .condarc + - uses: conda-incubator/setup-miniconda@v3 + with: + python-version: '3.12' + miniforge-version: latest + condarc-file: .condarc + environment-file: .ci_support/environment-openmpi.yml + - name: Test + shell: bash -l {0} + timeout-minutes: 5 + run: | + pip install . --no-deps --no-build-isolation + coverage run -a --omit="executorlib/_version.py,tests/*" -m unittest discover tests + - name: Test Flux with OpenMPI + shell: bash -l {0} + timeout-minutes: 5 + run: > + flux start + coverage run -a --omit="executorlib/_version.py,tests/*" -m unittest tests/test_flux_executor.py tests/test_executor_backend_flux.py tests/test_cache_executor_pysqa_flux.py tests/test_plot_dependency_flux.py; + coverage xml + env: + EXECUTORLIB_PMIX: "pmix" + TMPDIR: "/tmp" # required by MacOs https://github.com/open-mpi/ompi/issues/7393 + - name: Coveralls + uses: coverallsapp/github-action@v2 + + unittest_mpich: + needs: [black] + runs-on: ${{ matrix.operating-system }} + strategy: + matrix: + include: + - operating-system: macos-latest + python-version: '3.13' + + - operating-system: ubuntu-latest + python-version: '3.13' + + - operating-system: ubuntu-latest + python-version: '3.12' + + - operating-system: ubuntu-latest + python-version: '3.11' + + - operating-system: ubuntu-latest + python-version: '3.10' + + steps: + - uses: actions/checkout@v4 + - name: Conda config + shell: bash -l {0} + run: echo -e "channels:\n - conda-forge\n" > .condarc + - uses: conda-incubator/setup-miniconda@v3 + with: + python-version: ${{ matrix.python-version }} + miniforge-version: latest + condarc-file: .condarc + 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 . + + unittest_openmpi: + needs: [black] + runs-on: ${{ matrix.operating-system }} + strategy: + matrix: + include: + - operating-system: macos-latest + python-version: '3.13' + + - operating-system: ubuntu-latest + python-version: '3.13' + + - operating-system: ubuntu-latest + python-version: '3.12' + + - operating-system: ubuntu-latest + python-version: '3.11' + + - operating-system: ubuntu-latest + python-version: '3.10' + + steps: + - uses: actions/checkout@v4 + - name: Conda config + shell: bash -l {0} + run: echo -e "channels:\n - conda-forge\n" > .condarc + - uses: conda-incubator/setup-miniconda@v3 + with: + python-version: ${{ matrix.python-version }} + miniforge-version: latest + condarc-file: .condarc + 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 . + + unittest_win: + needs: [black] + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + - name: Conda config + shell: bash -l {0} + run: echo -e "channels:\n - conda-forge\n" > .condarc + - uses: conda-incubator/setup-miniconda@v3 + with: + python-version: "3.13" + miniforge-version: latest + condarc-file: .condarc + 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 . + + unittest_old: + needs: [black] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Conda config + run: echo -e "channels:\n - conda-forge\n" > .condarc + - uses: conda-incubator/setup-miniconda@v3 + with: + python-version: '3.9' + miniforge-version: latest + condarc-file: .condarc + 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' + + autobot: + needs: [unittest_old, unittest_win, unittest_openmpi, unittest_mpich, unittest_flux_openmpi, unittest_flux_mpich, notebooks, benchmark, minimal, pip_check, mypy] + permissions: + contents: write + pull-requests: write + runs-on: ubuntu-latest + if: (github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'pre-commit-ci[bot]') + steps: + - name: Enable auto-merge for bot PRs + run: gh pr merge --auto --squash "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GH_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file diff --git a/.github/workflows/pypicheck.yml b/.github/workflows/pypicheck.yml deleted file mode 100644 index 173f0fa3..00000000 --- a/.github/workflows/pypicheck.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Pip check - -on: - push: - branches: [ main ] - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Conda config - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: '3.13' - miniforge-version: latest - condarc-file: .condarc - environment-file: .ci_support/environment-openmpi.yml - - name: Setup - shell: bash -l {0} - run: | - pip install versioneer[toml]==0.29 - pip install . --no-deps --no-build-isolation - pip check diff --git a/.github/workflows/unittest-flux-mpich.yml b/.github/workflows/unittest-flux-mpich.yml deleted file mode 100644 index 79ff685a..00000000 --- a/.github/workflows/unittest-flux-mpich.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Unittests-flux-mpich - -on: - push: - branches: [ main ] - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Extend environment - shell: bash -l {0} - timeout-minutes: 5 - run: | - echo -e '- coverage\n- flux-core =0.59.0\n- versioneer =0.28'>> .ci_support/environment-mpich.yml - cat .ci_support/environment-mpich.yml - echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: '3.12' - miniforge-version: latest - condarc-file: .condarc - environment-file: .ci_support/environment-mpich.yml - - name: Test - shell: bash -l {0} - timeout-minutes: 5 - run: | - pip install . --no-deps --no-build-isolation - python -m unittest discover tests - - name: Test Flux - shell: bash -l {0} - timeout-minutes: 5 - run: > - flux start - python -m unittest tests/test_flux_executor.py tests/test_executor_backend_flux.py tests/test_cache_executor_pysqa_flux.py tests/test_plot_dependency_flux.py; diff --git a/.github/workflows/unittest-flux-openmpi.yml b/.github/workflows/unittest-flux-openmpi.yml deleted file mode 100644 index 7da1cf40..00000000 --- a/.github/workflows/unittest-flux-openmpi.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: Unittests-flux-openmpi - -on: - push: - branches: [ main ] - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Extend environment - shell: bash -l {0} - timeout-minutes: 5 - run: | - echo -e '- coverage\n- flux-core =0.59.0\n- flux-pmix=0.5.0\n- versioneer =0.28' >> .ci_support/environment-openmpi.yml - cat .ci_support/environment-openmpi.yml - echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: '3.12' - miniforge-version: latest - condarc-file: .condarc - environment-file: .ci_support/environment-openmpi.yml - - name: Test - shell: bash -l {0} - timeout-minutes: 5 - run: | - pip install . --no-deps --no-build-isolation - coverage run -a --omit="executorlib/_version.py,tests/*" -m unittest discover tests - - name: Test Flux with OpenMPI - shell: bash -l {0} - timeout-minutes: 5 - run: > - flux start - coverage run -a --omit="executorlib/_version.py,tests/*" -m unittest tests/test_flux_executor.py tests/test_executor_backend_flux.py tests/test_cache_executor_pysqa_flux.py tests/test_plot_dependency_flux.py; - coverage xml - env: - EXECUTORLIB_PMIX: "pmix" - TMPDIR: "/tmp" # required by MacOs https://github.com/open-mpi/ompi/issues/7393 - - name: Coveralls - uses: coverallsapp/github-action@v2 diff --git a/.github/workflows/unittest-mpich.yml b/.github/workflows/unittest-mpich.yml deleted file mode 100644 index 99b0e603..00000000 --- a/.github/workflows/unittest-mpich.yml +++ /dev/null @@ -1,50 +0,0 @@ -# This workflow is used to run the unittest of pyiron - -name: Unittests-mpich - -on: - push: - branches: [ main ] - pull_request: - -jobs: - build: - - runs-on: ${{ matrix.operating-system }} - strategy: - matrix: - include: - - operating-system: macos-latest - python-version: '3.13' - - - operating-system: ubuntu-latest - python-version: '3.13' - - - operating-system: ubuntu-latest - python-version: '3.12' - - - operating-system: ubuntu-latest - python-version: '3.11' - - - operating-system: ubuntu-latest - python-version: '3.10' - - steps: - - uses: actions/checkout@v4 - - name: Conda config - shell: bash -l {0} - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: ${{ matrix.python-version }} - miniforge-version: latest - condarc-file: .condarc - 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-openmpi.yml b/.github/workflows/unittest-openmpi.yml deleted file mode 100644 index 0c9b77c0..00000000 --- a/.github/workflows/unittest-openmpi.yml +++ /dev/null @@ -1,50 +0,0 @@ -# This workflow is used to run the unittest of pyiron - -name: Unittests-openmpi - -on: - push: - branches: [ main ] - pull_request: - -jobs: - build: - - runs-on: ${{ matrix.operating-system }} - strategy: - matrix: - include: - - operating-system: macos-latest - python-version: '3.13' - - - operating-system: ubuntu-latest - python-version: '3.13' - - - operating-system: ubuntu-latest - python-version: '3.12' - - - operating-system: ubuntu-latest - python-version: '3.11' - - - operating-system: ubuntu-latest - python-version: '3.10' - - steps: - - uses: actions/checkout@v4 - - name: Conda config - shell: bash -l {0} - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: ${{ matrix.python-version }} - miniforge-version: latest - condarc-file: .condarc - 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 . diff --git a/.github/workflows/unittest-win.yml b/.github/workflows/unittest-win.yml deleted file mode 100644 index 76b7ec6c..00000000 --- a/.github/workflows/unittest-win.yml +++ /dev/null @@ -1,37 +0,0 @@ -# This workflow is used to run the unittest of pyiron - -name: Unittests-msmpi - -on: - push: - branches: [ main ] - pull_request: - -jobs: - build: - - runs-on: ${{ matrix.operating-system }} - strategy: - matrix: - operating-system: [windows-latest] - python-version: ['3.13'] - - steps: - - uses: actions/checkout@v4 - - name: Conda config - shell: bash -l {0} - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: ${{ matrix.python-version }} - miniforge-version: latest - condarc-file: .condarc - 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 ce5c227b..00000000 --- a/.github/workflows/unittests-old.yml +++ /dev/null @@ -1,35 +0,0 @@ -# This workflow is used to run the unittest of pyiron - -name: Unittest Lower Bound - -on: - push: - branches: [ main ] - pull_request: - -jobs: - build: - - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Conda config - run: echo -e "channels:\n - conda-forge\n" > .condarc - - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: '3.9' - miniforge-version: latest - condarc-file: .condarc - 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 e0f16e96497901214a189ab51e14b6c473a44401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jan=C3=9Fen?= Date: Sun, 9 Feb 2025 13:24:51 +0100 Subject: [PATCH 2/2] Fix link in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 321af926..b75f2693 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # executorlib -[![Unittests](https://github.com/pyiron/executorlib/actions/workflows/unittest-openmpi.yml/badge.svg)](https://github.com/pyiron/executorlib/actions/workflows/unittest-openmpi.yml) +[![Pipeline](https://github.com/pyiron/executorlib/actions/workflows/pipeline.yml/badge.svg)](https://github.com/pyiron/executorlib/actions/workflows/pipeline.yml) [![Coverage Status](https://coveralls.io/repos/github/pyiron/executorlib/badge.svg?branch=main)](https://coveralls.io/github/pyiron/executorlib?branch=main) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/pyiron/executorlib/HEAD?labpath=notebooks%2Fexamples.ipynb)