From dc63259c1c63c6110ed9a4f0545fa43bd912539a Mon Sep 17 00:00:00 2001 From: "shahidee44@hotmail.com" Date: Tue, 23 May 2023 03:40:06 +0000 Subject: [PATCH 01/23] Updated scripts --- MANIFEST.in | 3 ++- _version.py | 1 + scripts/install_all_subpackages.sh | 12 ------------ scripts/install_and_test_openqaoa_azure.sh | 4 ---- scripts/install_and_test_openqaoa_braket.sh | 4 ---- scripts/install_and_test_openqaoa_core.sh | 6 +----- scripts/install_and_test_openqaoa_dev.sh | 5 +---- scripts/install_and_test_openqaoa_pyquil.sh | 4 ---- scripts/install_and_test_openqaoa_qiskit.sh | 4 ---- ...push_package.sh => push_package_testpypi.sh} | 17 +++++++++++++---- scripts/run_all_install_and_test.sh | 8 ++++++++ scripts/run_all_install_test.sh | 6 ------ scripts/test_build_dist.sh | 16 ---------------- scripts/test_version.py | 3 +++ setup.py | 17 ++++++++--------- src/openqaoa-azure/openqaoa_azure/_version.py | 2 +- src/openqaoa-braket/openqaoa_braket/_version.py | 2 +- src/openqaoa-core/openqaoa/_version.py | 2 +- src/openqaoa-core/requirements_test.txt | 1 + src/openqaoa-pyquil/openqaoa_pyquil/_version.py | 2 +- src/openqaoa-qiskit/openqaoa_qiskit/_version.py | 2 +- 21 files changed, 43 insertions(+), 78 deletions(-) create mode 100644 _version.py delete mode 100755 scripts/install_all_subpackages.sh rename scripts/{push_package.sh => push_package_testpypi.sh} (64%) create mode 100755 scripts/run_all_install_and_test.sh delete mode 100755 scripts/run_all_install_test.sh delete mode 100755 scripts/test_build_dist.sh diff --git a/MANIFEST.in b/MANIFEST.in index 18faf9846..d4e1cf8ec 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,2 @@ -recursive-include src/* README.md requirements*.txt \ No newline at end of file +include README.md +include _version.py \ No newline at end of file diff --git a/_version.py b/_version.py new file mode 100644 index 000000000..cbc50ae37 --- /dev/null +++ b/_version.py @@ -0,0 +1 @@ +__version__ = "0.1.20-rc2" \ No newline at end of file diff --git a/scripts/install_all_subpackages.sh b/scripts/install_all_subpackages.sh deleted file mode 100755 index 48b9b6d48..000000000 --- a/scripts/install_all_subpackages.sh +++ /dev/null @@ -1,12 +0,0 @@ -#Exit immediately if a command exits with a non-zero status. -set -e - -# The order of install is important therefore the list cannot be dynamically generated -modulesList=("openqaoa-core" "openqaoa-qiskit" "openqaoa-braket" "openqaoa-pyquil" "openqaoa-azure") - -for entry in "${modulesList[@]}"; do - echo "processing src/$entry/setup.py" - cd src/$entry - pip install . - cd "../.." -done \ No newline at end of file diff --git a/scripts/install_and_test_openqaoa_azure.sh b/scripts/install_and_test_openqaoa_azure.sh index a868d5458..f23ee5480 100755 --- a/scripts/install_and_test_openqaoa_azure.sh +++ b/scripts/install_and_test_openqaoa_azure.sh @@ -16,8 +16,4 @@ for entry in "${modulesList[@]}"; do cd src/$entry pytest -n auto tests cd "../.." -done - -for entry in "${modulesList[@]}"; do - pip uninstall -y $entry done \ No newline at end of file diff --git a/scripts/install_and_test_openqaoa_braket.sh b/scripts/install_and_test_openqaoa_braket.sh index b2fb8aa06..5dd12cf3d 100755 --- a/scripts/install_and_test_openqaoa_braket.sh +++ b/scripts/install_and_test_openqaoa_braket.sh @@ -16,8 +16,4 @@ for entry in "${modulesList[@]}"; do cd src/$entry pytest -n auto tests cd "../.." -done - -for entry in "${modulesList[@]}"; do - pip uninstall -y $entry done \ No newline at end of file diff --git a/scripts/install_and_test_openqaoa_core.sh b/scripts/install_and_test_openqaoa_core.sh index 47b15d739..6a5d595ee 100755 --- a/scripts/install_and_test_openqaoa_core.sh +++ b/scripts/install_and_test_openqaoa_core.sh @@ -7,7 +7,7 @@ modulesList=("openqaoa-core") for entry in "${modulesList[@]}"; do echo "processing src/$entry/setup.py" cd src/$entry - pip install . + pip install .[tests] cd "../.." done @@ -16,8 +16,4 @@ for entry in "${modulesList[@]}"; do cd src/$entry pytest -n auto tests cd "../.." -done - -for entry in "${modulesList[@]}"; do - pip uninstall -y $entry done \ No newline at end of file diff --git a/scripts/install_and_test_openqaoa_dev.sh b/scripts/install_and_test_openqaoa_dev.sh index 988b8c6e6..8450205fc 100755 --- a/scripts/install_and_test_openqaoa_dev.sh +++ b/scripts/install_and_test_openqaoa_dev.sh @@ -1,9 +1,6 @@ #Exit immediately if a command exits with a non-zero status. set -e -# TODO: Dynamically generate names (The order of installing is important here.) -modulesList=("src/openqaoa-core" "src/openqaoa-qiskit" "src/openqaoa-braket" "src/openqaoa-pyquil" "src/openqaoa-azure") - pip install . -pytest tests/ src/*/tests +pytest tests/ src/*/tests -n auto pip uninstall -y openqaoa \ No newline at end of file diff --git a/scripts/install_and_test_openqaoa_pyquil.sh b/scripts/install_and_test_openqaoa_pyquil.sh index 650483761..542d3a595 100755 --- a/scripts/install_and_test_openqaoa_pyquil.sh +++ b/scripts/install_and_test_openqaoa_pyquil.sh @@ -16,8 +16,4 @@ for entry in "${modulesList[@]}"; do cd src/$entry pytest -n auto tests cd "../.." -done - -for entry in "${modulesList[@]}"; do - pip uninstall -y $entry done \ No newline at end of file diff --git a/scripts/install_and_test_openqaoa_qiskit.sh b/scripts/install_and_test_openqaoa_qiskit.sh index cce9e2ea5..ba6aa5d4f 100755 --- a/scripts/install_and_test_openqaoa_qiskit.sh +++ b/scripts/install_and_test_openqaoa_qiskit.sh @@ -16,8 +16,4 @@ for entry in "${modulesList[@]}"; do cd src/$entry pytest -n auto tests cd "../.." -done - -for entry in "${modulesList[@]}"; do - pip uninstall -y $entry done \ No newline at end of file diff --git a/scripts/push_package.sh b/scripts/push_package_testpypi.sh similarity index 64% rename from scripts/push_package.sh rename to scripts/push_package_testpypi.sh index 794c2e060..f456f5556 100755 --- a/scripts/push_package.sh +++ b/scripts/push_package_testpypi.sh @@ -5,14 +5,23 @@ set -e modulesList=("src/openqaoa-core" "src/openqaoa-qiskit" "src/openqaoa-braket" "src/openqaoa-pyquil" "src/openqaoa-azure") python scripts/test_version.py + +pip install build twine +# build and install plugins for entry in "${modulesList[@]}"; do echo "processing $entry/setup.py" cd $entry + rm -rf dist build pip install . - # python -m build - python3 setup.py -q sdist - python3 setup.py -q bdist_wheel + python -m build twine upload --repository testpypi dist/* --username $1 --password $2 + rm -rf dist build cd "../.." -done \ No newline at end of file +done + +# build and install openqaoa metapackage +rm -rf dist build +pip install . +python -m build +twine upload --repository testpypi dist/* --username $1 --password $2 \ No newline at end of file diff --git a/scripts/run_all_install_and_test.sh b/scripts/run_all_install_and_test.sh new file mode 100755 index 000000000..767a1f03c --- /dev/null +++ b/scripts/run_all_install_and_test.sh @@ -0,0 +1,8 @@ +set -e + +scripts/install_and_test_openqaoa_core.sh +scripts/install_and_test_openqaoa_qiskit.sh +scripts/install_and_test_openqaoa_pyquil.sh +scripts/install_and_test_openqaoa_braket.sh +scripts/install_and_test_openqaoa_azure.sh +scripts/install_and_test_openqaoa_dev.sh \ No newline at end of file diff --git a/scripts/run_all_install_test.sh b/scripts/run_all_install_test.sh deleted file mode 100755 index c6cae3130..000000000 --- a/scripts/run_all_install_test.sh +++ /dev/null @@ -1,6 +0,0 @@ -install_and_test_openqaoa_core.sh -install_and_test_openqaoa_qiskit.sh -install_and_test_openqaoa_pyquil.sh -install_and_test_openqaoa_braket.sh -install_and_test_openqaoa_azure.sh -install_and_test_openqaoa_dev.sh \ No newline at end of file diff --git a/scripts/test_build_dist.sh b/scripts/test_build_dist.sh deleted file mode 100755 index 35607c3dd..000000000 --- a/scripts/test_build_dist.sh +++ /dev/null @@ -1,16 +0,0 @@ -#Exit immediately if a command exits with a non-zero status. -set -e - -# TODO: Dynamically generate names (The order of installing and pushing is important here.) -modulesList=("src/openqaoa-core" "src/openqaoa-qiskit" "src/openqaoa-braket" "src/openqaoa-pyquil" "src/openqaoa-azure") - -# This script checks that all internal plugins have the same version number -python scripts/test_version.py - -for entry in "${modulesList[@]}"; do - echo "processing $entry/setup.py" - cd $entry - pip install -e . - python -m build - cd "../.." -done \ No newline at end of file diff --git a/scripts/test_version.py b/scripts/test_version.py index 08910ed98..40a8d0dfd 100644 --- a/scripts/test_version.py +++ b/scripts/test_version.py @@ -22,6 +22,9 @@ version_check = [ each_item == version_dict["openqaoa-core"] for each_item in version_dict.values() ] +with open("_version.py") as f: + meta_version = f.readlines()[-1].split()[-1].strip("\"'") +version_check.append(meta_version == version_dict["openqaoa-core"]) for each_check in version_check: if not each_check: raise Exception( diff --git a/setup.py b/setup.py index bdc423a99..9526c4f58 100644 --- a/setup.py +++ b/setup.py @@ -7,25 +7,24 @@ long_description = fh.read() # Dev package will share versions with the core in it. -with open("src/openqaoa-core/openqaoa/_version.py") as f: +with open("_version.py") as f: version = f.readlines()[-1].split()[-1].strip("\"'") requirements = [f"{each_folder_name}=={version}" for each_folder_name in os.listdir("src") if "openqaoa-" in each_folder_name] -requirements = [ - f'openqaoa-core @ file://localhost/{current_path}/src/openqaoa-core', - f'openqaoa-qiskit @ file://localhost/{current_path}/src/openqaoa-qiskit', - f'openqaoa-braket @ file://localhost/{current_path}/src/openqaoa-braket', - f'openqaoa-pyquil @ file://localhost/{current_path}/src/openqaoa-pyquil', - f'openqaoa-azure @ file://localhost/{current_path}/src/openqaoa-azure' -] +# requirements = [ +# f'openqaoa-core @ file://localhost/{current_path}/src/openqaoa-core', +# f'openqaoa-qiskit @ file://localhost/{current_path}/src/openqaoa-qiskit', +# f'openqaoa-braket @ file://localhost/{current_path}/src/openqaoa-braket', +# f'openqaoa-pyquil @ file://localhost/{current_path}/src/openqaoa-pyquil', +# f'openqaoa-azure @ file://localhost/{current_path}/src/openqaoa-azure' +# ] setup( name="openqaoa", python_requires=">=3.8, <3.11", version=version, author="Entropica Labs", - packages=find_namespace_packages(where=".", exclude=["dist", "build"]), entry_points={"openqaoa.plugins": []}, url="https://github.com/entropicalabs/openqaoa", install_requires=requirements, diff --git a/src/openqaoa-azure/openqaoa_azure/_version.py b/src/openqaoa-azure/openqaoa_azure/_version.py index 25f2fb603..d0440e0a1 100644 --- a/src/openqaoa-azure/openqaoa_azure/_version.py +++ b/src/openqaoa-azure/openqaoa_azure/_version.py @@ -1 +1 @@ -__version__ = "0.1.19" \ No newline at end of file +__version__ = "0.1.20-rc2" \ No newline at end of file diff --git a/src/openqaoa-braket/openqaoa_braket/_version.py b/src/openqaoa-braket/openqaoa_braket/_version.py index 25f2fb603..d0440e0a1 100644 --- a/src/openqaoa-braket/openqaoa_braket/_version.py +++ b/src/openqaoa-braket/openqaoa_braket/_version.py @@ -1 +1 @@ -__version__ = "0.1.19" \ No newline at end of file +__version__ = "0.1.20-rc2" \ No newline at end of file diff --git a/src/openqaoa-core/openqaoa/_version.py b/src/openqaoa-core/openqaoa/_version.py index 25f2fb603..d0440e0a1 100644 --- a/src/openqaoa-core/openqaoa/_version.py +++ b/src/openqaoa-core/openqaoa/_version.py @@ -1 +1 @@ -__version__ = "0.1.19" \ No newline at end of file +__version__ = "0.1.20-rc2" \ No newline at end of file diff --git a/src/openqaoa-core/requirements_test.txt b/src/openqaoa-core/requirements_test.txt index 47a0d5932..6194d46ea 100644 --- a/src/openqaoa-core/requirements_test.txt +++ b/src/openqaoa-core/requirements_test.txt @@ -1,4 +1,5 @@ pytest>=7.1.0 +pytest-xdist pytest-cov>=3.0.0 ipython>=8.2.0 nbconvert>=6.5.1 diff --git a/src/openqaoa-pyquil/openqaoa_pyquil/_version.py b/src/openqaoa-pyquil/openqaoa_pyquil/_version.py index 25f2fb603..d0440e0a1 100644 --- a/src/openqaoa-pyquil/openqaoa_pyquil/_version.py +++ b/src/openqaoa-pyquil/openqaoa_pyquil/_version.py @@ -1 +1 @@ -__version__ = "0.1.19" \ No newline at end of file +__version__ = "0.1.20-rc2" \ No newline at end of file diff --git a/src/openqaoa-qiskit/openqaoa_qiskit/_version.py b/src/openqaoa-qiskit/openqaoa_qiskit/_version.py index 25f2fb603..d0440e0a1 100644 --- a/src/openqaoa-qiskit/openqaoa_qiskit/_version.py +++ b/src/openqaoa-qiskit/openqaoa_qiskit/_version.py @@ -1 +1 @@ -__version__ = "0.1.19" \ No newline at end of file +__version__ = "0.1.20-rc2" \ No newline at end of file From 7257e830d5dd7093f88cc5e8ae09ed6252bdee98 Mon Sep 17 00:00:00 2001 From: "shahidee44@hotmail.com" Date: Tue, 23 May 2023 06:09:50 +0000 Subject: [PATCH 02/23] Updated scripts --- .../{test_install_package.sh => install_package_testpypi.sh} | 2 +- .../tests/jobs_test_input/input_data/openqaoa_params.json | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) rename scripts/{test_install_package.sh => install_package_testpypi.sh} (55%) diff --git a/scripts/test_install_package.sh b/scripts/install_package_testpypi.sh similarity index 55% rename from scripts/test_install_package.sh rename to scripts/install_package_testpypi.sh index d4bfadbc9..b88dcf8a2 100755 --- a/scripts/test_install_package.sh +++ b/scripts/install_package_testpypi.sh @@ -1,5 +1,5 @@ modulesList=("openqaoa-core" "openqaoa-qiskit" "openqaoa-braket" "openqaoa-pyquil" "openqaoa-azure") for entry in "${modulesList[@]}"; do - pip install -i https://test.pypi.org/simple/ --no-deps $entry + pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ --pre $entry done \ No newline at end of file diff --git a/src/openqaoa-braket/tests/jobs_test_input/input_data/openqaoa_params.json b/src/openqaoa-braket/tests/jobs_test_input/input_data/openqaoa_params.json index e259e1680..00f028e15 100644 --- a/src/openqaoa-braket/tests/jobs_test_input/input_data/openqaoa_params.json +++ b/src/openqaoa-braket/tests/jobs_test_input/input_data/openqaoa_params.json @@ -1,7 +1,7 @@ { "header": { - "atomic_id": "386997de-0e90-4e1c-8236-cd722801615f", - "experiment_id": "ce2f83d7-4000-4507-9e98-96e3f9afd55e", + "atomic_id": "d32eb15f-8b8c-4373-a24e-a2c38196d82f", + "experiment_id": "8d778c1a-a942-4997-bf69-13bd552f0ec6", "project_id": null, "algorithm": "rqaoa", "description": null, @@ -227,6 +227,7 @@ "initial_qubit_mapping": null, "seed_simulator": null, "qiskit_simulation_method": null, + "qiskit_optimization_level": null, "active_reset": null, "rewiring": null, "disable_qubit_rewiring": null From 16c38e03adc17798ab0b84ae62e4eb695924005c Mon Sep 17 00:00:00 2001 From: "shahidee44@hotmail.com" Date: Tue, 23 May 2023 06:27:04 +0000 Subject: [PATCH 03/23] Update scripts, openqaoa-meta rename (testing only) --- _version.py | 2 +- scripts/install_and_test_openqaoa_dev.sh | 2 +- scripts/install_package_testpypi.sh | 4 +++- setup.py | 2 +- src/openqaoa-azure/openqaoa_azure/_version.py | 2 +- src/openqaoa-braket/openqaoa_braket/_version.py | 2 +- src/openqaoa-core/openqaoa/_version.py | 2 +- src/openqaoa-pyquil/openqaoa_pyquil/_version.py | 2 +- src/openqaoa-qiskit/openqaoa_qiskit/_version.py | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/_version.py b/_version.py index cbc50ae37..f5afdc332 100644 --- a/_version.py +++ b/_version.py @@ -1 +1 @@ -__version__ = "0.1.20-rc2" \ No newline at end of file +__version__ = "0.1.20-rc3" \ No newline at end of file diff --git a/scripts/install_and_test_openqaoa_dev.sh b/scripts/install_and_test_openqaoa_dev.sh index 8450205fc..0bef1fda2 100755 --- a/scripts/install_and_test_openqaoa_dev.sh +++ b/scripts/install_and_test_openqaoa_dev.sh @@ -3,4 +3,4 @@ set -e pip install . pytest tests/ src/*/tests -n auto -pip uninstall -y openqaoa \ No newline at end of file +pip uninstall -y openqaoa-meta \ No newline at end of file diff --git a/scripts/install_package_testpypi.sh b/scripts/install_package_testpypi.sh index b88dcf8a2..efd314f8e 100755 --- a/scripts/install_package_testpypi.sh +++ b/scripts/install_package_testpypi.sh @@ -1,4 +1,6 @@ -modulesList=("openqaoa-core" "openqaoa-qiskit" "openqaoa-braket" "openqaoa-pyquil" "openqaoa-azure") +set -e + +modulesList=("openqaoa-core" "openqaoa-qiskit" "openqaoa-braket" "openqaoa-pyquil" "openqaoa-azure" "openqaoa-meta") for entry in "${modulesList[@]}"; do pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ --pre $entry diff --git a/setup.py b/setup.py index 9526c4f58..380cefd23 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ # ] setup( - name="openqaoa", + name="openqaoa-meta", python_requires=">=3.8, <3.11", version=version, author="Entropica Labs", diff --git a/src/openqaoa-azure/openqaoa_azure/_version.py b/src/openqaoa-azure/openqaoa_azure/_version.py index d0440e0a1..1dec11299 100644 --- a/src/openqaoa-azure/openqaoa_azure/_version.py +++ b/src/openqaoa-azure/openqaoa_azure/_version.py @@ -1 +1 @@ -__version__ = "0.1.20-rc2" \ No newline at end of file +__version__ = "0.1.20-rc3" \ No newline at end of file diff --git a/src/openqaoa-braket/openqaoa_braket/_version.py b/src/openqaoa-braket/openqaoa_braket/_version.py index d0440e0a1..1dec11299 100644 --- a/src/openqaoa-braket/openqaoa_braket/_version.py +++ b/src/openqaoa-braket/openqaoa_braket/_version.py @@ -1 +1 @@ -__version__ = "0.1.20-rc2" \ No newline at end of file +__version__ = "0.1.20-rc3" \ No newline at end of file diff --git a/src/openqaoa-core/openqaoa/_version.py b/src/openqaoa-core/openqaoa/_version.py index d0440e0a1..1dec11299 100644 --- a/src/openqaoa-core/openqaoa/_version.py +++ b/src/openqaoa-core/openqaoa/_version.py @@ -1 +1 @@ -__version__ = "0.1.20-rc2" \ No newline at end of file +__version__ = "0.1.20-rc3" \ No newline at end of file diff --git a/src/openqaoa-pyquil/openqaoa_pyquil/_version.py b/src/openqaoa-pyquil/openqaoa_pyquil/_version.py index d0440e0a1..1dec11299 100644 --- a/src/openqaoa-pyquil/openqaoa_pyquil/_version.py +++ b/src/openqaoa-pyquil/openqaoa_pyquil/_version.py @@ -1 +1 @@ -__version__ = "0.1.20-rc2" \ No newline at end of file +__version__ = "0.1.20-rc3" \ No newline at end of file diff --git a/src/openqaoa-qiskit/openqaoa_qiskit/_version.py b/src/openqaoa-qiskit/openqaoa_qiskit/_version.py index d0440e0a1..1dec11299 100644 --- a/src/openqaoa-qiskit/openqaoa_qiskit/_version.py +++ b/src/openqaoa-qiskit/openqaoa_qiskit/_version.py @@ -1 +1 @@ -__version__ = "0.1.20-rc2" \ No newline at end of file +__version__ = "0.1.20-rc3" \ No newline at end of file From 69dd23626676198f800fa6fb0584832983d493f0 Mon Sep 17 00:00:00 2001 From: "shahidee44@hotmail.com" Date: Tue, 23 May 2023 06:39:56 +0000 Subject: [PATCH 04/23] Moved metapackage install after plugin installs for local Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e7b75dc0d..d76441fd5 100644 --- a/Makefile +++ b/Makefile @@ -3,39 +3,39 @@ .PHONY: dev-install dev-install: - pip install -e . pip install -e ./src/openqaoa-core pip install -e ./src/openqaoa-qiskit pip install -e ./src/openqaoa-pyquil pip install -e ./src/openqaoa-braket pip install -e ./src/openqaoa-azure + pip install -e . .PHONY: dev-install-tests dev-install-tests: - pip install -e . pip install -e ./src/openqaoa-core[tests] pip install -e ./src/openqaoa-qiskit pip install -e ./src/openqaoa-pyquil pip install -e ./src/openqaoa-braket pip install -e ./src/openqaoa-azure + pip install -e . .PHONY: dev-install-docs dev-install-docs: - pip install -e . pip install -e ./src/openqaoa-core[docs] pip install -e ./src/openqaoa-qiskit pip install -e ./src/openqaoa-pyquil pip install -e ./src/openqaoa-braket pip install -e ./src/openqaoa-azure + pip install -e . .PHONY: dev-install-all dev-install-all: - pip install -e . pip install -e ./src/openqaoa-core[all] pip install -e ./src/openqaoa-qiskit pip install -e ./src/openqaoa-pyquil pip install -e ./src/openqaoa-braket pip install -e ./src/openqaoa-azure + pip install -e . .PHONY: dev-uninstall dev-uninstall: From 46713d136a5193c6e195b7a5f748a0c09b51ed9e Mon Sep 17 00:00:00 2001 From: shahidee44 <36878360+shahidee44@users.noreply.github.com> Date: Tue, 23 May 2023 14:42:55 +0800 Subject: [PATCH 05/23] Update test_dev.yml --- .github/workflows/test_dev.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test_dev.yml b/.github/workflows/test_dev.yml index f163607ea..0a6a73a91 100644 --- a/.github/workflows/test_dev.yml +++ b/.github/workflows/test_dev.yml @@ -34,8 +34,7 @@ jobs: python -m venv env source env/bin/activate python -m pip install --upgrade pip - pip install . - pip install -e ./src/openqaoa-core[tests] + make dev-install-tests pip install ipykernel - name: Setup IBMQ account env: @@ -64,7 +63,6 @@ jobs: run: | source env/bin/activate ipython kernel install --name "env" --user - pip install pytest-xdist pytest tests/ src/*/tests -m 'not (qpu or sim)' --cov -n auto - name: Upload coverage reports to Codecov with GitHub Action uses: codecov/codecov-action@v3 From 7c88083fc6a50fa957ac8db3f353aa3b3aa0ac43 Mon Sep 17 00:00:00 2001 From: "shahidee44@hotmail.com" Date: Tue, 23 May 2023 06:46:24 +0000 Subject: [PATCH 06/23] Spacing --- Makefile | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index d76441fd5..7060d4a67 100644 --- a/Makefile +++ b/Makefile @@ -3,45 +3,45 @@ .PHONY: dev-install dev-install: - pip install -e ./src/openqaoa-core - pip install -e ./src/openqaoa-qiskit - pip install -e ./src/openqaoa-pyquil - pip install -e ./src/openqaoa-braket - pip install -e ./src/openqaoa-azure + pip install -e ./src/openqaoa-core + pip install -e ./src/openqaoa-qiskit + pip install -e ./src/openqaoa-pyquil + pip install -e ./src/openqaoa-braket + pip install -e ./src/openqaoa-azure pip install -e . .PHONY: dev-install-tests dev-install-tests: - pip install -e ./src/openqaoa-core[tests] - pip install -e ./src/openqaoa-qiskit - pip install -e ./src/openqaoa-pyquil - pip install -e ./src/openqaoa-braket - pip install -e ./src/openqaoa-azure + pip install -e ./src/openqaoa-core[tests] + pip install -e ./src/openqaoa-qiskit + pip install -e ./src/openqaoa-pyquil + pip install -e ./src/openqaoa-braket + pip install -e ./src/openqaoa-azure pip install -e . .PHONY: dev-install-docs dev-install-docs: - pip install -e ./src/openqaoa-core[docs] - pip install -e ./src/openqaoa-qiskit - pip install -e ./src/openqaoa-pyquil - pip install -e ./src/openqaoa-braket - pip install -e ./src/openqaoa-azure + pip install -e ./src/openqaoa-core[docs] + pip install -e ./src/openqaoa-qiskit + pip install -e ./src/openqaoa-pyquil + pip install -e ./src/openqaoa-braket + pip install -e ./src/openqaoa-azure pip install -e . .PHONY: dev-install-all dev-install-all: - pip install -e ./src/openqaoa-core[all] - pip install -e ./src/openqaoa-qiskit - pip install -e ./src/openqaoa-pyquil - pip install -e ./src/openqaoa-braket - pip install -e ./src/openqaoa-azure + pip install -e ./src/openqaoa-core[all] + pip install -e ./src/openqaoa-qiskit + pip install -e ./src/openqaoa-pyquil + pip install -e ./src/openqaoa-braket + pip install -e ./src/openqaoa-azure pip install -e . .PHONY: dev-uninstall dev-uninstall: - pip uninstall openqaoa -y - pip uninstall openqaoa-core -y - pip uninstall openqaoa-qiskit -y - pip uninstall openqaoa-pyquil -y - pip uninstall openqaoa-braket -y - pip uninstall openqaoa-azure -y \ No newline at end of file + pip uninstall openqaoa -y + pip uninstall openqaoa-core -y + pip uninstall openqaoa-qiskit -y + pip uninstall openqaoa-pyquil -y + pip uninstall openqaoa-braket -y + pip uninstall openqaoa-azure -y \ No newline at end of file From 4031e7a71a662a2a182e00f9e363d66ff8564f2e Mon Sep 17 00:00:00 2001 From: "shahidee44@hotmail.com" Date: Tue, 23 May 2023 06:50:53 +0000 Subject: [PATCH 07/23] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7060d4a67..c225ed3a8 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ #This file stores instructions to install openqaoa in developer mode. -# Currently can only install all packages together for developer mode. +#Currently can only install all packages together for developer mode. .PHONY: dev-install dev-install: From a4d0f9ab5e02330e3639170b430374a6fe1bb94c Mon Sep 17 00:00:00 2001 From: "shahidee44@hotmail.com" Date: Tue, 23 May 2023 06:54:27 +0000 Subject: [PATCH 08/23] UpdateMakefile --- Makefile | 60 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index c225ed3a8..8f816d143 100644 --- a/Makefile +++ b/Makefile @@ -3,45 +3,45 @@ .PHONY: dev-install dev-install: - pip install -e ./src/openqaoa-core - pip install -e ./src/openqaoa-qiskit - pip install -e ./src/openqaoa-pyquil - pip install -e ./src/openqaoa-braket - pip install -e ./src/openqaoa-azure - pip install -e . + pip install -e ./src/openqaoa-core + pip install -e ./src/openqaoa-qiskit + pip install -e ./src/openqaoa-pyquil + pip install -e ./src/openqaoa-braket + pip install -e ./src/openqaoa-azure + pip install -e . .PHONY: dev-install-tests dev-install-tests: - pip install -e ./src/openqaoa-core[tests] - pip install -e ./src/openqaoa-qiskit - pip install -e ./src/openqaoa-pyquil - pip install -e ./src/openqaoa-braket - pip install -e ./src/openqaoa-azure - pip install -e . + pip install -e ./src/openqaoa-core[tests] + pip install -e ./src/openqaoa-qiskit + pip install -e ./src/openqaoa-pyquil + pip install -e ./src/openqaoa-braket + pip install -e ./src/openqaoa-azure + pip install -e . .PHONY: dev-install-docs dev-install-docs: - pip install -e ./src/openqaoa-core[docs] - pip install -e ./src/openqaoa-qiskit - pip install -e ./src/openqaoa-pyquil - pip install -e ./src/openqaoa-braket - pip install -e ./src/openqaoa-azure - pip install -e . + pip install -e ./src/openqaoa-core[docs] + pip install -e ./src/openqaoa-qiskit + pip install -e ./src/openqaoa-pyquil + pip install -e ./src/openqaoa-braket + pip install -e ./src/openqaoa-azure + pip install -e . .PHONY: dev-install-all dev-install-all: - pip install -e ./src/openqaoa-core[all] - pip install -e ./src/openqaoa-qiskit - pip install -e ./src/openqaoa-pyquil - pip install -e ./src/openqaoa-braket - pip install -e ./src/openqaoa-azure - pip install -e . + pip install -e ./src/openqaoa-core[all] + pip install -e ./src/openqaoa-qiskit + pip install -e ./src/openqaoa-pyquil + pip install -e ./src/openqaoa-braket + pip install -e ./src/openqaoa-azure + pip install -e . .PHONY: dev-uninstall dev-uninstall: - pip uninstall openqaoa -y - pip uninstall openqaoa-core -y - pip uninstall openqaoa-qiskit -y - pip uninstall openqaoa-pyquil -y - pip uninstall openqaoa-braket -y - pip uninstall openqaoa-azure -y \ No newline at end of file + pip uninstall openqaoa -y + pip uninstall openqaoa-core -y + pip uninstall openqaoa-qiskit -y + pip uninstall openqaoa-pyquil -y + pip uninstall openqaoa-braket -y + pip uninstall openqaoa-azure -y \ No newline at end of file From a92433e3cb097df8c23e1161378f6f4e7cebe98a Mon Sep 17 00:00:00 2001 From: shahidee44 <36878360+shahidee44@users.noreply.github.com> Date: Mon, 29 May 2023 12:37:37 +0800 Subject: [PATCH 09/23] Update Dockerfile --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 96b0b3d02..3ef9d4838 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,4 +5,6 @@ RUN mkdir -p /openqaoa ADD ./ /openqaoa/ -RUN pip3 install /openqaoa/. +RUN cd openqaoa + +RUN make dev-install-tests From 229e41ef4067d6855c4fef0108d168c4f266b443 Mon Sep 17 00:00:00 2001 From: shahidee44 <36878360+shahidee44@users.noreply.github.com> Date: Mon, 29 May 2023 12:49:46 +0800 Subject: [PATCH 10/23] Create publish_testpypi.yml --- .github/workflows/publish_testpypi.yml | 37 ++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/publish_testpypi.yml diff --git a/.github/workflows/publish_testpypi.yml b/.github/workflows/publish_testpypi.yml new file mode 100644 index 000000000..13ab39d2d --- /dev/null +++ b/.github/workflows/publish_testpypi.yml @@ -0,0 +1,37 @@ +name: Upload to Test PyPi + +on: + release: + types: [created] + workflow_dispatch: + +jobs: + pypi_update: + + # Only run this job if new work is pushed to "main" + # if: github.event_name == 'push' && github.ref == 'refs/heads/main' + + # Set up operating system + runs-on: ubuntu-latest + + # Define job steps + steps: + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.8 + + - name: Check-out repository + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} + fetch-depth: 0 + + - name: Install Python dependencies + run: | + python -m pip install --upgrade pip build twine + pip install setuptools wheel twine + + - name: Publish to Test PyPI + run: | + scripts/push_package_testpypi.sh __token__ ${{secrets.TEST_PYPI_API_TOKEN}} From cb35be70c54996f64b1780ad5feff0b31029b439 Mon Sep 17 00:00:00 2001 From: shahidee44 <36878360+shahidee44@users.noreply.github.com> Date: Mon, 29 May 2023 13:11:25 +0800 Subject: [PATCH 11/23] Create test_testpypi.yml --- .github/workflows/test_testpypi.yml | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/test_testpypi.yml diff --git a/.github/workflows/test_testpypi.yml b/.github/workflows/test_testpypi.yml new file mode 100644 index 000000000..2465957f4 --- /dev/null +++ b/.github/workflows/test_testpypi.yml @@ -0,0 +1,33 @@ +name: Download TestPypi OpenQAOA + +on: + release: + types: [created] + workflow_dispatch: + +jobs: + pypi_unittest: + + # Set up operating system + runs-on: ubuntu-latest + + # Define job steps + steps: + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.8 + + - name: Check-out repository + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} + fetch-depth: 0 + + - name: Install Python dependencies + run: | + python -m pip install --upgrade pip + + - name: Install OpenQAOA from Test PyPI + run: | + scripts/install_package_testpypi.sh From 1452e65d05f24ad93ae9fa5ad549b6136cb0253b Mon Sep 17 00:00:00 2001 From: shahidee44 <36878360+shahidee44@users.noreply.github.com> Date: Mon, 29 May 2023 13:17:32 +0800 Subject: [PATCH 12/23] Update test_testpypi.yml --- .github/workflows/test_testpypi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_testpypi.yml b/.github/workflows/test_testpypi.yml index 2465957f4..71012835c 100644 --- a/.github/workflows/test_testpypi.yml +++ b/.github/workflows/test_testpypi.yml @@ -31,3 +31,4 @@ jobs: - name: Install OpenQAOA from Test PyPI run: | scripts/install_package_testpypi.sh + python -c 'from openqaoa._version import __version__; print(__version__)' From 8dd9e8914f617e127932f5c189866b28de206c10 Mon Sep 17 00:00:00 2001 From: shahidee44 <36878360+shahidee44@users.noreply.github.com> Date: Mon, 29 May 2023 13:22:43 +0800 Subject: [PATCH 13/23] Update Dockerfile --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3ef9d4838..a4c8cc492 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,4 @@ RUN mkdir -p /openqaoa ADD ./ /openqaoa/ -RUN cd openqaoa - -RUN make dev-install-tests +RUN cd openqaoa && make dev-install-tests From 9e2f9b0329aa32bcaf00182e635c6716bc65e4ee Mon Sep 17 00:00:00 2001 From: shahidee44 <36878360+shahidee44@users.noreply.github.com> Date: Mon, 29 May 2023 14:00:44 +0800 Subject: [PATCH 14/23] Update test_dev.yml --- .github/workflows/test_dev.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test_dev.yml b/.github/workflows/test_dev.yml index 0a6a73a91..068440a58 100644 --- a/.github/workflows/test_dev.yml +++ b/.github/workflows/test_dev.yml @@ -86,8 +86,7 @@ jobs: - name: Install OpenQAOA run: | python -m pip install --upgrade pip - pip install . - pip install -e ./src/openqaoa-core[docs] + make dev-install-docs - name: Install qvm run: | From 245c0e936e9486a298a73e62aff8c354a583c735 Mon Sep 17 00:00:00 2001 From: "shahidee44@hotmail.com" Date: Fri, 9 Jun 2023 06:03:48 +0000 Subject: [PATCH 15/23] Removed reference to testpypi --- scripts/install_package_pre.sh | 7 +++++++ scripts/install_package_testpypi.sh | 7 ------- scripts/push_package_testpypi.sh | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) create mode 100755 scripts/install_package_pre.sh delete mode 100755 scripts/install_package_testpypi.sh diff --git a/scripts/install_package_pre.sh b/scripts/install_package_pre.sh new file mode 100755 index 000000000..54e4c316e --- /dev/null +++ b/scripts/install_package_pre.sh @@ -0,0 +1,7 @@ +set -e + +modulesList=("openqaoa-core" "openqaoa-qiskit" "openqaoa-braket" "openqaoa-pyquil" "openqaoa-azure" "openqaoa") + +for entry in "${modulesList[@]}"; do + pip install --pre $entry +done \ No newline at end of file diff --git a/scripts/install_package_testpypi.sh b/scripts/install_package_testpypi.sh deleted file mode 100755 index efd314f8e..000000000 --- a/scripts/install_package_testpypi.sh +++ /dev/null @@ -1,7 +0,0 @@ -set -e - -modulesList=("openqaoa-core" "openqaoa-qiskit" "openqaoa-braket" "openqaoa-pyquil" "openqaoa-azure" "openqaoa-meta") - -for entry in "${modulesList[@]}"; do - pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ --pre $entry -done \ No newline at end of file diff --git a/scripts/push_package_testpypi.sh b/scripts/push_package_testpypi.sh index f456f5556..4b15b6228 100755 --- a/scripts/push_package_testpypi.sh +++ b/scripts/push_package_testpypi.sh @@ -15,7 +15,7 @@ for entry in "${modulesList[@]}"; do rm -rf dist build pip install . python -m build - twine upload --repository testpypi dist/* --username $1 --password $2 + twine upload dist/* --username $1 --password $2 rm -rf dist build cd "../.." done @@ -24,4 +24,4 @@ done rm -rf dist build pip install . python -m build -twine upload --repository testpypi dist/* --username $1 --password $2 \ No newline at end of file +twine upload dist/* --username $1 --password $2 \ No newline at end of file From 77619f1c20b5da4cfe095c53a259970b97e7f07c Mon Sep 17 00:00:00 2001 From: "shahidee44@hotmail.com" Date: Fri, 9 Jun 2023 06:08:04 +0000 Subject: [PATCH 16/23] Update shell scripts for Pypi --- scripts/install_package_pre.sh | 2 +- scripts/{push_package_testpypi.sh => push_package_pypi.sh} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename scripts/{push_package_testpypi.sh => push_package_pypi.sh} (100%) diff --git a/scripts/install_package_pre.sh b/scripts/install_package_pre.sh index 54e4c316e..97df63979 100755 --- a/scripts/install_package_pre.sh +++ b/scripts/install_package_pre.sh @@ -3,5 +3,5 @@ set -e modulesList=("openqaoa-core" "openqaoa-qiskit" "openqaoa-braket" "openqaoa-pyquil" "openqaoa-azure" "openqaoa") for entry in "${modulesList[@]}"; do - pip install --pre $entry + pip install --pre $entry done \ No newline at end of file diff --git a/scripts/push_package_testpypi.sh b/scripts/push_package_pypi.sh similarity index 100% rename from scripts/push_package_testpypi.sh rename to scripts/push_package_pypi.sh From e3224557764497d4752b27c10389d9deb4949d40 Mon Sep 17 00:00:00 2001 From: shahidee44 <36878360+shahidee44@users.noreply.github.com> Date: Fri, 9 Jun 2023 14:09:26 +0800 Subject: [PATCH 17/23] Update and rename publish_testpypi.yml to publish_pypi.yml --- .github/workflows/{publish_testpypi.yml => publish_pypi.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{publish_testpypi.yml => publish_pypi.yml} (90%) diff --git a/.github/workflows/publish_testpypi.yml b/.github/workflows/publish_pypi.yml similarity index 90% rename from .github/workflows/publish_testpypi.yml rename to .github/workflows/publish_pypi.yml index 13ab39d2d..9e07f373d 100644 --- a/.github/workflows/publish_testpypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -34,4 +34,4 @@ jobs: - name: Publish to Test PyPI run: | - scripts/push_package_testpypi.sh __token__ ${{secrets.TEST_PYPI_API_TOKEN}} + scripts/push_package_pypi.sh __token__ ${{secrets.PYPI_API_TOKEN}} From ede086651f9ec94fa09874abb3265946805f98a9 Mon Sep 17 00:00:00 2001 From: shahidee44 <36878360+shahidee44@users.noreply.github.com> Date: Fri, 9 Jun 2023 14:10:29 +0800 Subject: [PATCH 18/23] Delete test_testpypi.yml --- .github/workflows/test_testpypi.yml | 34 ----------------------------- 1 file changed, 34 deletions(-) delete mode 100644 .github/workflows/test_testpypi.yml diff --git a/.github/workflows/test_testpypi.yml b/.github/workflows/test_testpypi.yml deleted file mode 100644 index 71012835c..000000000 --- a/.github/workflows/test_testpypi.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Download TestPypi OpenQAOA - -on: - release: - types: [created] - workflow_dispatch: - -jobs: - pypi_unittest: - - # Set up operating system - runs-on: ubuntu-latest - - # Define job steps - steps: - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - - name: Check-out repository - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} - fetch-depth: 0 - - - name: Install Python dependencies - run: | - python -m pip install --upgrade pip - - - name: Install OpenQAOA from Test PyPI - run: | - scripts/install_package_testpypi.sh - python -c 'from openqaoa._version import __version__; print(__version__)' From ab44b7bb7778762c16263b6d790f822fac4020f8 Mon Sep 17 00:00:00 2001 From: "shahidee44@hotmail.com" Date: Fri, 9 Jun 2023 06:14:27 +0000 Subject: [PATCH 19/23] Updated version to 0.1.3-rc1 --- _version.py | 2 +- src/openqaoa-azure/openqaoa_azure/_version.py | 2 +- src/openqaoa-braket/openqaoa_braket/_version.py | 2 +- src/openqaoa-core/openqaoa/_version.py | 2 +- src/openqaoa-pyquil/openqaoa_pyquil/_version.py | 2 +- src/openqaoa-qiskit/openqaoa_qiskit/_version.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_version.py b/_version.py index f5afdc332..5e5a7e428 100644 --- a/_version.py +++ b/_version.py @@ -1 +1 @@ -__version__ = "0.1.20-rc3" \ No newline at end of file +__version__ = "0.1.3-rc1" \ No newline at end of file diff --git a/src/openqaoa-azure/openqaoa_azure/_version.py b/src/openqaoa-azure/openqaoa_azure/_version.py index 1dec11299..6c11d34d7 100644 --- a/src/openqaoa-azure/openqaoa_azure/_version.py +++ b/src/openqaoa-azure/openqaoa_azure/_version.py @@ -1 +1 @@ -__version__ = "0.1.20-rc3" \ No newline at end of file +__version__ = "0.1.3-rc1" \ No newline at end of file diff --git a/src/openqaoa-braket/openqaoa_braket/_version.py b/src/openqaoa-braket/openqaoa_braket/_version.py index 1dec11299..6c11d34d7 100644 --- a/src/openqaoa-braket/openqaoa_braket/_version.py +++ b/src/openqaoa-braket/openqaoa_braket/_version.py @@ -1 +1 @@ -__version__ = "0.1.20-rc3" \ No newline at end of file +__version__ = "0.1.3-rc1" \ No newline at end of file diff --git a/src/openqaoa-core/openqaoa/_version.py b/src/openqaoa-core/openqaoa/_version.py index 1dec11299..6c11d34d7 100644 --- a/src/openqaoa-core/openqaoa/_version.py +++ b/src/openqaoa-core/openqaoa/_version.py @@ -1 +1 @@ -__version__ = "0.1.20-rc3" \ No newline at end of file +__version__ = "0.1.3-rc1" \ No newline at end of file diff --git a/src/openqaoa-pyquil/openqaoa_pyquil/_version.py b/src/openqaoa-pyquil/openqaoa_pyquil/_version.py index 1dec11299..6c11d34d7 100644 --- a/src/openqaoa-pyquil/openqaoa_pyquil/_version.py +++ b/src/openqaoa-pyquil/openqaoa_pyquil/_version.py @@ -1 +1 @@ -__version__ = "0.1.20-rc3" \ No newline at end of file +__version__ = "0.1.3-rc1" \ No newline at end of file diff --git a/src/openqaoa-qiskit/openqaoa_qiskit/_version.py b/src/openqaoa-qiskit/openqaoa_qiskit/_version.py index 1dec11299..6c11d34d7 100644 --- a/src/openqaoa-qiskit/openqaoa_qiskit/_version.py +++ b/src/openqaoa-qiskit/openqaoa_qiskit/_version.py @@ -1 +1 @@ -__version__ = "0.1.20-rc3" \ No newline at end of file +__version__ = "0.1.3-rc1" \ No newline at end of file From 43ef8b53e856f412ed3376fd2085467fbcd52eff Mon Sep 17 00:00:00 2001 From: shahidee44 <36878360+shahidee44@users.noreply.github.com> Date: Fri, 9 Jun 2023 14:22:30 +0800 Subject: [PATCH 20/23] Update test_pypi.yml --- .github/workflows/test_pypi.yml | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_pypi.yml b/.github/workflows/test_pypi.yml index 8d4f549da..592f22daf 100644 --- a/.github/workflows/test_pypi.yml +++ b/.github/workflows/test_pypi.yml @@ -26,8 +26,37 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 + + - name: Install OpenQAOA-Core + run: | + pip install openqaoa-core + python -c 'from openqaoa._version import __version__; print(__version__)' + + + - name: Install OpenQAOA-Qiskit + run: | + pip install openqaoa-qiskit + python -c 'from openqaoa._version import __version__; print(__version__)' + + + - name: Install OpenQAOA-Pyquil + run: | + pip install openqaoa-pyquil + python -c 'from openqaoa._version import __version__; print(__version__)' + + + - name: Install OpenQAOA-Braket + run: | + pip install openqaoa-braket + python -c 'from openqaoa._version import __version__; print(__version__)' + + + - name: Install OpenQAOA-Azure + run: | + pip install openqaoa-azure + python -c 'from openqaoa._version import __version__; print(__version__)' - - name: Install OpenQAOA + - name: Install OpenQAOA (Full) run: | pip install openqaoa python -c 'from openqaoa._version import __version__; print(__version__)' From 3c392bf1955a194c98608714917f6251b41cfea9 Mon Sep 17 00:00:00 2001 From: shahidee44 <36878360+shahidee44@users.noreply.github.com> Date: Fri, 9 Jun 2023 14:25:20 +0800 Subject: [PATCH 21/23] Update setup.py --- setup.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/setup.py b/setup.py index 380cefd23..3369ce994 100644 --- a/setup.py +++ b/setup.py @@ -11,17 +11,9 @@ version = f.readlines()[-1].split()[-1].strip("\"'") requirements = [f"{each_folder_name}=={version}" for each_folder_name in os.listdir("src") if "openqaoa-" in each_folder_name] - -# requirements = [ -# f'openqaoa-core @ file://localhost/{current_path}/src/openqaoa-core', -# f'openqaoa-qiskit @ file://localhost/{current_path}/src/openqaoa-qiskit', -# f'openqaoa-braket @ file://localhost/{current_path}/src/openqaoa-braket', -# f'openqaoa-pyquil @ file://localhost/{current_path}/src/openqaoa-pyquil', -# f'openqaoa-azure @ file://localhost/{current_path}/src/openqaoa-azure' -# ] setup( - name="openqaoa-meta", + name="openqaoa", python_requires=">=3.8, <3.11", version=version, author="Entropica Labs", From 20456530bc457fb59a11fa4dceb15de0e5f00e0e Mon Sep 17 00:00:00 2001 From: "shahidee44@hotmail.com" Date: Fri, 16 Jun 2023 07:43:09 +0000 Subject: [PATCH 22/23] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a4c8cc492..33cf063f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,4 +5,4 @@ RUN mkdir -p /openqaoa ADD ./ /openqaoa/ -RUN cd openqaoa && make dev-install-tests +RUN cd openqaoa && make dev-install From 04ab32dd3fa00200eb5685da4bffdf1d80a0417f Mon Sep 17 00:00:00 2001 From: "shahidee44@hotmail.com" Date: Fri, 16 Jun 2023 07:44:37 +0000 Subject: [PATCH 23/23] Update install_and_test_openqaoa_dev.sh --- scripts/install_and_test_openqaoa_dev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_and_test_openqaoa_dev.sh b/scripts/install_and_test_openqaoa_dev.sh index 0bef1fda2..8450205fc 100755 --- a/scripts/install_and_test_openqaoa_dev.sh +++ b/scripts/install_and_test_openqaoa_dev.sh @@ -3,4 +3,4 @@ set -e pip install . pytest tests/ src/*/tests -n auto -pip uninstall -y openqaoa-meta \ No newline at end of file +pip uninstall -y openqaoa \ No newline at end of file