From fb56c32d35e759297755673b23244a9002818205 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Wed, 1 Feb 2017 06:24:08 +0100 Subject: [PATCH] conda: use artiq-dev metapackage --- conda/artiq-dev.yml | 28 +-------------- conda/artiq-dev/meta.yaml | 48 ++++++++++++++++++++++++++ conda/artiq-kc705-nist_clock/meta.yaml | 7 +--- conda/artiq-kc705-nist_qc2/meta.yaml | 7 +--- conda/artiq-kc705-phaser/meta.yaml | 9 +---- conda/artiq-pipistrello-demo/meta.yaml | 7 +--- 6 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 conda/artiq-dev/meta.yaml diff --git a/conda/artiq-dev.yml b/conda/artiq-dev.yml index 173adec8f..b9defdb30 100644 --- a/conda/artiq-dev.yml +++ b/conda/artiq-dev.yml @@ -6,30 +6,4 @@ channels: - m-labs/label/dev - defaults dependencies: - - python=3.5.2 - - setuptools - - llvmlite-artiq=0.12.0.dev=py35_30 - - lit - - outputcheck - - scipy - - numpy - - prettytable - - asyncserial - - sphinx=1.4.8 - - sphinx-argparse - - sphinxcontrib-wavedrom - - sphinx_rtd_theme - - h5py - - dateutil - - pyqt5 - - quamash - - pyqtgraph - - pygit2 - - aiohttp - - binutils-or1k-linux>=2.27 - - pythonparser=1.0 - - levenshtein - - migen=0.5.dev=py_51+gite93d060 - - misoc=0.6.dev=py_0+gitc8d5fd3 - - rust-core-or1k=1.16.0=11 - - cargo + - artiq-dev diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml new file mode 100644 index 000000000..ec9d330b1 --- /dev/null +++ b/conda/artiq-dev/meta.yaml @@ -0,0 +1,48 @@ +package: + name: artiq-dev + version: {{ environ.get("GIT_DESCRIBE_TAG", "") }} + +source: + git_url: ../.. + +build: + noarch_python: true + number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }} + +requirements: + run: + - python 3.5.2 + - setuptools + - migen 0.5.dev py_54+git58e8f45 + - misoc 0.6.dev py_2+git02884fe + - jesd204b 0.2 + - binutils-or1k-linux >=2.27 + - llvm-or1k + - llvmlite-artiq 0.12.0.dev py35_30 + - rust-core-or1k 1.16.0 11 + - cargo + - lit + - outputcheck + - scipy + - numpy + - prettytable + - asyncserial + - sphinx 1.4.8 + - sphinx-argparse + - sphinxcontrib-wavedrom + - sphinx_rtd_theme + - h5py + - dateutil + - pyqt5 + - quamash + - pyqtgraph + - pygit2 + - aiohttp + - pythonparser 1.0 + - levenshtein + +about: + home: https://m-labs.hk/artiq + license: GPL + summary: 'ARTIQ development metapackage' diff --git a/conda/artiq-kc705-nist_clock/meta.yaml b/conda/artiq-kc705-nist_clock/meta.yaml index a72f56121..5028ad009 100644 --- a/conda/artiq-kc705-nist_clock/meta.yaml +++ b/conda/artiq-kc705-nist_clock/meta.yaml @@ -12,12 +12,7 @@ build: requirements: build: - - migen 0.5.dev py_54+git58e8f45 - - misoc 0.6.dev py_2+git02884fe - - llvm-or1k - - binutils-or1k-linux >=2.27 - - rust-core-or1k 1.16.0 11 - - cargo + - artiq-dev {{ "{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 "" }} run: - 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 "" }} diff --git a/conda/artiq-kc705-nist_qc2/meta.yaml b/conda/artiq-kc705-nist_qc2/meta.yaml index 5ed8f059d..76032bbaa 100644 --- a/conda/artiq-kc705-nist_qc2/meta.yaml +++ b/conda/artiq-kc705-nist_qc2/meta.yaml @@ -12,12 +12,7 @@ build: requirements: build: - - migen 0.5.dev py_54+git58e8f45 - - misoc 0.6.dev py_2+git02884fe - - llvm-or1k - - binutils-or1k-linux >=2.27 - - rust-core-or1k 1.16.0 11 - - cargo + - artiq-dev {{ "{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 "" }} run: - 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 "" }} diff --git a/conda/artiq-kc705-phaser/meta.yaml b/conda/artiq-kc705-phaser/meta.yaml index bc3f3020b..8697b88d0 100644 --- a/conda/artiq-kc705-phaser/meta.yaml +++ b/conda/artiq-kc705-phaser/meta.yaml @@ -12,14 +12,7 @@ build: requirements: build: - - migen 0.5.dev py_54+git58e8f45 - - misoc 0.6.dev py_2+git02884fe - - jesd204b 0.2 - - llvm-or1k - - binutils-or1k-linux >=2.27 - - rust-core-or1k 1.16.0 11 - - cargo - - numpy + - artiq-dev {{ "{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 "" }} run: - 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 "" }} diff --git a/conda/artiq-pipistrello-demo/meta.yaml b/conda/artiq-pipistrello-demo/meta.yaml index ff754f956..d2fec0824 100644 --- a/conda/artiq-pipistrello-demo/meta.yaml +++ b/conda/artiq-pipistrello-demo/meta.yaml @@ -12,12 +12,7 @@ build: requirements: build: - - migen 0.5.dev py_54+git58e8f45 - - misoc 0.6.dev py_2+git02884fe - - llvm-or1k - - binutils-or1k-linux >=2.27 - - rust-core-or1k 1.16.0 11 - - cargo + - artiq-dev {{ "{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 "" }} run: - 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 "" }}