From 5c66b6376841920032451c593c1f8b8c39e9fcba Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Tue, 18 Jul 2017 11:31:04 +0200 Subject: [PATCH] setup.py etc: update license --- CONTRIBUTING.rst | 2 +- conda/artiq-dev/meta.yaml | 2 +- conda/artiq-kc705-nist_clock/meta.yaml | 2 +- conda/artiq-kc705-nist_qc2/meta.yaml | 2 +- conda/artiq-kc705-phaser/meta.yaml | 2 +- conda/artiq/meta.yaml | 2 +- doc/manual/introduction.rst | 2 +- setup.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index b24ce8a24..14cdaa256 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -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. diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml index 89d43682f..192a00fef 100644 --- a/conda/artiq-dev/meta.yaml +++ b/conda/artiq-dev/meta.yaml @@ -46,5 +46,5 @@ requirements: about: home: https://m-labs.hk/artiq - license: GPL + license: LGPL summary: 'ARTIQ development metapackage' diff --git a/conda/artiq-kc705-nist_clock/meta.yaml b/conda/artiq-kc705-nist_clock/meta.yaml index d55b7dd4a..f6aebd686 100644 --- a/conda/artiq-kc705-nist_clock/meta.yaml +++ b/conda/artiq-kc705-nist_clock/meta.yaml @@ -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' diff --git a/conda/artiq-kc705-nist_qc2/meta.yaml b/conda/artiq-kc705-nist_qc2/meta.yaml index 26c5b48a6..7caf0169a 100644 --- a/conda/artiq-kc705-nist_qc2/meta.yaml +++ b/conda/artiq-kc705-nist_qc2/meta.yaml @@ -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' diff --git a/conda/artiq-kc705-phaser/meta.yaml b/conda/artiq-kc705-phaser/meta.yaml index 8d555203f..fff75889f 100644 --- a/conda/artiq-kc705-phaser/meta.yaml +++ b/conda/artiq-kc705-phaser/meta.yaml @@ -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' diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index 2a2f25ce4..7841d0815 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -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.' diff --git a/doc/manual/introduction.rst b/doc/manual/introduction.rst index cf12b5683..5321244e9 100644 --- a/doc/manual/introduction.rst +++ b/doc/manual/introduction.rst @@ -30,4 +30,4 @@ Website: https://m-labs.hk/artiq `Cite ARTIQ `_ 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+. diff --git a/setup.py b/setup.py index f5227f3fe..53621c1cf 100755 --- a/setup.py +++ b/setup.py @@ -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