Remove spack testing (#221)

* Remove spack testing * Fix indentation * Remove leading spaces
precice · Nov 4, 2024 · 2cb1fee · 2cb1fee
1 parent dc7e520
commit 2cb1fee
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 293 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -8,31 +8,6 @@ on:
       - "*"
 
 jobs:
-  setup_for_spack:
-    name: Run setup.py phases needed by spack
-    needs: [setup_test]
-    runs-on: ubuntu-latest
-    container:
-      image: precice/precice:develop
-      options: --user root
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
-      - name: Install & upgrade pip3
-        run: |
-          apt-get -yy update
-          apt-get install -y python3-pip pkg-config
-          rm -rf /var/lib/apt/lists/*
-          pip3 install --upgrade --user pip
-      - name: Install dependencies
-        run: |
-          pip3 install --user toml
-          python3 -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | pip3 install -r /dev/stdin
-      - name: Run setup.py phases needed by spack
-        run: |
-          python3 setup.py install_lib
-          python3 setup.py build_ext
-
   setup_install:
     name: Run setup install
     runs-on: ubuntu-latest
@@ -59,30 +34,6 @@ jobs:
           export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
           python3 -c "import precice"
 
-  setup_install_single_version_externally_managed:
-    name: Run setup install --single-version-externally-managed (for spack)
-    needs: [setup_install]
-    runs-on: ubuntu-latest
-    container:
-      image: precice/precice:develop
-      options: --user root
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
-      - name: Install pip3, pkgconfig and upgrade pip3
-        run: |
-          su root
-          apt-get -yy update
-          apt-get install -y python3-pip pkg-config
-          rm -rf /var/lib/apt/lists/*
-          pip3 install --upgrade --user pip
-      - name: Install dependencies
-        run: |
-          pip3 install --user toml
-          python3 -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | pip3 install -r /dev/stdin
-      - name: Run setup install --single-version-externally-managed
-        run:  python3 setup.py install --single-version-externally-managed --root=/
-
   setup_test:
     name: Run setup test
     runs-on: ubuntu-latest
@@ -144,7 +95,7 @@ jobs:
 
   solverdummy_test:
     name: Run solverdummy
-    needs: [setup_install, setup_test]
+    needs: [pip_install]
     runs-on: ubuntu-latest
     container:
       image: precice/precice:develop

diff --git a/.github/workflows/build-env.yml b/.github/workflows/build-env.yml
diff --git a/.github/workflows/build-spack.yml b/.github/workflows/build-spack.yml
diff --git a/changelog-entries/221.md b/changelog-entries/221.md
@@ -0,0 +1 @@
+* Removed testing of spack package
diff --git a/docs/ReleaseGuide.md b/docs/ReleaseGuide.md
@@ -13,50 +13,52 @@ The release of the `python-bindings` repository is made directly from a release
     * `CHANGELOG.md` on `python-bindings-v2.1.1.1`.
     * There is no need to bump the version anywhere else, since we use the [python-versioneer](https://github.com/python-versioneer/python-versioneer/) for maintaining the version everywhere else.
 
-4. [Draft a New Release](https://github.com/precice/python-bindings/releases/new) in the `Releases` section of the repository page in a web browser.
+4. *Optional* test the [py-pyprecice Spack package](https://github.com/spack/spack/blob/develop/var/spack/repos/builtin/packages/py-pyprecice/package.py) using `spack dev-build py-pyprecice@develop`.
+
+5. [Draft a New Release](https://github.com/precice/python-bindings/releases/new) in the `Releases` section of the repository page in a web browser.
 
     * The release tag needs to be the exact version number (i.e.`v2.1.1.1` or `v2.1.1.1rc1`, compare to [existing tags](https://github.com/precice/python-bindings/tags)).
     * If this is a stable release, use `@target:master`. If this is a pre-release, use `@target:python-bindings-v2.1.1.1`. If you are making a pre-release, **directly skip to the [pre-release](#pre-release) section below**.
     * Release title is also the version number (i.e. `v2.1.1.1` or `v2.1.1.1rc1`, compare to [existing releases](https://github.com/precice/python-bindings/tags)).
 
-5. As soon as one approving review is made, merge the release PR (from `python-bindings-v2.1.1.1`) into `master`.
-
-6. Merge `master` into `develop` for synchronization of `develop`.
-
-7. If everything is in order up to this point then the new version can be released by hitting the "Publish release" button in your release Draft. This will create the corresponding tag and trigger [publishing the release to PyPI](https://github.com/precice/python-bindings/actions?query=workflow%3A%22Upload+Python+Package%22).
-
-8. Now there exists be a tag corresponding to the release on `master`. Re-run the [docker release workflow `build-docker.yml` via dispatch]([https://github.com/precice/fenics-adapter/actions/workflows/build-docker.yml](https://github.com/precice/python-bindings/actions/workflows/build-docker.yml)) such that the correct version is picked up by `versioneer`. Check the version in the container via `docker pull precice/python-bindings`, then `docker run -ti precice/python-bindings`, and inside the container `$ python3 -c "import precice; print(precice.__version__)"`. ⚠️ There is an open issue that needs fixing https://github.com/precice/python-bindings/issues/195 ⚠️
-
-9. Add an empty commit (details https://github.com/precice/python-bindings/issues/109) on master by running the steps:
+6. As soon as one approving review is made, merge the release PR (from `python-bindings-v2.1.1.1`) into `master`.
 
-    ```bash
-    git checkout master
-    git commit --allow-empty -m "post-tag bump"
-    git push
-    ```
+7. Merge `master` into `develop` for synchronization of `develop`.
 
-    Check that everything is in order via `git log`. Important: The `tag` and `origin/master` should not point to the same commit. For example:
+8. If everything is in order up to this point then the new version can be released by hitting the "Publish release" button in your release Draft. This will create the corresponding tag and trigger [publishing the release to PyPI](https://github.com/precice/python-bindings/actions?query=workflow%3A%22Upload+Python+Package%22).
 
-   ```bash
-   commit 44b715dde4e3194fa69e61045089ca4ec6925fe3 (HEAD -> master, origin/master)
-   Author: Benjamin Rodenberg <[email protected]>
-   Date:   Wed Oct 20 10:52:41 2021 +0200
+9. Now there exists be a tag corresponding to the release on `master`. Re-run the [docker release workflow `build-docker.yml` via dispatch]([https://github.com/precice/fenics-adapter/actions/workflows/build-docker.yml](https://github.com/precice/python-bindings/actions/workflows/build-docker.yml)) such that the correct version is picked up by `versioneer`. Check the version in the container via `docker pull precice/python-bindings`, then `docker run -ti precice/python-bindings`, and inside the container `$ python3 -c "import precice; print(precice.__version__)"`. ⚠️ There is an open issue that needs fixing https://github.com/precice/python-bindings/issues/195 ⚠️
 
-       post-tag bump
+10. Add an empty commit (details https://github.com/precice/python-bindings/issues/109) on master by running the steps:
 
-   commit d2645cc51f84ad5eda43b9c673400aada8e1505a (tag: v2.3.0.1)
-   Merge: 2039557 aca2354
-   Author: Benjamin Rodenberg <[email protected]>
-   Date:   Tue Oct 19 12:57:24 2021 +0200
+      ```bash
+      git checkout master
+      git commit --allow-empty -m "post-tag bump"
+      git push
+      ```
 
-       Merge pull request #132 from precice/python-bindings-v2.3.0.1
+      Check that everything is in order via `git log`. Important: The `tag` and `origin/master` should not point to the same commit. For example:
 
-       Release v2.3.0.1
-   ```
+      ```bash
+      commit 44b715dde4e3194fa69e61045089ca4ec6925fe3 (HEAD -> master, origin/master)
+      Author: Benjamin Rodenberg <[email protected]>
+      Date:   Wed Oct 20 10:52:41 2021 +0200
+   
+          post-tag bump
+   
+      commit d2645cc51f84ad5eda43b9c673400aada8e1505a (tag: v2.3.0.1)
+      Merge: 2039557 aca2354
+      Author: Benjamin Rodenberg <[email protected]>
+      Date:   Tue Oct 19 12:57:24 2021 +0200
+   
+          Merge pull request #132 from precice/python-bindings-v2.3.0.1
+   
+          Release v2.3.0.1
+      ```
 
-   For more details refer to https://github.com/precice/python-bindings/issues/109 and https://github.com/python-versioneer/python-versioneer/issues/217.
+      For more details refer to https://github.com/precice/python-bindings/issues/109 and https://github.com/python-versioneer/python-versioneer/issues/217.
 
-10. *Temporarily not maintained* Update Spack package (refer to `python-bindings/spack/README.md`).
+11. *Temporarily not maintained* Update the [py-pyprecice Spack package](https://github.com/spack/spack/blob/develop/var/spack/repos/builtin/packages/py-pyprecice/package.py).
 
 ## Pre-release
 

diff --git a/spack/README.md b/spack/README.md
diff --git a/spack/ci-spack-pyprecice-deps-2404.dockerfile b/spack/ci-spack-pyprecice-deps-2404.dockerfile
diff --git a/spack/repo/packages/py-pyprecice/package.py b/spack/repo/packages/py-pyprecice/package.py
diff --git a/spack/repo/repo.yaml b/spack/repo/repo.yaml