From 0fbacb0002a5ec0df2cd984b8aa7216eba211964 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-pipistrello-nist_qc1/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 c81baa953..0dd569e5f 100644 --- a/conda/artiq-dev/meta.yaml +++ b/conda/artiq-dev/meta.yaml @@ -43,5 +43,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-pipistrello-nist_qc1/meta.yaml b/conda/artiq-pipistrello-nist_qc1/meta.yaml index 3f4a13092..858d77393 100644 --- a/conda/artiq-pipistrello-nist_qc1/meta.yaml +++ b/conda/artiq-pipistrello-nist_qc1/meta.yaml @@ -19,5 +19,5 @@ requirements: about: home: http://m-labs.hk/artiq - license: GPL + license: LGPL summary: 'Bitstream, BIOS and runtime for NIST_QC1 on the Pipistrello board' diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index 287bce62e..17b3147f2 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 99b647935..fd086f352 100644 --- a/doc/manual/introduction.rst +++ b/doc/manual/introduction.rst @@ -31,4 +31,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 fbd75bce5..77b310202 100755 --- a/setup.py +++ b/setup.py @@ -51,7 +51,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