Skip to content

Commit

Permalink
Merge upstream changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
SolidTux committed Nov 19, 2021
2 parents f7ef102 + 9ac49a3 commit a45e3de
Show file tree
Hide file tree
Showing 104 changed files with 28,380 additions and 1,027 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ jobs:
{py: 3.6, interpreter: "python3.6"},
{py: 3.7, interpreter: "python3.7"},
{py: 3.8, interpreter: "python3.8"},
{py: 3.9, interpreter: "python3.9"}
{py: 3.9, interpreter: "python3.9"},
# {py: 3.10, interpreter: "python3.10"}
]
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -85,7 +86,8 @@ jobs:
{py: 3.6, interpreter: "python3.6"},
{py: 3.7, interpreter: "python3.7"},
{py: 3.8, interpreter: "python3.8"},
{py: 3.9, interpreter: "python3.9"}
{py: 3.9, interpreter: "python3.9"},
# {py: 3.10, interpreter: "python3.10"}
]
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -123,7 +125,8 @@ jobs:
{py: 3.6, interpreter: "python3.6"},
{py: 3.7, interpreter: "python3.7"},
{py: 3.8, interpreter: "python3.8"},
{py: 3.9, interpreter: "python3.9"}
{py: 3.9, interpreter: "python3.9"},
# {py: 3.10, interpreter: "python3.10"}
]
steps:
- uses: actions/checkout@v2
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ jobs:
{py: 3.6, interpreter: "python3.6"},
{py: 3.7, interpreter: "python3.7"},
{py: 3.8, interpreter: "python3.8"},
{py: 3.9, interpreter: "python3.9"}
{py: 3.9, interpreter: "python3.9"},
# {py: 3.10, interpreter: "python3.10"}
]
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -63,7 +64,8 @@ jobs:
{py: 3.6, interpreter: "python3.6"},
{py: 3.7, interpreter: "python3.7"},
{py: 3.8, interpreter: "python3.8"},
{py: 3.9, interpreter: "python3.9"}
{py: 3.9, interpreter: "python3.9"},
# {py: 3.10, interpreter: "python3.10"}
]
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -99,7 +101,8 @@ jobs:
{py: 3.6, interpreter: "python3.6"},
{py: 3.7, interpreter: "python3.7"},
{py: 3.8, interpreter: "python3.8"},
{py: 3.9, interpreter: "python3.9"}
{py: 3.9, interpreter: "python3.9"},
# {py: 3.10, interpreter: "python3.10"}
]
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -131,7 +134,8 @@ jobs:
{py: 3.6, interpreter: "python3.6"},
{py: 3.7, interpreter: "python3.7"},
{py: 3.8, interpreter: "python3.8"},
{py: 3.9, interpreter: "python3.9"}
{py: 3.9, interpreter: "python3.9"},
# {py: 3.10, interpreter: "python3.10"}
]
steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ target/*
*.mypy_cache*
*.egg-info*
*.coverage
*coveragehtml/*
*coveragehtml*
*/docs/_build*
*/docs/generated*
*.DS_Store
*.ipynb_checkpoints*
*.json
*.yaml
.vscode/*
*.vscode*
*.profraw
*.lcov
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ This changelog track changes to the qoqo project starting at version 0.5.0

## Not released

### Added not released

* MultiQubitZZ gate. Rotation under a multi-qubit product of Pauli Z operators.
* `two_qubit_edges` function in Device trait. Used to create a simple graph-library-agnostic representation of the connectivity graph of a device.

## 0.8.1

### Changed 0.8.1

* Updated to pyo3 0.15.0

## 0.8.0

### Added 0.8.0
Expand Down
52 changes: 26 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion qoqo-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "qoqo-macros"
version = "0.8.0"
version = "0.8.2"
authors = ["HQS Quantum Simulations <[email protected]>"]
license = "Apache-2.0"
readme = "../README.md"
Expand Down
18 changes: 9 additions & 9 deletions qoqo/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "qoqo"
version = "0.8.0"
version = "0.8.2"
authors = ["HQS Quantum Simulations <[email protected]>"]
license = "Apache-2.0"
homepage = "https://github.com/HQSquantumsimulations/qoqo"
Expand All @@ -22,19 +22,19 @@ doctest = false
crate-type = ["cdylib", "rlib"]

[dependencies.pyo3]
version = "0.14"
version = "0.15"
features = ["num-complex"]

[dependencies]
serde = { version = "1.0", features = ["derive"] }
ndarray = "0.15"
num-complex = "0.4"
thiserror = "1.0"
qoqo_calculator = { version="0.3" }
qoqo_calculator_pyo3 = {version="0.4", default-features=false}
qoqo-macros = {version="0.8", path="../qoqo-macros"}
roqoqo = {version="0.8", path="../roqoqo", features=["serialize", "overrotate"]}
numpy = "=0.14"
qoqo_calculator = { version="0.5" }
qoqo_calculator_pyo3 = {version="0.5", default-features=false}
qoqo-macros = {version="0.8.1", path="../qoqo-macros"}
roqoqo = {version="0.8.1", path="../roqoqo", features=["serialize", "overrotate"]}
numpy = "=0.15"
bincode = "1.3"
serde_json = "1.0"

Expand All @@ -55,7 +55,7 @@ extension-module = ["pyo3/extension-module"]#, "qoqo_calculator_pyo3/extension-m
default = ["extension-module"]

[package.metadata.maturin]
requires-dist = ["numpy", "qoqo_calculator_pyo3>=0.4"]
requires-dist = ["numpy", "qoqo_calculator_pyo3>=0.5"]
maintainer = "HQS Quantum Simulations GmbH"
maintainer-email = "[email protected]"
requires-python = ">=3.6"
requires-python = ">=3.6"
Loading

0 comments on commit a45e3de

Please sign in to comment.