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

use https for m-labs.hk

This commit is contained in:
Sebastien Bourdeauducq 2016-02-10 17:20:29 +01:00
parent 97ba77f4b5
commit 64263b75d0
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -12,6 +12,6 @@ nanosecond timing resolution and sub-microsecond latency.
Technologies employed include Python, Migen, MiSoC/mor1kx, LLVM and llvmlite. Technologies employed include Python, Migen, MiSoC/mor1kx, LLVM and llvmlite.
Website: Website:
http://m-labs.hk/artiq https://m-labs.hk/artiq
Copyright (C) 2014-2016 M-Labs Limited. Licensed under GNU GPL version 3. Copyright (C) 2014-2016 M-Labs Limited. Licensed under GNU GPL version 3.

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

@ -22,6 +22,6 @@ requirements:
- artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_DESCRIBE_HASH")[1:]) if "GIT_DESCRIBE_TAG" in environ else "" }} - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_DESCRIBE_HASH")[1:]) if "GIT_DESCRIBE_TAG" in environ else "" }}
about: about:
home: http://m-labs.hk/artiq home: https://m-labs.hk/artiq
license: GPL license: GPL
summary: 'Bitstream, BIOS and runtime for NIST_QC2 on the KC705 board' summary: 'Bitstream, BIOS and runtime for NIST_QC2 on the KC705 board'

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

@ -22,6 +22,6 @@ requirements:
- artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_DESCRIBE_HASH")[1:]) if "GIT_DESCRIBE_TAG" in environ else "" }} - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_DESCRIBE_HASH")[1:]) if "GIT_DESCRIBE_TAG" in environ else "" }}
about: about:
home: http://m-labs.hk/artiq home: https://m-labs.hk/artiq
license: GPL license: GPL
summary: 'Bitstream, BIOS and runtime for NIST_QC1 on the KC705 board' summary: 'Bitstream, BIOS and runtime for NIST_QC1 on the KC705 board'

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

@ -22,6 +22,6 @@ requirements:
- artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_DESCRIBE_HASH")[1:]) if "GIT_DESCRIBE_TAG" in environ else "" }} - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_DESCRIBE_HASH")[1:]) if "GIT_DESCRIBE_TAG" in environ else "" }}
about: about:
home: http://m-labs.hk/artiq home: https://m-labs.hk/artiq
license: GPL license: GPL
summary: 'Bitstream, BIOS and runtime for NIST_QC2 on the KC705 board' summary: 'Bitstream, BIOS and runtime for NIST_QC2 on the KC705 board'

2
conda/artiq/meta.yaml
View File

@ -60,6 +60,6 @@ test:
- artiq - artiq
about: about:
home: http://m-labs.hk/artiq home: https://m-labs.hk/artiq
license: GPL 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.' 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

@ -20,4 +20,4 @@ Technologies employed include Python, Migen, MiSoC/mor1kx, LLVM and llvmlite.
ARTIQ is licensed under 3-clause BSD. ARTIQ is licensed under 3-clause BSD.
Website: Website:
http://m-labs.hk/artiq https://m-labs.hk/artiq

2
setup.py
View File

@ -46,7 +46,7 @@ setup(
cmdclass=versioneer.get_cmdclass(), cmdclass=versioneer.get_cmdclass(),
author="M-Labs / NIST Ion Storage Group", author="M-Labs / NIST Ion Storage Group",
author_email="sb@m-labs.hk", author_email="sb@m-labs.hk",
url="http://m-labs.hk/artiq", url="https://m-labs.hk/artiq",
description="A control system for trapped-ion experiments", description="A control system for trapped-ion experiments",
long_description=open("README.rst").read(), long_description=open("README.rst").read(),
license="GPL", license="GPL",