From 7ff0c17c493a78e583d37828f3286c48edc08e53 Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Mon, 13 Oct 2025 16:28:25 +0200 Subject: [PATCH 01/17] Update copyright year in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c896dfc..2d35e07b 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,6 @@ To use this, enable GitHub Actions and configure the following secrets in the Gi 3. Set `DOKKU_DEPLOYMENT_KEY` to the private key generated in step i. ## License -Copyright (c) 2022 - 2023 ProvideQ +Copyright (c) 2022 - 2025 ProvideQ This project is available under the [MIT License](./LICENSE). From 55cee69b914af4237cea027a323c0ce4b1d8bae0 Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Wed, 29 Oct 2025 18:40:38 +0100 Subject: [PATCH 02/17] added debug echos to track error Add debug messages around GAMS setup script execution --- .github/workflows/ci-cd-develop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci-cd-develop.yml b/.github/workflows/ci-cd-develop.yml index da4d67d9..c4725f37 100644 --- a/.github/workflows/ci-cd-develop.yml +++ b/.github/workflows/ci-cd-develop.yml @@ -25,7 +25,9 @@ jobs: env: GAMS_LICENSE: ${{ secrets.GAMS_LICENSE }} run: | + echo "DEBUG: before source" source ./scripts/setup-gams.sh + echo "DEBUG: after source echo "/opt/conda/bin" >> "$GITHUB_PATH" echo "$GAMS_PATH" >> "$GITHUB_PATH" echo "GMSPYTHONLIB=/opt/conda/envs/gams/lib/libpython3.10.so" >> "$GITHUB_ENV" From a93b9194b4fe7a8f0259565f858f322f34acb0bd Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Tue, 18 Nov 2025 16:24:06 +0100 Subject: [PATCH 03/17] debug: add debug echos to gams setup Added echo statements to provide feedback during the GAMS installation process. --- scripts/setup-gams.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/setup-gams.sh b/scripts/setup-gams.sh index 8ce91fca..0793b2b2 100755 --- a/scripts/setup-gams.sh +++ b/scripts/setup-gams.sh @@ -13,6 +13,8 @@ set -e apt-get update apt-get install curl --yes +echo "updated and installed curl" + # === Install GAMS === # GAMS Installation script is based on the official installation guide # (https://www.gams.com/latest/docs/UG_UNIX_INSTALL.html) and adapts some lines from @@ -24,24 +26,29 @@ GAMS_VERSION_HOTFIX=0 # download the self-extracting archive to /opt/gams/gams.exe and run/extract it curl --show-error --output /opt/gams/gams.exe --create-dirs "https://d37drm4t2jghv5.cloudfront.net/distributions/${GAMS_VERSION_RELEASE_MAJOR}.${GAMS_VERSION_HOTFIX}/linux/linux_x64_64_sfx.exe" +echo "downloaded gams" cd /opt/gams chmod +x gams.exe sync ./gams.exe -q # -q = quietly, see https://linux.die.net/man/1/unzipsfx +echo "installed gams" rm -rf gams.exe +echo "removed gams installer" # Install GAMS license GAMS_PATH=/opt/gams/gams${GAMS_VERSION_RELEASE_MAJOR}_linux_x64_64_sfx echo "${GAMS_LICENSE}" | base64 --decode > "$GAMS_PATH/gamslice.txt" +echo "installed gams license"\ # Add GAMS to PATH ln -s "$GAMS_PATH/gams" /usr/local/bin/gams echo "export PATH=\$PATH:$GAMS_PATH" >> ~/.bashrc +echo "added gams to path" # Run GAMS installer cd "$GAMS_PATH" &&\ ./gamsinst -a - +echo "ran gams installer" # === Install conda === From 0917fe0fdd4667d05ba6a47085c9a0bfbc5ad43d Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Tue, 18 Nov 2025 16:28:16 +0100 Subject: [PATCH 04/17] debug: removed "quiet" parameter from gams installer Updated echo statements to include debug information. --- scripts/setup-gams.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/setup-gams.sh b/scripts/setup-gams.sh index 0793b2b2..e62f077f 100755 --- a/scripts/setup-gams.sh +++ b/scripts/setup-gams.sh @@ -13,7 +13,7 @@ set -e apt-get update apt-get install curl --yes -echo "updated and installed curl" +echo "--- DEBUG: updated and installed curl---" # === Install GAMS === # GAMS Installation script is based on the official installation guide @@ -26,19 +26,19 @@ GAMS_VERSION_HOTFIX=0 # download the self-extracting archive to /opt/gams/gams.exe and run/extract it curl --show-error --output /opt/gams/gams.exe --create-dirs "https://d37drm4t2jghv5.cloudfront.net/distributions/${GAMS_VERSION_RELEASE_MAJOR}.${GAMS_VERSION_HOTFIX}/linux/linux_x64_64_sfx.exe" -echo "downloaded gams" +echo "--- DEBUG: downloaded gams---" cd /opt/gams chmod +x gams.exe sync -./gams.exe -q # -q = quietly, see https://linux.die.net/man/1/unzipsfx -echo "installed gams" +./gams.exe # -q # -q = quietly, see https://linux.die.net/man/1/unzipsfx +echo "--- DEBUG: installed gams---" rm -rf gams.exe -echo "removed gams installer" +echo "--- DEBUG: removed gams installer---" # Install GAMS license GAMS_PATH=/opt/gams/gams${GAMS_VERSION_RELEASE_MAJOR}_linux_x64_64_sfx echo "${GAMS_LICENSE}" | base64 --decode > "$GAMS_PATH/gamslice.txt" -echo "installed gams license"\ +echo "--- DEBUG: installed gams license---" # Add GAMS to PATH ln -s "$GAMS_PATH/gams" /usr/local/bin/gams From 93a7b8de749dd7e2c42ce1b5f1ae726c289a28ac Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Wed, 19 Nov 2025 14:30:42 +0100 Subject: [PATCH 05/17] feat: update GAMS version to 49.7 in setup script to replace unavailable version --- scripts/setup-gams.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup-gams.sh b/scripts/setup-gams.sh index e62f077f..38ed9b11 100755 --- a/scripts/setup-gams.sh +++ b/scripts/setup-gams.sh @@ -21,7 +21,7 @@ echo "--- DEBUG: updated and installed curl---" # iisaa/gams-docker (https://github.com/iiasa/gams-docker/blob/master/Dockerfile, GPL-3.0 licensed) # Configure the GAMS version here -GAMS_VERSION_RELEASE_MAJOR=49.3 +GAMS_VERSION_RELEASE_MAJOR=49.7 GAMS_VERSION_HOTFIX=0 # download the self-extracting archive to /opt/gams/gams.exe and run/extract it From 9aa40f9c31621d7445ef6ca2f0c5d125733bfeac Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Wed, 19 Nov 2025 14:40:46 +0100 Subject: [PATCH 06/17] debug: re-enabled quiet flag for GAMS installation, more debug echos --- scripts/setup-gams.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/setup-gams.sh b/scripts/setup-gams.sh index 38ed9b11..3001dbe4 100755 --- a/scripts/setup-gams.sh +++ b/scripts/setup-gams.sh @@ -30,7 +30,7 @@ echo "--- DEBUG: downloaded gams---" cd /opt/gams chmod +x gams.exe sync -./gams.exe # -q # -q = quietly, see https://linux.die.net/man/1/unzipsfx +./gams.exe -q # -q = quietly, see https://linux.die.net/man/1/unzipsfx echo "--- DEBUG: installed gams---" rm -rf gams.exe echo "--- DEBUG: removed gams installer---" @@ -43,12 +43,12 @@ echo "--- DEBUG: installed gams license---" # Add GAMS to PATH ln -s "$GAMS_PATH/gams" /usr/local/bin/gams echo "export PATH=\$PATH:$GAMS_PATH" >> ~/.bashrc -echo "added gams to path" +echo "--- DEBUG: added gams to path---" # Run GAMS installer cd "$GAMS_PATH" &&\ ./gamsinst -a -echo "ran gams installer" +echo "--- DEBUG: ran gams installer---" # === Install conda === @@ -78,9 +78,15 @@ conda create --name gams python=3.10 --yes # (https://askubuntu.com/a/1464306) source /opt/conda/bin/activate gams +echo "---DEBUG: activated conda env---" + # install GAMS links for python pip install gamsapi[core,connect] --find-links /opt/gams/gams${GAMS_VERSION_RELEASE_MAJOR}_linux_x64_64_sfx/api/python/bdist pip install networkx +echo "---DEBUG: installed python libs---" + # make GAMS use our python version echo "export GMSPYTHONLIB=/opt/conda/envs/gams/lib/libpython3.10.so" >> ~/.bashrc + +echo "---DEBUG: successfully set GAMS python version---" From c6ce48363aa2833e1510b62ecc02d5ece70f2ae8 Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Wed, 19 Nov 2025 14:43:32 +0100 Subject: [PATCH 07/17] debug: fix debug echo statement in CI/CD workflow --- .github/workflows/ci-cd-develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-cd-develop.yml b/.github/workflows/ci-cd-develop.yml index c4725f37..b02eadd9 100644 --- a/.github/workflows/ci-cd-develop.yml +++ b/.github/workflows/ci-cd-develop.yml @@ -27,7 +27,7 @@ jobs: run: | echo "DEBUG: before source" source ./scripts/setup-gams.sh - echo "DEBUG: after source + echo "DEBUG: after source" echo "/opt/conda/bin" >> "$GITHUB_PATH" echo "$GAMS_PATH" >> "$GITHUB_PATH" echo "GMSPYTHONLIB=/opt/conda/envs/gams/lib/libpython3.10.so" >> "$GITHUB_ENV" From b9d3e9205cbd1023a46b70d055f5616e7a55c49e Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Wed, 19 Nov 2025 14:49:31 +0100 Subject: [PATCH 08/17] refactor: clean up debug messages in setup-gams.sh Removed debug echo statements for cleaner output during installation. --- scripts/setup-gams.sh | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/scripts/setup-gams.sh b/scripts/setup-gams.sh index 3001dbe4..64309e47 100755 --- a/scripts/setup-gams.sh +++ b/scripts/setup-gams.sh @@ -13,8 +13,6 @@ set -e apt-get update apt-get install curl --yes -echo "--- DEBUG: updated and installed curl---" - # === Install GAMS === # GAMS Installation script is based on the official installation guide # (https://www.gams.com/latest/docs/UG_UNIX_INSTALL.html) and adapts some lines from @@ -26,29 +24,24 @@ GAMS_VERSION_HOTFIX=0 # download the self-extracting archive to /opt/gams/gams.exe and run/extract it curl --show-error --output /opt/gams/gams.exe --create-dirs "https://d37drm4t2jghv5.cloudfront.net/distributions/${GAMS_VERSION_RELEASE_MAJOR}.${GAMS_VERSION_HOTFIX}/linux/linux_x64_64_sfx.exe" -echo "--- DEBUG: downloaded gams---" cd /opt/gams chmod +x gams.exe sync ./gams.exe -q # -q = quietly, see https://linux.die.net/man/1/unzipsfx -echo "--- DEBUG: installed gams---" rm -rf gams.exe -echo "--- DEBUG: removed gams installer---" # Install GAMS license GAMS_PATH=/opt/gams/gams${GAMS_VERSION_RELEASE_MAJOR}_linux_x64_64_sfx echo "${GAMS_LICENSE}" | base64 --decode > "$GAMS_PATH/gamslice.txt" -echo "--- DEBUG: installed gams license---" # Add GAMS to PATH ln -s "$GAMS_PATH/gams" /usr/local/bin/gams echo "export PATH=\$PATH:$GAMS_PATH" >> ~/.bashrc -echo "--- DEBUG: added gams to path---" # Run GAMS installer cd "$GAMS_PATH" &&\ ./gamsinst -a -echo "--- DEBUG: ran gams installer---" + # === Install conda === @@ -78,15 +71,9 @@ conda create --name gams python=3.10 --yes # (https://askubuntu.com/a/1464306) source /opt/conda/bin/activate gams -echo "---DEBUG: activated conda env---" - # install GAMS links for python pip install gamsapi[core,connect] --find-links /opt/gams/gams${GAMS_VERSION_RELEASE_MAJOR}_linux_x64_64_sfx/api/python/bdist pip install networkx -echo "---DEBUG: installed python libs---" - # make GAMS use our python version echo "export GMSPYTHONLIB=/opt/conda/envs/gams/lib/libpython3.10.so" >> ~/.bashrc - -echo "---DEBUG: successfully set GAMS python version---" From 58c4e1ac57b2f2c269116c4f5b73e6d8e6be444b Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Wed, 19 Nov 2025 14:51:09 +0100 Subject: [PATCH 09/17] fix: remove debug echo statements from CI/CD script --- .github/workflows/ci-cd-develop.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci-cd-develop.yml b/.github/workflows/ci-cd-develop.yml index b02eadd9..da4d67d9 100644 --- a/.github/workflows/ci-cd-develop.yml +++ b/.github/workflows/ci-cd-develop.yml @@ -25,9 +25,7 @@ jobs: env: GAMS_LICENSE: ${{ secrets.GAMS_LICENSE }} run: | - echo "DEBUG: before source" source ./scripts/setup-gams.sh - echo "DEBUG: after source" echo "/opt/conda/bin" >> "$GITHUB_PATH" echo "$GAMS_PATH" >> "$GITHUB_PATH" echo "GMSPYTHONLIB=/opt/conda/envs/gams/lib/libpython3.10.so" >> "$GITHUB_ENV" From 8745e0edd06fd979af5d9d56d8051a4f102c29bc Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Thu, 20 Nov 2025 10:40:54 +0100 Subject: [PATCH 10/17] fix: upgraded qiskit versions --- solvers/qiskit/knapsack/knapsack_qiskit.py | 7 ++++--- solvers/qiskit/knapsack/requirements.txt | 4 ++-- solvers/qiskit/max-cut/maxCut_qiskit.py | 8 ++++---- solvers/qiskit/max-cut/requirements.txt | 4 ++-- solvers/qiskit/qubo/qubo_qiskit.py | 6 +++--- solvers/qiskit/qubo/requirements.txt | 4 ++-- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/solvers/qiskit/knapsack/knapsack_qiskit.py b/solvers/qiskit/knapsack/knapsack_qiskit.py index ae6416cd..55720378 100644 --- a/solvers/qiskit/knapsack/knapsack_qiskit.py +++ b/solvers/qiskit/knapsack/knapsack_qiskit.py @@ -2,12 +2,13 @@ import sys # Qiskit -from qiskit.primitives import Sampler +from qiskit.primitives import StatevectorSampler +from qiskit_optimization.minimum_eigensolvers import QAOA from qiskit_algorithms.optimizers import COBYLA from qiskit_optimization.algorithms import MinimumEigenOptimizer from qiskit_optimization.applications import Knapsack from qiskit_optimization.converters import QuadraticProgramToQubo -from qiskit_algorithms import QAOA + arg_count = len(sys.argv) - 1 if arg_count != 2: @@ -47,7 +48,7 @@ # TODO: Sampler() has to be replaces with StatevectorSampler() in newer versions. # (currently not yet supported by qiskit-optimization) # TODO: add a dedicated mixer -qaoa_mes = QAOA(sampler=Sampler(), optimizer=COBYLA()) +qaoa_mes = QAOA(sampler=StatevectorSampler(), optimizer=COBYLA()) qaoa = MinimumEigenOptimizer(qaoa_mes) qaoa_result = qaoa.solve(qubo) diff --git a/solvers/qiskit/knapsack/requirements.txt b/solvers/qiskit/knapsack/requirements.txt index 3f34f649..e42d620d 100644 --- a/solvers/qiskit/knapsack/requirements.txt +++ b/solvers/qiskit/knapsack/requirements.txt @@ -1,4 +1,4 @@ # This file describes the python package requirements for the Qiskit Knapsack solver -qiskit == 1.4.2 -qiskit-optimization == 0.6.1 +qiskit == 2.2.3 +qiskit-optimization == 0.7.0 diff --git a/solvers/qiskit/max-cut/maxCut_qiskit.py b/solvers/qiskit/max-cut/maxCut_qiskit.py index 2cf67fc4..84529daf 100644 --- a/solvers/qiskit/max-cut/maxCut_qiskit.py +++ b/solvers/qiskit/max-cut/maxCut_qiskit.py @@ -16,10 +16,10 @@ # Qiskit from qiskit.circuit.library import TwoLocal -from qiskit.primitives import Sampler +from qiskit.primitives import StatevectorSampler from qiskit_optimization.applications import Maxcut -from qiskit_algorithms import SamplingVQE -from qiskit_algorithms.optimizers import SPSA +from qiskit_optimization.minimum_eigensolvers import SamplingVQE +from qiskit_optimization.optimizers import SPSA #if len(sys.argv) != 3: @@ -86,7 +86,7 @@ # construct VQE optimizer=SPSA(maxiter=300) ry = TwoLocal(qubitOp.num_qubits, "ry", "cz", reps=5, entanglement="linear") -vqe = SamplingVQE(sampler=Sampler(), ansatz=ry, optimizer=optimizer) +vqe = SamplingVQE(sampler=StatevectorSampler(), ansatz=ry, optimizer=optimizer) # run VQE result = vqe.compute_minimum_eigenvalue(qubitOp) diff --git a/solvers/qiskit/max-cut/requirements.txt b/solvers/qiskit/max-cut/requirements.txt index 7823972c..d32d0f32 100644 --- a/solvers/qiskit/max-cut/requirements.txt +++ b/solvers/qiskit/max-cut/requirements.txt @@ -1,6 +1,6 @@ # This file describes the python package requirements for the Qiskit Max-Cut solver pygmlparser == 1.0.1 -qiskit == 1.4.2 -qiskit-optimization == 0.6.1 +qiskit == 2.2.3 +qiskit-optimization == 0.7.0 numpy networkx diff --git a/solvers/qiskit/qubo/qubo_qiskit.py b/solvers/qiskit/qubo/qubo_qiskit.py index d7b3469d..c1c2dd30 100644 --- a/solvers/qiskit/qubo/qubo_qiskit.py +++ b/solvers/qiskit/qubo/qubo_qiskit.py @@ -1,8 +1,8 @@ import sys from qp_converter import QpConverter -from qiskit.primitives import Sampler -from qiskit_algorithms import QAOA +from qiskit.primitives import StatevectorSampler +from qiskit_optimization.minimum_eigensolvers import QAOA from qiskit_algorithms.optimizers import COBYLA from qiskit_optimization.algorithms import MinimumEigenOptimizer @@ -19,7 +19,7 @@ # TODO: Sampler() has to be replaces with StatevectorSampler() in newer versions. # (currently not yet supported by qiskit-optimization) # TODO: add a dedicated mixer -qaoa_mes = QAOA(sampler=Sampler(), optimizer=COBYLA()) +qaoa_mes = QAOA(sampler=StatevectorSampler(), optimizer=COBYLA()) qaoa = MinimumEigenOptimizer(qaoa_mes) qaoa_result = qaoa.solve(qubo) diff --git a/solvers/qiskit/qubo/requirements.txt b/solvers/qiskit/qubo/requirements.txt index 04bd3e61..4bb8653e 100644 --- a/solvers/qiskit/qubo/requirements.txt +++ b/solvers/qiskit/qubo/requirements.txt @@ -1,3 +1,3 @@ # This file describes the python package requirements for the Qiskit QUBO solver -qiskit == 1.4.2 -qiskit-optimization == 0.6.1 +qiskit == 2.2.3 +qiskit-optimization == 0.7.0 From b209a306f35f1fbf418017c78564391bd03b16e6 Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Thu, 20 Nov 2025 15:51:45 +0100 Subject: [PATCH 11/17] fix: add overlooked sympy dependency for qrisp --- solvers/qrisp/qubo/requirements.txt | 3 ++- solvers/qrisp/sat/requirements.txt | 3 ++- solvers/qrisp/vrp/requirements.txt | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/solvers/qrisp/qubo/requirements.txt b/solvers/qrisp/qubo/requirements.txt index 10cb2e71..84e9ce00 100644 --- a/solvers/qrisp/qubo/requirements.txt +++ b/solvers/qrisp/qubo/requirements.txt @@ -1,4 +1,5 @@ # This file describes the python package requirements for the Qrisp QUBO solver qrisp == 0.4.4 numpy == 1.26.4 -gurobipy == 11.0.1 # for lp file reading \ No newline at end of file +gurobipy == 11.0.1 # for lp file reading +sympy == 1.12.1 # needed but not specified in qrisp requirements \ No newline at end of file diff --git a/solvers/qrisp/sat/requirements.txt b/solvers/qrisp/sat/requirements.txt index 30f9c9c3..b6c8cce0 100644 --- a/solvers/qrisp/sat/requirements.txt +++ b/solvers/qrisp/sat/requirements.txt @@ -1,3 +1,4 @@ # This file describes the python package requirements for the Qrisp SAT solver qrisp == 0.4.4 -numpy == 1.26.4 \ No newline at end of file +numpy == 1.26.4 +sympy == 1.12.1 # needed but not specified in qrisp requirements \ No newline at end of file diff --git a/solvers/qrisp/vrp/requirements.txt b/solvers/qrisp/vrp/requirements.txt index c7737696..c6f0918b 100644 --- a/solvers/qrisp/vrp/requirements.txt +++ b/solvers/qrisp/vrp/requirements.txt @@ -1,4 +1,5 @@ # This file describes the python package requirements for the Qrisp VRP solver qrisp == 0.4.4 numpy == 1.26.4 -tsplib95 == 0.7.1 # for tsplib file parsing \ No newline at end of file +tsplib95 == 0.7.1 # for tsplib file parsing +sympy == 1.12.1 # needed but not specified in qrisp requirements \ No newline at end of file From c40c0e60bef4e8e2cd8fb562332a2dce50da5cdf Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Thu, 20 Nov 2025 15:52:45 +0100 Subject: [PATCH 12/17] fix: update Qiskit optimizer import paths --- solvers/qiskit/knapsack/knapsack_qiskit.py | 2 +- .../qiskit/materialsimulation/material_simulation_qiskit.py | 4 ++-- solvers/qiskit/qubo/qubo_qiskit.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/solvers/qiskit/knapsack/knapsack_qiskit.py b/solvers/qiskit/knapsack/knapsack_qiskit.py index 55720378..7c27712f 100644 --- a/solvers/qiskit/knapsack/knapsack_qiskit.py +++ b/solvers/qiskit/knapsack/knapsack_qiskit.py @@ -4,7 +4,7 @@ # Qiskit from qiskit.primitives import StatevectorSampler from qiskit_optimization.minimum_eigensolvers import QAOA -from qiskit_algorithms.optimizers import COBYLA +from qiskit_optimization.optimizers import COBYLA from qiskit_optimization.algorithms import MinimumEigenOptimizer from qiskit_optimization.applications import Knapsack from qiskit_optimization.converters import QuadraticProgramToQubo diff --git a/solvers/qiskit/materialsimulation/material_simulation_qiskit.py b/solvers/qiskit/materialsimulation/material_simulation_qiskit.py index b06a5704..a565f55b 100644 --- a/solvers/qiskit/materialsimulation/material_simulation_qiskit.py +++ b/solvers/qiskit/materialsimulation/material_simulation_qiskit.py @@ -2,8 +2,8 @@ from qiskit_nature.units import DistanceUnit from qiskit_nature.second_q.drivers import PySCFDriver from qiskit_nature.second_q.mappers import JordanWignerMapper -from qiskit_algorithms import VQE -from qiskit_algorithms.optimizers import SLSQP +from qiskit_optimization.minimum_eigensolvers import VQE +from qiskit_optimization.optimizers import SLSQP from qiskit.primitives import Estimator from qiskit_nature.second_q.algorithms import GroundStateEigensolver, QEOM, EvaluationRule from qiskit_nature.second_q.circuit.library import HartreeFock, UCCSD diff --git a/solvers/qiskit/qubo/qubo_qiskit.py b/solvers/qiskit/qubo/qubo_qiskit.py index c1c2dd30..d63e20a0 100644 --- a/solvers/qiskit/qubo/qubo_qiskit.py +++ b/solvers/qiskit/qubo/qubo_qiskit.py @@ -3,7 +3,7 @@ from qiskit.primitives import StatevectorSampler from qiskit_optimization.minimum_eigensolvers import QAOA -from qiskit_algorithms.optimizers import COBYLA +from qiskit_optimization.optimizers import COBYLA from qiskit_optimization.algorithms import MinimumEigenOptimizer if len(sys.argv) != 3: From b0ad49b6bd9726383f8337d7a4d72d058569736d Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Thu, 27 Nov 2025 14:47:40 +0100 Subject: [PATCH 13/17] fix: removed explicit qiskit import --- solvers/qiskit/materialsimulation/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/solvers/qiskit/materialsimulation/requirements.txt b/solvers/qiskit/materialsimulation/requirements.txt index f67cfe6b..e94ab45b 100644 --- a/solvers/qiskit/materialsimulation/requirements.txt +++ b/solvers/qiskit/materialsimulation/requirements.txt @@ -1,3 +1,2 @@ -qiskit == 1.4.3 qiskit-nature == 0.7.2 pyscf == 2.9.0 \ No newline at end of file From a07ff7bec3658efd5c69be6f7c51496dbd59c50f Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Thu, 27 Nov 2025 15:12:52 +0100 Subject: [PATCH 14/17] fix: readded downgraded qiskit version to prevent usage of a cached higher version of qiskit --- solvers/qiskit/materialsimulation/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/solvers/qiskit/materialsimulation/requirements.txt b/solvers/qiskit/materialsimulation/requirements.txt index e94ab45b..e690a3d4 100644 --- a/solvers/qiskit/materialsimulation/requirements.txt +++ b/solvers/qiskit/materialsimulation/requirements.txt @@ -1,2 +1,3 @@ +qiskit == 0.44 qiskit-nature == 0.7.2 pyscf == 2.9.0 \ No newline at end of file From 9077c87a3dcc9f90facb33a7e70f87f8a1632f41 Mon Sep 17 00:00:00 2001 From: zaibod Date: Wed, 3 Dec 2025 18:31:40 +0100 Subject: [PATCH 15/17] fix: fixed material simulation dependency versions --- .../qiskit/materialsimulation/material_simulation_qiskit.py | 4 ++-- solvers/qiskit/materialsimulation/requirements.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/solvers/qiskit/materialsimulation/material_simulation_qiskit.py b/solvers/qiskit/materialsimulation/material_simulation_qiskit.py index a565f55b..b06a5704 100644 --- a/solvers/qiskit/materialsimulation/material_simulation_qiskit.py +++ b/solvers/qiskit/materialsimulation/material_simulation_qiskit.py @@ -2,8 +2,8 @@ from qiskit_nature.units import DistanceUnit from qiskit_nature.second_q.drivers import PySCFDriver from qiskit_nature.second_q.mappers import JordanWignerMapper -from qiskit_optimization.minimum_eigensolvers import VQE -from qiskit_optimization.optimizers import SLSQP +from qiskit_algorithms import VQE +from qiskit_algorithms.optimizers import SLSQP from qiskit.primitives import Estimator from qiskit_nature.second_q.algorithms import GroundStateEigensolver, QEOM, EvaluationRule from qiskit_nature.second_q.circuit.library import HartreeFock, UCCSD diff --git a/solvers/qiskit/materialsimulation/requirements.txt b/solvers/qiskit/materialsimulation/requirements.txt index e690a3d4..3b430447 100644 --- a/solvers/qiskit/materialsimulation/requirements.txt +++ b/solvers/qiskit/materialsimulation/requirements.txt @@ -1,3 +1,4 @@ -qiskit == 0.44 +qiskit == 1.0.2 +qiskit-algorithms == 0.3.1 qiskit-nature == 0.7.2 pyscf == 2.9.0 \ No newline at end of file From 80bb8d9b72dd2d07655177f697d6454187e44314 Mon Sep 17 00:00:00 2001 From: zaibod <92274292+zaibod@users.noreply.github.com> Date: Wed, 14 Jan 2026 15:00:25 +0100 Subject: [PATCH 16/17] fix: used newer version of gurobipy the license included in the old version was no longer updated and expired --- solvers/qrisp/qubo/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solvers/qrisp/qubo/requirements.txt b/solvers/qrisp/qubo/requirements.txt index 84e9ce00..c3de9c57 100644 --- a/solvers/qrisp/qubo/requirements.txt +++ b/solvers/qrisp/qubo/requirements.txt @@ -1,5 +1,5 @@ # This file describes the python package requirements for the Qrisp QUBO solver qrisp == 0.4.4 numpy == 1.26.4 -gurobipy == 11.0.1 # for lp file reading +gurobipy == 13 # for lp file reading sympy == 1.12.1 # needed but not specified in qrisp requirements \ No newline at end of file From 95cf3e7ee38d5fe0cb60e4d53c9fa2bf29664204 Mon Sep 17 00:00:00 2001 From: Elscrux <34755314+Elscrux@users.noreply.github.com> Date: Thu, 15 Jan 2026 13:28:12 +0100 Subject: [PATCH 17/17] Update copyright year to 2026 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2d35e07b..70448e05 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,6 @@ To use this, enable GitHub Actions and configure the following secrets in the Gi 3. Set `DOKKU_DEPLOYMENT_KEY` to the private key generated in step i. ## License -Copyright (c) 2022 - 2025 ProvideQ +Copyright (c) 2022 - 2026 ProvideQ This project is available under the [MIT License](./LICENSE).