diff --git a/conda/artiq-kc705-nist_qc1/meta.yaml b/conda/artiq-kc705-nist_qc1/meta.yaml index bee5c234b..0b19cbb9d 100644 --- a/conda/artiq-kc705-nist_qc1/meta.yaml +++ b/conda/artiq-kc705-nist_qc1/meta.yaml @@ -23,5 +23,5 @@ requirements: about: home: http://m-labs.hk/artiq - license: 3-clause BSD + license: GPL summary: 'Bitstream, BIOS and runtime for NIST_QC1 on the KC705 board' diff --git a/conda/artiq-kc705-nist_qc2/meta.yaml b/conda/artiq-kc705-nist_qc2/meta.yaml index 1cbb86f2e..6ab132bba 100644 --- a/conda/artiq-kc705-nist_qc2/meta.yaml +++ b/conda/artiq-kc705-nist_qc2/meta.yaml @@ -23,5 +23,5 @@ requirements: about: home: http://m-labs.hk/artiq - license: 3-clause BSD + license: GPL 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 254361e67..64988647d 100644 --- a/conda/artiq-pipistrello-nist_qc1/meta.yaml +++ b/conda/artiq-pipistrello-nist_qc1/meta.yaml @@ -23,5 +23,5 @@ requirements: about: home: http://m-labs.hk/artiq - license: 3-clause BSD + license: GPL 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 f6f24e2f3..9fa02839d 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -62,5 +62,5 @@ test: about: home: http://m-labs.hk/artiq - license: 3-clause BSD + license: GPL 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/setup.py b/setup.py index 9ca327bde..68b7b9b30 100755 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ setup( url="http://m-labs.hk/artiq", description="A control system for trapped-ion experiments", long_description=open("README.rst").read(), - license="BSD", + license="GPL", install_requires=requirements, extras_require={}, dependency_links=[