Skip to content

Commit 2ff5632

Browse files
authored
Merge pull request #233 from BoxiLi/qutip-qip-0.3.X
Prepare the qutip-qip-0.3.1 release
2 parents 29d2d5b + 63b0f29 commit 2ff5632

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+362
-146
lines changed

.github/workflows/black.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ jobs:
1010
- uses: psf/black@stable
1111
with:
1212
options: "--check --diff"
13-
src: "./src"
13+
src: "./src"
14+
version: "~= 24.0"

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
# For the sdist we should be as conservative as possible with our
5555
# Python version. This should be the lowest supported version. This
5656
# means that no unsupported syntax can sneak through.
57-
python-version: '3.7'
57+
python-version: '3.11'
5858

5959
- name: Install pip build
6060
run: |
@@ -89,7 +89,7 @@ jobs:
8989
name: Install Python
9090
with:
9191
# This is about the build environment, not the released wheel version.
92-
python-version: '3.7'
92+
python-version: '3.11'
9393

9494
- name: Install pip build
9595
run: |
@@ -129,7 +129,7 @@ jobs:
129129
- uses: actions/setup-python@v4
130130
name: Install Python
131131
with:
132-
python-version: '3.7'
132+
python-version: '3.11'
133133

134134
- name: Verify this is not a dev version
135135
shell: bash

.github/workflows/build_documentation.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/setup-python@v4
1515
name: Install Python
1616
with:
17-
python-version: '3.8'
17+
python-version: '3.9'
1818

1919
- name: Install Pandoc
2020
run: |
@@ -27,7 +27,8 @@ jobs:
2727
2828
- name: Install qutip-qip from GitHub
2929
run: |
30-
python -mpip install -e .[full]
30+
python -mpip install qutip==4.7.3
31+
python -mpip install -e .
3132
# Install in editable mode so it doesn't matter if we import from
3233
# inside the installation directory, otherwise we can get some errors
3334
# because we're importing from the wrong location.

.github/workflows/test.yml

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15-
- case-name: [email protected].0a1
15+
- case-name: [email protected].0
1616
os: ubuntu-latest
17-
qutip-version: '==5.0.0a1'
17+
qutip-version: '==5.0.0'
1818
pyqir-version: ''
19-
python-version: '3.10'
19+
python-version: '3.11'
2020
- case-name: [email protected]
2121
os: ubuntu-latest
2222
qutip-version: '@qutip-4.7.X'
@@ -26,37 +26,31 @@ jobs:
2626
os: ubuntu-latest
2727
qutip-version: '@master'
2828
pyqir-version: ''
29-
python-version: '3.11'
30-
- case-name: [email protected]
31-
os: windows-latest
32-
qutip-version: '==4.6.*'
33-
qiskit-version: ''
34-
pyqir-version: ''
35-
python-version: '3.8'
29+
python-version: '3.12'
3630
- case-name: [email protected]
3731
os: macOS-latest
3832
qutip-version: '==4.7.*'
3933
qiskit-version: ''
4034
pyqir-version: ''
41-
python-version: '3.9'
35+
python-version: '3.11'
4236
- case-name: qiskit+qir
4337
os: windows-latest
4438
qutip-version: ''
45-
qiskit-version: '==0.36.*'
39+
qiskit-version: '==0.46.*'
4640
pyqir-version: '==0.6.2'
47-
python-version: '3.8'
41+
python-version: '3.9'
4842
- case-name: qiskit+qir
4943
os: macOS-latest
5044
qutip-version: ''
51-
qiskit-version: '==0.36.*'
45+
qiskit-version: '==0.46.*'
5246
pyqir-version: '==0.6.2'
5347
python-version: '3.9'
5448
- case-name: qiskit+qir
5549
os: ubuntu-latest
5650
qutip-version: ''
57-
qiskit-version: '==0.36.*'
51+
qiskit-version: '==0.46.*'
5852
pyqir-version: '==0.6.2'
59-
python-version: '3.7'
53+
python-version: '3.9'
6054

6155
steps:
6256
- uses: actions/checkout@v3
@@ -74,15 +68,9 @@ jobs:
7468
run: |
7569
python -m pip install 'git+https://github.com/qutip/qutip.git${{ matrix.qutip-version }}'
7670
77-
# For qutip-v5 qutip.control is replaced by qutip-qtrl
78-
- name: Install qutip-qtrl from PyPI
79-
if: ${{ matrix.qutip-version == '@master'}}
80-
run: |
81-
python -m pip install 'git+https://github.com/qutip/qutip-qtrl.git'
82-
8371
- name: Install Qiskit from PyPI
8472
if: ${{ matrix.qiskit-version != '' }}
85-
run: python -m pip install 'qiskit${{ matrix.qiskit-version }}'
73+
run: python -m pip install 'qiskit${{ matrix.qiskit-version }}' 'qiskit-aer==0.14.0.1'
8674

