srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

setup.py etc: update license

This commit is contained in:
Robert Jördens 2017-07-18 11:31:04 +02:00
parent 377c776ec8
commit 5c66b63768
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.rst
View File

@ -51,7 +51,7 @@ Copyright and Sign-Off
----------------------
Authors retain copyright of their contributions to ARTIQ, but whenever possible
should use the GNU GPL version 3 license for them to be merged.
should use the GNU LGPL version 3 license for them to be merged.
Works of US government employees are not copyrighted but can also be merged.

2
conda/artiq-dev/meta.yaml
View File

@ -46,5 +46,5 @@ requirements:
about:
home: https://m-labs.hk/artiq
license: GPL
license: LGPL
summary: 'ARTIQ development metapackage'

2
conda/artiq-kc705-nist_clock/meta.yaml
View File

@ -19,5 +19,5 @@ requirements:
about:
home: https://m-labs.hk/artiq
license: GPL
license: LGPL
summary: 'Bitstream, BIOS and runtime for NIST_CLOCK on the KC705 board'

2
conda/artiq-kc705-nist_qc2/meta.yaml
View File

@ -19,5 +19,5 @@ requirements:
about:
home: https://m-labs.hk/artiq
license: GPL
license: LGPL
summary: 'Bitstream, BIOS and runtime for NIST_QC2 on the KC705 board'

2
conda/artiq-kc705-phaser/meta.yaml
View File

@ -19,5 +19,5 @@ requirements:
about:
home: https://m-labs.hk/artiq
license: GPL
license: LGPL
summary: 'Bitstream, BIOS and runtime for Phaser on the KC705 board'

2
conda/artiq/meta.yaml
View File

@ -51,5 +51,5 @@ test:
about:
home: https://m-labs.hk/artiq
license: GPL
license: LGPL
summary: 'ARTIQ (Advanced Real-Time Infrastructure for Quantum physics) is a next-generation control system for quantum information experiments. It is being developed in partnership with the Ion Storage Group at NIST, and its applicability reaches beyond ion trapping.'

2
doc/manual/introduction.rst
View File

@ -30,4 +30,4 @@ 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-2017 M-Labs Limited. Licensed under GNU GPL version 3.
Copyright (C) 2014-2017 M-Labs Limited. Licensed under GNU LGPL version 3+.

2
setup.py
View File

@ -58,7 +58,7 @@ setup(
url="https://m-labs.hk/artiq",
description="Advanced Real-Time Infrastructure for Quantum physics",
long_description=open("README.rst", encoding="utf-8").read(),
license="GPLv3+",
license="LGPLv3+",
classifiers="""\
Development Status :: 5 - Production/Stable
Environment :: Console