Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev into main #298

Merged
merged 8 commits into from
Dec 20, 2023
Merged

Merge dev into main #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9b654dd
Updated requirements qiskit for 1.0.0 release
KilianPoirier Dec 12, 2023
b544666
Updated tests for new qiskit devices
KilianPoirier Dec 12, 2023
0792eb3
Updated example devices
KilianPoirier Dec 12, 2023
1a8906e
Formatted using black
KilianPoirier Dec 12, 2023
0850928
Merge pull request #297 from entropicalabs/hotfix_qiskit
KilianPoirier Dec 20, 2023
4f9d105
Bumped version number and updated CHANGELOG.md
KilianPoirier Dec 20, 2023
37f971f
Merge remote-tracking branch 'origin/dev' into dev
KilianPoirier Dec 20, 2023
ff7363f
Merge branch 'main' into dev
KilianPoirier Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Version v0.2.5 (December 20th, 2023)

This version fixes some breaking changes appearing with qiskit 0.45

## Version v0.2.4 (November 27th, 2023)

This version brings two main changes:
Expand Down
2 changes: 1 addition & 1 deletion _version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.2.4"
__version__ = "0.2.5"
2 changes: 1 addition & 1 deletion docs/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,4 @@
# app.connect(skip)

# pygments_style = 'sphinx'
# suppress_warnings = ["myst_header"]
# suppress_warnings = ["myst_header"]
2 changes: 1 addition & 1 deletion examples/03_qaoa_on_qpus.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
"outputs": [],
"source": [
"# device. If qpu_crendetials is not specified,the default hub, group and provider is used.\n",
"qiskit_cloud = create_device(location='ibmq', name='ibm_perth', **qpu_credentials, as_emulator=True)\n",
"qiskit_cloud = create_device(location='ibmq', name='ibm_kyoto', **qpu_credentials, as_emulator=True)\n",
"q_qiskit.set_device(qiskit_cloud)\n",
"\n",
"# circuit properties\n",
Expand Down
4 changes: 2 additions & 2 deletions examples/14_qaoa_benchmark.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"q = QAOA()\n",
"\n",
"# set device and backend properties\n",
"qiskit_cloud = create_device(location='ibmq', name='ibm_perth', **qpu_credentials, as_emulator=True)\n",
"qiskit_cloud = create_device(location='ibmq', name='ibm_kyoto', **qpu_credentials, as_emulator=True)\n",
"q.set_device(qiskit_cloud)\n",
"q.set_backend_properties(n_shots=1000)\n",
"\n",
Expand Down Expand Up @@ -602,7 +602,7 @@
"q_ibm = QAOA()\n",
"\n",
"# set device and backend properties\n",
"qiskit_cloud = create_device(location='ibmq', name='ibm_perth', **qpu_credentials, as_emulator=True)\n",
"qiskit_cloud = create_device(location='ibmq', name='ibm_kyoto', **qpu_credentials, as_emulator=True)\n",
"q_ibm.set_device(qiskit_cloud)\n",
"q_ibm.set_backend_properties(n_shots=1000)\n",
"\n",
Expand Down
2 changes: 1 addition & 1 deletion src/openqaoa-azure/openqaoa_azure/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.2.4"
__version__ = "0.2.5"
2 changes: 1 addition & 1 deletion src/openqaoa-braket/openqaoa_braket/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.2.4"
__version__ = "0.2.5"
2 changes: 1 addition & 1 deletion src/openqaoa-core/openqaoa/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.2.4"
__version__ = "0.2.5"
Loading
Loading