Skip to content
This repository was archived by the owner on May 17, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 0 additions & 35 deletions .circleci/config.yml

This file was deleted.

72 changes: 72 additions & 0 deletions .github/workflows/on-push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Push workflow

on:
push:
branches:
- '**'

jobs:

housekeeping:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Perform housekeeping checks
env:
GCLOUD_CONTAINER_AUTH: ${{ secrets.GCLOUD_CONTAINER_AUTH }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
source <(curl -sL http://ci.q-ctrl.com)
./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 /scripts/housekeeping.sh

linting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Install Python dependencies
env:
GCLOUD_CONTAINER_AUTH: ${{ secrets.GCLOUD_CONTAINER_AUTH }}
run: |
source <(curl -sL http://ci.q-ctrl.com)
./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 /scripts/install-python-dependencies.sh
- name: Run Pylint
run: |
./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 poetry run pylint_runner || true
- name: Run Pylama
run: |
./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 poetry run pylama || true
- name: Run Markdownlint
run: |
./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 mdl -- -ig . || true

pytest:
runs-on: ubuntu-latest
strategy:
matrix:
python: [36, 37]
steps:
- uses: actions/checkout@v1
- name: Install Python dependencies
env:
GCLOUD_CONTAINER_AUTH: ${{ secrets.GCLOUD_CONTAINER_AUTH }}
run: |
source <(curl -sL http://ci.q-ctrl.com)
./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
./ci docker run asia.gcr.io/q-ctrl-api-development/python-${{ matrix.python }} /scripts/install-python-dependencies.sh
- name: Run Pytest
run: |
./ci docker run asia.gcr.io/q-ctrl-api-development/python-${{ matrix.python }} /scripts/pytest.sh

publish_internally:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Publish development version
env:
GCLOUD_CONTAINER_AUTH: ${{ secrets.GCLOUD_CONTAINER_AUTH }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
source <(curl -sL http://ci.q-ctrl.com)
./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 /scripts/publish-dev-version.sh
32 changes: 32 additions & 0 deletions .github/workflows/on-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Release workflow

on:
release:
types: [published]

jobs:

release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Update version in code
env:
GCLOUD_CONTAINER_AUTH: ${{ secrets.GCLOUD_CONTAINER_AUTH }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
source <(curl -sL http://ci.q-ctrl.com)
./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 /scripts/housekeeping.sh
- name: Publish publicly
env:
GCLOUD_CONTAINER_AUTH: ${{ secrets.GCLOUD_CONTAINER_AUTH }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
source <(curl -sL http://ci.q-ctrl.com)
./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 /scripts/publish-release-publicly.sh
- name: Publish internally
env:
GCLOUD_CONTAINER_AUTH: ${{ secrets.GCLOUD_CONTAINER_AUTH }}
run: |
./ci docker run asia.gcr.io/q-ctrl-api-development/python-37 /scripts/publish-release-internally.sh
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Q-CTRL Qiskit
# Q-CTRL Qiskit Adaptor

The aim of the Q-CTRL Qiskit package is to provide export functions allowing
The aim of the Q-CTRL Qiskit Adaptor package is to provide export functions allowing
users to deploy established error-robust quantum control protocols from the
open literature and defined in Q-CTRL Open Controls on IBM Quantum hardware.

Expand All @@ -17,13 +17,13 @@ Anyone interested in quantum control is welcome to contribute to this project.

## Installation

Q-CTRL Qiskit can be install through `pip` or from source. We recommend
Q-CTRL Qiskit Adaptor can be installed through `pip` or from source. We recommend
the `pip` distribution to get the most recent stable release. If you want the
latest features then install from source.

### Requirements

To use Q-CTRL Qiskit you will need an installation of Python. We
To use Q-CTRL Qiskit Adaptor you will need an installation of Python. We
recommend using the [Anaconda](https://www.anaconda.com/) distribution of
Python. Anaconda includes standard numerical and scientific Python packages
which are optimally compiled for your machine. Follow the [Anaconda
Expand All @@ -37,7 +37,7 @@ jupyter notebook editor](https://jupyter.org/install) on its own.

### Using PyPi

Use `pip` to install the latest version of Q-CTRL Qiskit.
Use `pip` to install the latest version of Q-CTRL Qiskit Adaptor.

```shell
pip install qctrl-qiskit
Expand Down
13 changes: 7 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

Q-CTRL Qiskit
=============
Q-CTRL Qiskit Adaptor
=====================

The aim of the Q-CTRL Qiskit package is to provide export functions allowing
The aim of the Q-CTRL Qiskit Adaptor package is to provide export functions allowing
users to deploy established error-robust quantum control protocols from the
open literature and defined in Q-CTRL Open Controls on IBM Quantum hardware.

Expand All @@ -11,6 +11,7 @@ Anyone interested in quantum control is welcome to contribute to this project.
Table of Contents
-----------------


* `Installation <#installation>`_
* `Usage <#usage>`_
* `Contributing <#contributing>`_
Expand All @@ -20,14 +21,14 @@ Table of Contents
Installation
------------

Q-CTRL Qiskit can be installed through ``pip`` or from source. We recommend
Q-CTRL Qiskit Adaptor can be installed through ``pip`` or from source. We recommend
the ``pip`` distribution to get the most recent stable release. If you want the
latest features then install from source.

Requirements
^^^^^^^^^^^^

To use Q-CTRL Qiskit you will need an installation of Python. We
To use Q-CTRL Qiskit Adaptor you will need an installation of Python. We
recommend using the `Anaconda <https://www.anaconda.com/>`_ distribution of
Python. Anaconda includes standard numerical and scientific Python packages
which are optimally compiled for your machine. Follow the `Anaconda
Expand All @@ -42,7 +43,7 @@ jupyter notebook editor <https://jupyter.org/install>`_ on its own.
Using PyPi
^^^^^^^^^^

Use ``pip`` to install the latest version of Q-CTRL Qiskit.
Use ``pip`` to install the latest version of Q-CTRL Qiskit Adaptor.

.. code-block:: shell

Expand Down
16 changes: 8 additions & 8 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@

Q-CTRL Qiskit
=============
Q-CTRL Qiskit Adaptor
=====================

Aim of the Q-CTRL Qiskit package is to provide easy to use export functions
Aim of the Q-CTRL Qiskit Adaptor package is to provide easy to use export functions
allowing users to deploy the quantum controls techniques, define in Q-CTRL Open
control on IBMQ quantum hardware.
Controls, on IBMQ quantum hardware.

Installation
------------

Q-CTRL Qiskit can be install through ``pip`` or from source. We recommend
Q-CTRL Qiskit Adaptor can be install through ``pip`` or from source. We recommend
the ``pip`` distribution to get the most recent stable release. If you want the
latest features then install from source.

Requirements
^^^^^^^^^^^^

To use Q-CTRL Qiskit you will need an installation of Python. We
To use Q-CTRL Qiskit Adaptor you will need an installation of Python. We
recommend using the `Anaconda <https://www.anaconda.com/>`_ distribution of
Python. Anaconda includes standard numerical and scientific Python packages
which are optimally compiled for your machine. Follow the `Anaconda
Expand All @@ -31,7 +31,7 @@ jupyter notebook editor <https://jupyter.org/install>`_ on its own.
Using PyPi
^^^^^^^^^^

Use ``pip`` to install the latest version of Q-CTRL Qiskit.
Use ``pip`` to install the latest version of Q-CTRL Qiskit Adaptor.

.. code-block:: shell

Expand Down Expand Up @@ -73,7 +73,7 @@ Once the clone is complete, you have two options:
**Note:** if you are on Windows, you'll need to install
`Poetry <https://poetry.eustace.io>`_ manually, and use:

.. code-block:: cmd
.. code-block:: shell

cd python-qiskit
poetry install
Expand Down
21 changes: 17 additions & 4 deletions poetry.lock

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

9 changes: 6 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
[tool.poetry]
name = "qctrl-qiskit"
version = "0.0.1"
description = "Q-CTRL Qiskit"
version = "0.0.0"
description = "Q-CTRL Qiskit Adapter"
license = "Apache-2.0"
authors = ["Q-CTRL <support@q-ctrl.com>"]
readme = "README.md"
keywords = [
"quantum",
"computing",
"open source",
"engineering"
"engineering",
"qiskit"
]
classifiers = [
"Development Status :: 5 - Production/Stable",
Expand Down Expand Up @@ -38,6 +39,8 @@ scipy = "^1.3"
toml = "^0.10.0"
qiskit-ibmq-provider = "^0.3.3"
qiskit-terra = "^0.10.0"
qctrl-open-controls = "^3.0.0"


[tool.poetry.dev-dependencies]
pytest = "*"
Expand Down
2 changes: 1 addition & 1 deletion qctrlqiskit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
===========
"""

__version__ = "0.0.1"
__version__ = "0.0.0"

from .quantum_circuit import convert_dds_to_qiskit_quantum_circuit

Expand Down
2 changes: 1 addition & 1 deletion qctrlqiskit/quantum_circuit.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def convert_dds_to_qiskit_quantum_circuit(
the real-circuit is :math:`gate\\_time \\times number\\_of\\_identity\\_gates +
pulse\\_gate\\_time \\times number\\_of\\_pulses`.

Q-CTRL Open Controls support operation resulting in rotation around at most one axis at
Q-CTRL Qiskit Adapter supports operation resulting in rotation around at most one axis at
any offset.
"""

Expand Down
Loading