8775
- name: Install PyQIR from PyPI
8876
if: ${{ matrix.pyqir-version != '' }}
@@ -111,11 +99,12 @@ jobs:
11199
- name: Set up Python
112100
uses: actions/setup-python@v4
113101
with:
114-
python-version: 3.8
102+
python-version: 3.9
115103
- name: Install dependencies
116104
run: |
117105
python -m pip install --upgrade pip
118106
python -mpip install -r doc/requirements.txt
107+
pip install qutip==4.7.3
119108
pip install .
120109
- name: Test code snippets in the documentation
121110
run: |

.readthedocs.yaml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,29 @@
1-
# File: .readthedocs.yaml
1+
# .readthedocs.yaml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
24

5+
# Required
36
version: 2
47

5-
# Build from the doc/ directory with Sphinx
8+
# Set the version of Python and other tools you might need
9+
build:
10+
os: ubuntu-22.04
11+
tools:
12+
python: "3.10"
13+
apt_packages:
14+
- pandoc
15+
jobs:
16+
pre_build:
17+
# Each command is executed in a new shell process
18+
- cd doc; python source/tutorials-website/create_tutorials_html.py
19+
20+
# Build documentation in the docs/ directory with Sphinx
621
sphinx:
722
configuration: doc/source/conf.py
823

9-
# Explicitly set the version of Python and its requirements
24+
# We recommend specifying your dependencies to enable reproducible builds:
25+
# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
1026
python:
11-
version: 3.8
1227
install:
1328
- requirements: doc/requirements.txt
1429
- method: pip

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The qutip-qip package, QuTiP quantum information processing, aims at providing b
1616
Compared to other libraries for quantum information processing, qutip-qip puts additional emphasis on the physics layer and the interaction with the QuTiP package.
1717
The package offers two different approaches for simulating quantum circuits, one with `QubitCircuit` calculating unitary evolution under quantum gates by matrix product, another called `Processor` using open system solvers in QuTiP to simulate noisy quantum device.
1818

19-
If you would like to know the future development plan and ideas, have a look at the [discussion panel](https://github.com/qutip/qutip-qip/discussions) as well as the [qutip documentation for ideas](https://qutip.org/docs/latest/development/ideas.html).
19+
If you would like to know the future development plan and ideas, have a look at the [discussion panel](https://github.com/qutip/qutip-qip/discussions) as well as the [qutip documentation for ideas](https://qutip.readthedocs.io/en/stable/development/ideas.html).
2020

2121
Quick start
2222
-----------

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.3.0
1+
0.3.1

doc/requirements.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
numpy==1.22.4
22
scipy==1.10.0
3-
qutip==4.7.0
3+
qutip==4.7.3
44
cython==0.29.30
55
sphinx==5.0.2
66
sphinx_rtd_theme==1.0.0
@@ -11,4 +11,5 @@ docutils==0.17.1
1111
sphinxcontrib-bibtex==2.4.2
1212
pyqir-generator==0.6.2
1313
pyqir-parser==0.6.2
14-
qiskit==0.37.2
14+
qiskit==0.46.1
15+
qiskit-aer==0.14.0.1

doc/source/changelog.rst

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,23 @@ Changelog
33
*********
44

55

6+
Version 0.3.1 (April 21, 2024)
7+
++++++++++++++++++++++++++++++
8+
9+
Improvements
10+
------------
11+
- Update qiskit support version to ``0.46.*`` (`#232 <https://github.com/qutip/qutip-qip/pull/232>`_)
12+
13+
Bug Fixes
14+
---------
15+
- Remove comments after meaningful statements in QASM reader. (`#218 <https://github.com/qutip/qutip-qip/pull/218>`_ by NoriyukiK-1qbit)
16+
- Fix circuit plot error for gates with classical controls when ``reverse_states=False``. (`#221 <https://github.com/qutip/qutip-qip/pull/221>`_ by Kevin P. O'Brien)
17+
- Update the RTD configuration file to execute ``create_tutorials_html.py`` (`#222 <https://github.com/qutip/qutip-qip/pull/222>`_, reported by Ramyashri Padmanabhakumar)
18+
- Remove the unnecessary use of circuit.propagatos (`#226 <https://github.com/qutip/qutip-qip/pull/226>`_)
19+
- Use CSR as default for ``expand_operator`` (`#227 <https://github.com/qutip/qutip-qip/pull/227>`_)
20+
- Update the parsing mode for ``read_qasm`` (`#224 <https://github.com/qutip/qutip-qip/pull/224>`_ reported by kevinab107)
21+
22+
623
Version 0.3.0 (July 19, 2023)
724
+++++++++++++++++++++++++++++
825

doc/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,5 +185,5 @@ def qutip_qip_version():
185185
# -- Options for intersphinx ---------------------------------------
186186

187187
intersphinx_mapping = {
188-
'qutip': ('https://qutip.org/docs/latest/', None),
188+
'qutip': ('https://qutip.readthedocs.io/en/stable/', None),
189189
}

0 commit comments

Comments
 (0)