From 55f217ceef2657446d45f3ab26715f8f427ae28e Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 3 Mar 2017 18:01:48 +0800 Subject: [PATCH] conda: use artiq-dev system --- conda/artiq-dev/meta.yaml | 47 ++++++++++++++++++++++ conda/{artiq-doc.yml => artiq-doc.yaml} | 0 conda/artiq-kc705-nist_clock/meta.yaml | 5 +-- conda/artiq-kc705-nist_qc1/build.sh | 14 ------- conda/artiq-kc705-nist_qc1/meta.yaml | 25 ------------ conda/artiq-kc705-nist_qc2/meta.yaml | 5 +-- conda/artiq-pipistrello-nist_qc1/meta.yaml | 5 +-- conda/artiq/meta.yaml | 15 +++---- 8 files changed, 55 insertions(+), 61 deletions(-) create mode 100644 conda/artiq-dev/meta.yaml rename conda/{artiq-doc.yml => artiq-doc.yaml} (100%) delete mode 100644 conda/artiq-kc705-nist_qc1/build.sh delete mode 100644 conda/artiq-kc705-nist_qc1/meta.yaml diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml new file mode 100644 index 000000000..0a8e72e3d --- /dev/null +++ b/conda/artiq-dev/meta.yaml @@ -0,0 +1,47 @@ +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.4 + - misoc 0.3 + - binutils-or1k-linux + - llvm-or1k + - llvmlite-artiq 0.10.0.dev py35_24 + - openocd >=0.10 + - lit + - outputcheck + - coverage + - scipy + - numpy + - prettytable + - asyncserial + - sphinx 1.4.8 + - sphinx-argparse + - sphinxcontrib-wavedrom + - sphinx_rtd_theme + - h5py + - dateutil + - pyqt >=5.5 + - 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-doc.yml b/conda/artiq-doc.yaml similarity index 100% rename from conda/artiq-doc.yml rename to conda/artiq-doc.yaml diff --git a/conda/artiq-kc705-nist_clock/meta.yaml b/conda/artiq-kc705-nist_clock/meta.yaml index e2c9ff197..5028ad009 100644 --- a/conda/artiq-kc705-nist_clock/meta.yaml +++ b/conda/artiq-kc705-nist_clock/meta.yaml @@ -12,10 +12,7 @@ build: requirements: build: - - migen 0.4 - - misoc 0.3 - - llvm-or1k - - binutils-or1k-linux + - 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_qc1/build.sh b/conda/artiq-kc705-nist_qc1/build.sh deleted file mode 100644 index 855f2bdf3..000000000 --- a/conda/artiq-kc705-nist_qc1/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh -[ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE - -SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-nist_qc1 -mkdir -p $SOC_PREFIX - -$PYTHON -m artiq.gateware.targets.kc705 -H nist_qc1 --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE -cp misoc_nist_qc1_kc705/gateware/top.bit $SOC_PREFIX -cp misoc_nist_qc1_kc705/software/bios/bios.bin $SOC_PREFIX -cp misoc_nist_qc1_kc705/software/runtime/runtime.fbi $SOC_PREFIX - -wget -P $SOC_PREFIX https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/master/bscan_spi_xc7k325t.bit diff --git a/conda/artiq-kc705-nist_qc1/meta.yaml b/conda/artiq-kc705-nist_qc1/meta.yaml deleted file mode 100644 index d7f3131bc..000000000 --- a/conda/artiq-kc705-nist_qc1/meta.yaml +++ /dev/null @@ -1,25 +0,0 @@ -package: - name: artiq-kc705-nist_qc1 - 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: - build: - - migen 0.4 - - misoc 0.3 - - llvm-or1k - - binutils-or1k-linux - 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 "" }} - -about: - home: https://m-labs.hk/artiq - 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 d84dd4537..76032bbaa 100644 --- a/conda/artiq-kc705-nist_qc2/meta.yaml +++ b/conda/artiq-kc705-nist_qc2/meta.yaml @@ -12,10 +12,7 @@ build: requirements: build: - - migen 0.4 - - misoc 0.3 - - llvm-or1k - - binutils-or1k-linux + - 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-nist_qc1/meta.yaml b/conda/artiq-pipistrello-nist_qc1/meta.yaml index 2e3ca4b8e..4a58f37bd 100644 --- a/conda/artiq-pipistrello-nist_qc1/meta.yaml +++ b/conda/artiq-pipistrello-nist_qc1/meta.yaml @@ -12,10 +12,7 @@ build: requirements: build: - - migen 0.4 - - misoc 0.3 - - llvm-or1k - - binutils-or1k-linux + - 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/meta.yaml b/conda/artiq/meta.yaml index 6b2016989..2681f2c2f 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -12,23 +12,20 @@ build: requirements: build: - - python >=3.5.2 + - python 3.5.2 - setuptools - - numpy - - binutils-or1k-linux run: - - python >=3.5.2 + - python 3.5.2 - llvmlite-artiq 0.10.0.dev py35_24 + - binutils-or1k-linux + - pythonparser 1.0 + - openocd >=0.10 - lit - outputcheck - scipy - numpy - prettytable - asyncserial - - sphinx 1.4.8 - - sphinx-argparse - - sphinxcontrib-wavedrom - - sphinx_rtd_theme - h5py - dateutil - pyqt >=5.5 @@ -36,8 +33,6 @@ requirements: - pyqtgraph - pygit2 - aiohttp - - binutils-or1k-linux - - pythonparser - levenshtein test: