Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f70109f0ef32
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9898daf9a4de
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on May 11, 2016

  1. README: link artiq from the logo

    @jordens
    jordens committed May 11, 2016
    Copy the full SHA
    4d3c734 View commit details

  2. README: DOI/citation format

    @jordens
    jordens committed May 11, 2016
    Copy the full SHA
    9898daf View commit details
Showing with 6 additions and 0 deletions.
  1. +3 −0 README.rst
  2. +1 −0 RELEASING.rst
  3. +2 −0 doc/manual/introduction.rst
3 changes: 3 additions & 0 deletions README.rst
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
.. Absolute so that it works on github and on pypi
.. image:: https://raw.githubusercontent.com/m-labs/artiq/master/doc/logo/artiq.png
:target: https://m-labs.hk/artiq

ARTIQ (Advanced Real-Time Infrastructure for Quantum physics) is the next-generation control system for quantum information experiments.
It is developed by `M-Labs <https://m-labs.hk>`_ for and in partnership with the `Ion Storage Group at NIST <http://www.nist.gov/pml/div688/grp10/index.cfm>`_ as free software.
@@ -27,4 +28,6 @@ Technologies employed include `Python <https://www.python.org/>`_, `Migen <https

Website: https://m-labs.hk/artiq

`Cite ARTIQ <http://dx.doi.org/10.5281/zenodo.51303>`_ as ``Bourdeauducq, Sébastien et al. (2016). ARTIQ 1.0. Zenodo. 10.5281/zenodo.51303``.

Copyright (C) 2014-2016 M-Labs Limited. Licensed under GNU GPL version 3.
1 change: 1 addition & 0 deletions RELEASING.rst
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ Major releases
5. Test and fix any problems found. Apply fixes to both master and release-X.
6. If you have willing testers for release candidates, tag X.0rc1 in the release-X branch, have it build, and point testers there. Iterate over the previous points with new release candidates if necessary.
7. Tag X.0 in the release-X branch, build it, and copy its packages to ``main`` channel.
8. Mint a new DOI from Zenodo and update the README/introduction.

Minor (bugfix) releases
-----------------------
2 changes: 2 additions & 0 deletions doc/manual/introduction.rst
View file
Original file line number Diff line number Diff line change
@@ -29,4 +29,6 @@ Technologies employed include `Python <https://www.python.org/>`_, `Migen <https

Website: https://m-labs.hk/artiq

`Cite ARTIQ <http://dx.doi.org/10.5281/zenodo.51303>`_ as ``Bourdeauducq, Sébastien et al. (2016). ARTIQ 1.0. Zenodo. 10.5281/zenodo.51303``.

Copyright (C) 2014-2016 M-Labs Limited. Licensed under GNU GPL version 3.