Skip to content

Commit

Permalink
Updating dependencies (#293)
Browse files Browse the repository at this point in the history
* update dependencies

* WIP: async compatability

* fix save error

* removed double import

* updated CI/CD for new maturin version

* switching code cov away from nightly

* switching code cov away from nightly
  • Loading branch information
nfwvogt authored Jul 15, 2022
1 parent 6d7c659 commit e087cbb
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 38 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
maturin-version: latest
command: build
manylinux: 2010
args: -i python${{ matrix.python.py }} --out wheels --no-sdist -m qoqo/Cargo.toml --release --cargo-extra-args="--locked"
args: -i python${{ matrix.python.py }} --out wheels -m qoqo/Cargo.toml --release --locked
- name: test install
run: |
pip install wheels/* --force-reinstall
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
with:
maturin-version: latest
command: build
args: -i python --out wheels --no-sdist -m qoqo/Cargo.toml --release --cargo-extra-args="--locked"
args: -i python --out wheels -m qoqo/Cargo.toml --release --locked
- name: store artifact
uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -180,11 +180,11 @@ jobs:
- name: macos wheels
if: ${{ matrix.combinations.runs_on == 'macOS-latest' && matrix.python-version < '3.8'}}
run: |
RUSTFLAGS="-C link-arg=-undefined -C link-arg=dynamic_lookup" maturin build -i ${{ matrix.python.interpreter }} --out wheels --no-sdist -m qoqo/Cargo.toml --release --cargo-extra-args="--locked"
RUSTFLAGS="-C link-arg=-undefined -C link-arg=dynamic_lookup" maturin build -i ${{ matrix.python.interpreter }} --out wheels -m qoqo/Cargo.toml --release --locked
- name: universal wheels
if: ${{ matrix.combinations.runs_on == 'macOS-latest' && matrix.python-version >= '3.8' }}
run: |
RUSTFLAGS="-C link-arg=-undefined -C link-arg=dynamic_lookup" maturin build -i ${{ matrix.python.interpreter }} --universal2 --out wheels --no-sdist -m qoqo/Cargo.toml --release --cargo-extra-args="--locked"
RUSTFLAGS="-C link-arg=-undefined -C link-arg=dynamic_lookup" maturin build -i ${{ matrix.python.interpreter }} --universal2 --out wheels -m qoqo/Cargo.toml --release --locked
- name: test install
run: |
pip install wheels/* --force-reinstall
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
profile: minimal
toolchain: stable
default: true
- uses: Swatinem/[email protected]
- name: Install dependencies
run: |
pip install maturin pytest numpy
Expand Down Expand Up @@ -116,7 +117,7 @@ jobs:
maturin-version: latest
command: build
manylinux: 2010
args: -i python${{ matrix.python.py }} --out wheels --no-sdist -m qoqo/Cargo.toml --cargo-extra-args="--locked"
args: -i python${{ matrix.python.py }} --out wheels -m qoqo/Cargo.toml --locked
- name: test install
run: |
pip install wheels/* --force-reinstall
Expand Down Expand Up @@ -185,7 +186,7 @@ jobs:
with:
maturin-version: latest
command: build
args: -i python --out wheels --no-sdist -m qoqo/Cargo.toml --cargo-extra-args="--locked"
args: -i python --out wheels -m qoqo/Cargo.toml --locked

test_maturin_builds_macos:
name: maturin_check-${{ matrix.combinations.runs_on }}
Expand Down Expand Up @@ -218,11 +219,11 @@ jobs:
- name: macos wheels
if: ${{ matrix.combinations.runs_on == 'macOS-latest' && matrix.python-version < '3.8'}}
run: |
RUSTFLAGS="-C link-arg=-undefined -C link-arg=dynamic_lookup" maturin build -i ${{ matrix.python.interpreter }} --out wheels --no-sdist -m qoqo/Cargo.toml --cargo-extra-args="--locked"
RUSTFLAGS="-C link-arg=-undefined -C link-arg=dynamic_lookup" maturin build -i ${{ matrix.python.interpreter }} --out wheels -m qoqo/Cargo.toml --locked
- name: universal wheels
if: ${{ matrix.combinations.runs_on == 'macOS-latest' && matrix.python-version >= '3.8' }}
run: |
RUSTFLAGS="-C link-arg=-undefined -C link-arg=dynamic_lookup" maturin build -i ${{ matrix.python.interpreter }} --universal2 --out wheels --no-sdist -m qoqo/Cargo.toml --cargo-extra-args="--locked"
RUSTFLAGS="-C link-arg=-undefined -C link-arg=dynamic_lookup" maturin build -i ${{ matrix.python.interpreter }} --universal2 --out wheels -m qoqo/Cargo.toml --locked
- name: test install
run: |
pip install wheels/* --force-reinstall
Expand Down Expand Up @@ -279,15 +280,15 @@ jobs:
- uses: actions/checkout@master
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
components: clippy
profile: minimal
toolchain: stable
components: llvm-tools-preview
override: true
- run: |
rustup component add llvm-tools-preview
export RUSTFLAGS="-Zinstrument-coverage"
export RUSTDOCFLAGS="-Zinstrument-coverage"
export RUSTFLAGS="-Cinstrument-coverage"
export RUSTDOCFLAGS="-Cinstrument-coverage"
cargo build --verbose --locked
LLVM_PROFILE_FILE="coverage-%p-%m.profraw" cargo +nightly test --package=roqoqo --no-default-features
LLVM_PROFILE_FILE="coverage-%p-%m.profraw" cargo test --package=roqoqo --no-default-features
cd roqoqo/
cargo install grcov
grcov . --binary-path ../target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "cargo" --ignore "/mod.rs" --ignore "/lib.rs" --ignore "*/_auto_generated_operations.rs" --keep-only "src/*" -o lcov_roqoqo.info
Expand All @@ -307,16 +308,15 @@ jobs:
- uses: actions/checkout@master
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
components: clippy
toolchain: stable
components: llvm-tools-preview
override: true
- run: |
rustup component add llvm-tools-preview
export RUSTFLAGS="-Zinstrument-coverage"
export RUSTDOCFLAGS="-Zinstrument-coverage"
export RUSTFLAGS="-Cinstrument-coverage"
export RUSTDOCFLAGS="-Cinstrument-coverage"
python -m pip install numpy
cargo build --verbose --locked
LLVM_PROFILE_FILE="coverage-%p-%m.profraw" cargo +nightly test --workspace --package=qoqo --no-default-features
LLVM_PROFILE_FILE="coverage-%p-%m.profraw" cargo test --workspace --package=qoqo --no-default-features
cd qoqo/
cargo install grcov
grcov . --binary-path ../target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "cargo" --ignore "/mod.rs" --ignore "/lib.rs" --ignore "*/_auto_generated_operations.rs" --keep-only "src/*" -o lcov_qoqo.info
Expand Down
24 changes: 12 additions & 12 deletions Cargo.lock

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

12 changes: 6 additions & 6 deletions qoqo/qoqo/DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ DEALINGS IN THE SOFTWARE.


====================================================
bytemuck 1.9.1
bytemuck 1.10.0
https://github.com/Lokathor/bytemuck
by Lokathor <[email protected]>
A crate for mucking around with piles of bytes.
Expand Down Expand Up @@ -4197,7 +4197,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


====================================================
once_cell 1.12.0
once_cell 1.13.0
https://github.com/matklad/once_cell
by Aleksey Kladov <[email protected]>
Single assignment cells and lazy values.
Expand Down Expand Up @@ -7545,7 +7545,7 @@ LICENSE:


====================================================
qoqo 1.0.0-alpha.2
qoqo 1.0.0-alpha.3
https://github.com/HQSquantumsimulations/qoqo
by HQS Quantum Simulations <[email protected]>
Quantum computing circuit toolkit. Python interface of roqoqo
Expand Down Expand Up @@ -10985,7 +10985,7 @@ DEALINGS IN THE SOFTWARE.


====================================================
serde 1.0.137
serde 1.0.139
https://serde.rs
by Erick Tryzelaar <[email protected]>, David Tolnay <[email protected]>
A generic serialization/deserialization framework
Expand Down Expand Up @@ -11224,7 +11224,7 @@ DEALINGS IN THE SOFTWARE.


====================================================
serde_derive 1.0.137
serde_derive 1.0.139
https://serde.rs
by Erick Tryzelaar <[email protected]>, David Tolnay <[email protected]>
Macros 1.1 implementation of #[derive(Serialize, Deserialize)]
Expand Down Expand Up @@ -11702,7 +11702,7 @@ DEALINGS IN THE SOFTWARE.


====================================================
serde_test 1.0.137
serde_test 1.0.139
https://serde.rs
by Erick Tryzelaar <[email protected]>, David Tolnay <[email protected]>
Token De/Serializer for testing De/Serialize implementations
Expand Down

0 comments on commit e087cbb

Please sign in to comment.