Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into pydantic2
Browse files Browse the repository at this point in the history
  • Loading branch information
wilfried-huss committed Dec 20, 2023
2 parents b534369 + c477dca commit 6d97aaa
Show file tree
Hide file tree
Showing 54 changed files with 3,698 additions and 1,993 deletions.
58 changes: 58 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Deploy documentation

on:
# Runs on version tags pushes
push:
tags:
- 'v*'

# Runs on manual triggers
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Install Poetry
uses: abatilo/actions-poetry@v2
with:
poetry-version: '1.6.1'
- name: Install Python
uses: actions/setup-python@v4
with:
python-version: '3.8'
cache: "poetry"
- name: Check Poetry lock file consistency
run: poetry lock --check
- name: Install dependencies
run: poetry install --sync
- name: Check version numbers consistency
run: poetry run poe version_check
- name: Build documentation
run: poetry run poe docs
- name: Setup Pages
uses: actions/configure-pages@v3
- name: Upload artifact
uses: actions/upload-pages-artifact@v2
with:
path: 'docs/_build'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
43 changes: 19 additions & 24 deletions .github/workflows/poetry.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Examples and unit tests
name: Tests
on:
push:
branches: [ master, 'stable/*' ]
Expand All @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
poetry-version: [1.5.1]
poetry-version: [1.6.1]
os: ["ubuntu-latest"]
steps:
- uses: actions/checkout@v3
Expand All @@ -24,10 +24,10 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
- name: Check Poetry lock file status
run: poetry lock --check
- name: Check shell scripts
uses: ludeeus/[email protected]
- name: Check Poetry lock file status
run: poetry lock --check
- name: Install coverage tool
run: |
poetry run pip install coverage[toml]
Expand Down Expand Up @@ -57,24 +57,19 @@ jobs:
run: poetry run poe test --cov_opts="-a" # add to examples coverage
- name: Docs
run: poetry run poe docs
- name: Generate HTML coverage report
run: poetry run coverage html --show-contexts
- name: Upload HTML coverage report
uses: actions/upload-artifact@v3
- name: Generate coverage report
run: poetry run coverage lcov -o coverage.lcov
- name: Upload coverage report
uses: coverallsapp/github-action@v2
with:
file: coverage.lcov
parallel: true
flag-name: run ${{ join(matrix.*, ' - ') }}
finish:
needs: tests
runs-on: ubuntu-latest
steps:
- name: Close parallel coverage build
uses: coverallsapp/github-action@v2
with:
name: html-coverage
path: htmlcov/
# - name: Generate XML coverage report
# run: poetry run coverage xml -o coverage.xml
# - name: Read global coverage target
# id: coverage-target
# run: echo "fail-under=$(poetry run python scripts/read-target-coverage.py)" >> $GITHUB_OUTPUT
# - name: Post coverage comment
# if: ${{ github.event_name == 'pull_request' }}
# uses: orgoro/coverage@v3
# with:
# coverageFile: coverage.xml
# token: ${{ secrets.GITHUB_TOKEN }}
# thresholdAll: ${{ steps.coverage-target.outputs.fail-under }}
# thresholdNew: 0
# thresholdModified: 0
parallel-finished: true
13 changes: 7 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ jobs:
wheel-build:
name: Build and Publish Release Artifacts
runs-on: ubuntu-latest
environment: release
permissions:
id-token: write
contents: write
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -17,9 +21,9 @@ jobs:
- name: Install Poetry
uses: abatilo/actions-poetry@v2
with:
poetry-version: '1.5.1'
poetry-version: '1.6.1'
- name: Install release dependencies
run: pip install -U twine wheel typer mistletoe
run: pip install -U typer mistletoe
- name: Build packages
run: |
poetry build
Expand All @@ -36,7 +40,4 @@ jobs:
files: ./dist/qiskit*
body_path: ${{ github.workspace }}-CHANGELOG.txt
- name: Publish to PyPI
env:
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
TWINE_USERNAME: __token__
run: twine upload dist/qiskit*
uses: pypa/gh-action-pypi-publish@release/v1
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ htmlcov/
.cache
nosetests.xml
coverage.xml
coverage.lcov
*,cover
.hypothesis/
test/python/*.log
Expand Down
10 changes: 10 additions & 0 deletions .mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,13 @@ exclude = (?x)(
| ^tools/
)

# --------------------
# Additional checks
# --------------------

# Require decorating methods that override parent ones with @override
enable_error_code = explicit-override

[mypy-mistletoe.*]
ignore_missing_imports = True

Expand All @@ -99,6 +106,9 @@ ignore_missing_imports = True
[mypy-qiskit_aer.*]
ignore_missing_imports = True

[mypy-qiskit_algorithms.*]
ignore_missing_imports = True

[mypy-qiskit_experiments.*]
ignore_missing_imports = True

Expand Down
12 changes: 4 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: mixed-line-ending
- id: check-merge-conflict
Expand All @@ -13,18 +13,14 @@ repos:
- id: check-case-conflict
- id: no-commit-to-branch
args: [--branch, master]
- repo: https://github.com/psf/black
rev: 23.9.1
hooks:
- id: black
language_version: python3
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: "v0.0.291"
rev: "v0.1.5"
hooks:
- id: ruff
args: [ --fix, --exit-non-zero-on-fix ]
- id: ruff-format
- repo: https://github.com/tox-dev/pyproject-fmt
rev: "1.1.0"
rev: "1.2.0"
hooks:
- id: pyproject-fmt
- repo: local
Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,28 @@

## Unreleased

## qiskit-aqt-provider v1.0.0

* Set minimal required `qiskit` version to 0.45.0 (#108)
* Use `qiskit-algorithms` package instead of deprecated `qiskit.algorithms` in examples (#110)
* Use arnica.aqt.eu instead of arnica-stage.aqt.eu as default portal (#111)

## qiskit-aqt-provider v0.19.0

* Interprete string filters in `AQTProvider.get_backend()` as exact matches, not patterns (#90)
* Fix incorrect handling of qubit/clbit permutations by offline simulators (#93)
* Depend on [qiskit](https://pypi.org/project/qiskit/) instead of [qiskit-terra](https://pypi.org/project/qiskit-terra) (#95)
* Remove use of deprecated `Bit.index` and `Bit.register` (#99)
* Use [`ruff format`](https://docs.astral.sh/ruff/formatter/) instead of `black` (#101)

## qiskit-aqt-provider v0.18.0

* Check that the circuits submitted to the offline simulators can be converted to the AQT API (#68)
* Update the user guide and improve the API reference consistency (#72, #75)
* Add quickstart examples for the Qiskit.org homepage (#73)
* Add persistence mechanism for `AQTJob` instances (#77)
* Rename `OfflineSimulatorResource.noisy` to `OfflineSimulatorResource.with_noise_model` (#77)

## qiskit-aqt-provider v0.17.0

* Merge community and AQT versions (#61)
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

[![Latest release](https://img.shields.io/pypi/v/qiskit-aqt-provider.svg)](https://pypi.python.org/pypi/qiskit-aqt-provider)
[![License](https://img.shields.io/pypi/l/qiskit-aqt-provider.svg)](https://pypi.python.org/pypi/qiskit-aqt-provider)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10069281.svg)](https://doi.org/10.5281/zenodo.10069281)

[![Supported Python versions](https://img.shields.io/pypi/pyversions/qiskit-aqt-provider.svg)](https://pypi.python.org/pypi/qiskit-aqt-provider)
![Build Status](https://github.com/alpine-quantum-technologies/qiskit-aqt-provider/actions/workflows/poetry.yml/badge.svg?branch=master)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
![Build Status](https://github.com/qiskit-community/qiskit-aqt-provider/actions/workflows/poetry.yml/badge.svg?branch=master)
[![Coverage Status](https://coveralls.io/repos/github/qiskit-community/qiskit-aqt-provider/badge.svg?branch=master)](https://coveralls.io/github/qiskit-community/qiskit-aqt-provider?branch=master)
[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v1.json)](https://github.com/charliermarsh/ruff)
[![Checked with mypy](https://www.mypy-lang.org/static/mypy_badge.svg)](https://mypy-lang.org/)

Expand All @@ -15,4 +17,4 @@ systems.

## Usage

See the [user guide](https://github.com/qiskit-community/qiskit-aqt-provider/blob/master/docs/guide.rst) and the [examples](https://github.com/qiskit-community/qiskit-aqt-provider/tree/master/examples).
See the [documentation](https://qiskit-community.github.io/qiskit-aqt-provider/) and the [examples](https://github.com/qiskit-community/qiskit-aqt-provider/tree/master/examples).
27 changes: 0 additions & 27 deletions docs/_static/custom.css

This file was deleted.

41 changes: 0 additions & 41 deletions docs/_templates/autosummary/class.rst

This file was deleted.

38 changes: 0 additions & 38 deletions docs/_templates/autosummary/class_no_inherited_members.rst

This file was deleted.

Loading

0 comments on commit 6d97aaa

Please sign in to comment.