From 2a6c4ef8a4dfe0107b85239e75bb606365e9a477 Mon Sep 17 00:00:00 2001 From: Anton Quelle <anton.quelle@pasqal.com> Date: Sat, 18 Jan 2025 14:38:38 +0100 Subject: [PATCH 01/10] fix emu-base dependency --- ci/emu_mps/pyproject.toml | 2 +- emu_base/__init__.py | 2 +- emu_mps/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/emu_mps/pyproject.toml b/ci/emu_mps/pyproject.toml index 666238a..daf03fe 100644 --- a/ci/emu_mps/pyproject.toml +++ b/ci/emu_mps/pyproject.toml @@ -23,7 +23,7 @@ classifiers=[ ] dynamic = ["version"] dependencies = [ - "emu-base==1.2.0"] + "emu-base==1.2.2"] [tool.hatch.version] path = "../../emu_mps/__init__.py" diff --git a/emu_base/__init__.py b/emu_base/__init__.py index 8ed935d..7f57232 100644 --- a/emu_base/__init__.py +++ b/emu_base/__init__.py @@ -44,4 +44,4 @@ "DEFAULT_MAX_KRYLOV_DIM", ] -__version__ = "1.2.1" +__version__ = "1.2.2" diff --git a/emu_mps/__init__.py b/emu_mps/__init__.py index 6b72031..244e7b3 100644 --- a/emu_mps/__init__.py +++ b/emu_mps/__init__.py @@ -35,4 +35,4 @@ "SecondMomentOfEnergy", ] -__version__ = "1.2.1" +__version__ = "1.2.2" From b9bc2f4ebb04836f0c74fa89745b3083e87a8c35 Mon Sep 17 00:00:00 2001 From: Anton Quelle <anton.quelle@pasqal.com> Date: Sat, 18 Jan 2025 15:16:35 +0100 Subject: [PATCH 02/10] check dependency versions --- .github/workflows/lint_test.yml | 8 +++++++- emu_base/__init__.py | 2 +- test_dependency_versions.sh | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100755 test_dependency_versions.sh diff --git a/.github/workflows/lint_test.yml b/.github/workflows/lint_test.yml index 4f064ac..94cd459 100644 --- a/.github/workflows/lint_test.yml +++ b/.github/workflows/lint_test.yml @@ -15,9 +15,15 @@ jobs: - run: pip install pre-commit pyproject-flake8 - run: pre-commit install - run: pre-commit run --all-files - test: + check_dependency_versions: needs: lint runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - run: ./test_dependency_versions.sh + test: + needs: check_dependency_versions + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 diff --git a/emu_base/__init__.py b/emu_base/__init__.py index 7f57232..8d04ae4 100644 --- a/emu_base/__init__.py +++ b/emu_base/__init__.py @@ -44,4 +44,4 @@ "DEFAULT_MAX_KRYLOV_DIM", ] -__version__ = "1.2.2" +__version__ = "1.2.3" diff --git a/test_dependency_versions.sh b/test_dependency_versions.sh new file mode 100755 index 0000000..a3b7209 --- /dev/null +++ b/test_dependency_versions.sh @@ -0,0 +1,14 @@ +mps_string=`grep emu-base ci/emu_mps/pyproject.toml` +[[ "$mps_string" =~ .*([0-9]\.[0-9]\.[0-9]).* ]] +mps_dep=${BASH_REMATCH[1]} +echo mps depends on emu-base version $mps_dep +base_string=`grep version emu_base/__init__.py` +[[ "$base_string" =~ .*([0-9]\.[0-9]\.[0-9]).* ]] +base_version=${BASH_REMATCH[1]} +echo emu-base is version $base_version +if [[ $mps_dep == $base_version ]] +then +exit 0 +else +exit 1 +fi From d0b61a10874bc662574ac51de96da416481e775c Mon Sep 17 00:00:00 2001 From: Anton Quelle <anton.quelle@pasqal.com> Date: Sat, 18 Jan 2025 15:18:30 +0100 Subject: [PATCH 03/10] undo bad dependency --- emu_base/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu_base/__init__.py b/emu_base/__init__.py index 8d04ae4..7f57232 100644 --- a/emu_base/__init__.py +++ b/emu_base/__init__.py @@ -44,4 +44,4 @@ "DEFAULT_MAX_KRYLOV_DIM", ] -__version__ = "1.2.3" +__version__ = "1.2.2" From ffb215d030e2294f212db9c4980b7f95126ef7b9 Mon Sep 17 00:00:00 2001 From: Anton Quelle <anton.quelle@pasqal.com> Date: Sat, 18 Jan 2025 15:19:52 +0100 Subject: [PATCH 04/10] hashbang --- test_dependency_versions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test_dependency_versions.sh b/test_dependency_versions.sh index a3b7209..eb614ba 100755 --- a/test_dependency_versions.sh +++ b/test_dependency_versions.sh @@ -1,3 +1,4 @@ +#!/bin/bash mps_string=`grep emu-base ci/emu_mps/pyproject.toml` [[ "$mps_string" =~ .*([0-9]\.[0-9]\.[0-9]).* ]] mps_dep=${BASH_REMATCH[1]} From 76541b10e301ed11223e5aebbf5246071b58c583 Mon Sep 17 00:00:00 2001 From: Anton Quelle <anton.quelle@pasqal.com> Date: Sat, 18 Jan 2025 15:20:25 +0100 Subject: [PATCH 05/10] line spacing --- test_dependency_versions.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test_dependency_versions.sh b/test_dependency_versions.sh index eb614ba..eba2cc5 100755 --- a/test_dependency_versions.sh +++ b/test_dependency_versions.sh @@ -1,12 +1,15 @@ #!/bin/bash + mps_string=`grep emu-base ci/emu_mps/pyproject.toml` [[ "$mps_string" =~ .*([0-9]\.[0-9]\.[0-9]).* ]] mps_dep=${BASH_REMATCH[1]} echo mps depends on emu-base version $mps_dep + base_string=`grep version emu_base/__init__.py` [[ "$base_string" =~ .*([0-9]\.[0-9]\.[0-9]).* ]] base_version=${BASH_REMATCH[1]} echo emu-base is version $base_version + if [[ $mps_dep == $base_version ]] then exit 0 From ddade5f03e1a81cc0f2afe11fa45b293f0f2270c Mon Sep 17 00:00:00 2001 From: Anton Quelle <anton.quelle@pasqal.com> Date: Sat, 18 Jan 2025 15:21:37 +0100 Subject: [PATCH 06/10] fix string --- test_dependency_versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_dependency_versions.sh b/test_dependency_versions.sh index eba2cc5..2fb36be 100755 --- a/test_dependency_versions.sh +++ b/test_dependency_versions.sh @@ -3,7 +3,7 @@ mps_string=`grep emu-base ci/emu_mps/pyproject.toml` [[ "$mps_string" =~ .*([0-9]\.[0-9]\.[0-9]).* ]] mps_dep=${BASH_REMATCH[1]} -echo mps depends on emu-base version $mps_dep +echo emu-mps depends on emu-base version $mps_dep base_string=`grep version emu_base/__init__.py` [[ "$base_string" =~ .*([0-9]\.[0-9]\.[0-9]).* ]] From 7ace40f6d3845d5b11e67340e03dbbf2560fc9a4 Mon Sep 17 00:00:00 2001 From: Anton Quelle <anton.quelle@pasqal.com> Date: Sat, 18 Jan 2025 15:50:02 +0100 Subject: [PATCH 07/10] inherit tag from parent --- .github/workflows/publish_emu_mps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_emu_mps.yml b/.github/workflows/publish_emu_mps.yml index f3306a5..58106d5 100644 --- a/.github/workflows/publish_emu_mps.yml +++ b/.github/workflows/publish_emu_mps.yml @@ -60,4 +60,4 @@ jobs: git config user.name "GitHub Actions" git config user.email "actions@github.com" git fetch origin gh-pages - mike deploy --push --update-aliases ${{ github.ref_name }} latest + mike deploy --push --update-aliases ${{ github.event.workflow_run.head_branch }} latest From 5dab992484557a5c7a2f45fd78f84498fe66227d Mon Sep 17 00:00:00 2001 From: Anton Quelle <anton.quelle@pasqal.com> Date: Mon, 20 Jan 2025 16:57:56 +0100 Subject: [PATCH 08/10] version selector --- mkdocs.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mkdocs.yml b/mkdocs.yml index ee1b864..079cb78 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -112,3 +112,7 @@ extra_javascript: watch: - emu_base - emu_mps + +extra: + version: + provider: mike From e1a172836f0413a68504f90290f97cb3d120f77d Mon Sep 17 00:00:00 2001 From: Anton Quelle <anton.quelle@pasqal.com> Date: Tue, 21 Jan 2025 09:10:59 +0100 Subject: [PATCH 09/10] delete deployments --- .github/workflows/lint_test.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/lint_test.yml b/.github/workflows/lint_test.yml index 94cd459..f5d33c8 100644 --- a/.github/workflows/lint_test.yml +++ b/.github/workflows/lint_test.yml @@ -35,3 +35,14 @@ jobs: - run: pytest -vvv --cov-report=term-missing --cov-config=pyproject.toml --cov=emu_mps --cov=emu_base --cov=emu_sv --cov=optimatrix - run: pytest --nbmake **/**/**/*.ipynb - run: readme-cov + cleanup: + runs-on: ubuntu-latest + permissions: write-all + + steps: + - name: 🗑 Delete deployment + uses: strumwolf/delete-deployment-environment@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + environment: github-pages + onlyRemoveDeployments: true From 1f099bd319cdaf147b3422427ad61a1287fd608a Mon Sep 17 00:00:00 2001 From: Anton Quelle <anton.quelle@pasqal.com> Date: Tue, 21 Jan 2025 09:21:15 +0100 Subject: [PATCH 10/10] no longer delete deployments --- .github/workflows/lint_test.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/lint_test.yml b/.github/workflows/lint_test.yml index f5d33c8..94cd459 100644 --- a/.github/workflows/lint_test.yml +++ b/.github/workflows/lint_test.yml @@ -35,14 +35,3 @@ jobs: - run: pytest -vvv --cov-report=term-missing --cov-config=pyproject.toml --cov=emu_mps --cov=emu_base --cov=emu_sv --cov=optimatrix - run: pytest --nbmake **/**/**/*.ipynb - run: readme-cov - cleanup: - runs-on: ubuntu-latest - permissions: write-all - - steps: - - name: 🗑 Delete deployment - uses: strumwolf/delete-deployment-environment@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - environment: github-pages - onlyRemoveDeployments: true