remove old conda build recipes

conda/artiq-board/build.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SOC_PREFIX=$PREFIX/site-packages/artiq/board-support/${ARTIQ_TARGET}-${ARTIQ_VARIANT}
-mkdir -p ${SOC_PREFIX}
-
-V=1 $PYTHON -m artiq.gateware.targets.${ARTIQ_TARGET} -V ${ARTIQ_VARIANT}
-cp artiq_${ARTIQ_TARGET}/${ARTIQ_VARIANT}/gateware/top.bit ${SOC_PREFIX}
-cp artiq_${ARTIQ_TARGET}/${ARTIQ_VARIANT}/software/bootloader/bootloader.bin ${SOC_PREFIX}
-if [ -e artiq_${ARTIQ_TARGET}/${ARTIQ_VARIANT}/software/runtime ]
-then cp artiq_${ARTIQ_TARGET}/${ARTIQ_VARIANT}/software/runtime/runtime.{elf,fbi} ${SOC_PREFIX}
-else cp artiq_${ARTIQ_TARGET}/${ARTIQ_VARIANT}/software/satman/satman.{elf,fbi} ${SOC_PREFIX}
-fi

conda/artiq-board/meta.yaml

@@ -1,34 +0,0 @@
-package:
-  name: artiq-board
-  version: {{ environ["GIT_DESCRIBE_TAG"] }}
-
-source:
-  git_url: ../..
-
-build:
-  noarch: python
-  number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
-  string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
-  script_env:
-    - ARTIQ_TARGET
-    - ARTIQ_VARIANT
-  ignore_prefix_files: True
-
-outputs:
-  - name: artiq-{{ environ["ARTIQ_TARGET"] }}-{{ environ["ARTIQ_VARIANT"] }}
-    noarch: python
-    files:
-      - site-packages
-    requirements:
-      run:
-        - artiq {{ "{tag} {number}+git{hash}".format(tag=environ["GIT_DESCRIBE_TAG"], number=environ["GIT_DESCRIBE_NUMBER"], hash=environ["GIT_FULL_HASH"][:8]) }}
-    ignore_prefix_files: True
-
-requirements:
-  build:
-    - artiq-dev {{ "{tag} {number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG", "condabug"), number=environ["GIT_DESCRIBE_NUMBER"], hash=environ["GIT_FULL_HASH"][:8]) }}
-
-about:
-  home: https://m-labs.hk/artiq
-  license: LGPL
-  summary: 'Bitstream, BIOS and firmware for the {{ environ.get("ARTIQ_TARGET") }}-{{ environ.get("ARTIQ_VARIANT") }} board variant'

conda/artiq-dev.yaml

@@ -1,10 +0,0 @@
-# conda description for an environment to build and develop artiq
-# $ conda env create -f conda/artiq-dev.yaml
-name: artiq-dev
-channels:
-  - m-labs/label/dev
-  - m-labs/label/main
-  - defaults
-  - conda-forge/label/main
-dependencies:
-  - artiq-dev

conda/artiq-dev/meta.yaml

@@ -1,49 +0,0 @@
-package:
-  name: artiq-dev
-  version: {{ environ["GIT_DESCRIBE_TAG"] }}
-
-source:
-  git_url: ../..
-
-build:
-  noarch: python
-  number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
-  string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
-
-requirements:
-  run:
-    - python >=3.5.3,<3.6
-    - setuptools 33.1.1
-    - migen 0.8 py35_63+gitafe4405
-    - misoc 0.12 py35_11+git8e033c2c
-    - jesd204b 0.10
-    - microscope
-    - binutils-or1k-linux >=2.27
-    - llvm-or1k 6.0.0
-    - llvmlite-artiq 0.23.0.dev py35_5
-    - rust-core-or1k 1.28.0 21
-    - openocd 0.10.0 6
-    - lit
-    - outputcheck
-    - coverage
-    - scipy
-    - numpy
-    - prettytable
-    - sphinx 1.4.8
-    - sphinx-argparse
-    - sphinxcontrib-wavedrom
-    - sphinx_rtd_theme
-    - h5py 2.8
-    - python-dateutil
-    - pyqt >=5.5
-    - quamash
-    - pyqtgraph 0.10.0
-    - pygit2
-    - aiohttp >=3
-    - pythonparser >=1.1
-    - levenshtein
-
-about:
-  home: https://m-labs.hk/artiq
-  license: LGPL
-  summary: 'ARTIQ development metapackage'

conda/artiq-doc.yaml

@@ -1,15 +0,0 @@
-# conda description for an environment to build artiq documentation
-# $ conda env create -f conda/artiq-doc.yaml
-name: artiq-doc
-channels:
-  - m-labs/label/dev
-  - m-labs/label/main
-  - defaults
-  - conda-forge/label/main
-dependencies:
-  - python>=3.5.3,<3.6
-  - sphinx=1.4.8
-  - sphinx-argparse
-  - sphinxcontrib-wavedrom
-  - sphinx_rtd_theme
-  - pythonparser>=1.1

conda/artiq-sayma_rtm/build.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SOC_PREFIX=$SP_DIR/artiq/board-support/sayma_rtm
-mkdir -p $SOC_PREFIX
-
-$PYTHON -m artiq.gateware.targets.sayma_rtm
-cp artiq_sayma/rtm_gateware/rtm.bit $SOC_PREFIX
-cp artiq_sayma/rtm_gateware/rtm_csr.csv $SOC_PREFIX

conda/artiq-sayma_rtm/meta.yaml

@@ -1,23 +0,0 @@
-package:
-  name: artiq-sayma_rtm
-  version: {{ environ["GIT_DESCRIBE_TAG"] }}
-
-source:
-  git_url: ../..
-
-build:
-  noarch: python
-  number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
-  string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
-  ignore_prefix_files: True
-
-requirements:
-  build:
-    - artiq-dev {{ "{tag} {number}+git{hash}".format(tag=environ["GIT_DESCRIBE_TAG"], number=environ["GIT_DESCRIBE_NUMBER"], hash=environ["GIT_FULL_HASH"][:8]) }}
-  run:
-    - artiq {{ "{tag} {number}+git{hash}".format(tag=environ["GIT_DESCRIBE_TAG"], number=environ["GIT_DESCRIBE_NUMBER"], hash=environ["GIT_FULL_HASH"][:8]) }}
-
-about:
-  home: https://m-labs.hk/artiq
-  license: LGPL
-  summary: 'Bitstream and CSR map for Sayma RTM'

conda/artiq/build.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-$PYTHON setup.py install \
-  --prefix=$PREFIX \
-  --single-version-externally-managed \
-  --record=record.txt \
-  --no-compile

conda/artiq/meta.yaml

@@ -1,54 +0,0 @@
-package:
-  name: artiq
-  version: {{ environ["GIT_DESCRIBE_TAG"] }}
-
-source:
-  git_url: ../..
-
-{% set data = load_setup_py_data() %}
-
-build:
-  noarch: python
-  number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
-  string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
-  entry_points:
-    # NOTE: conda-build cannot distinguish between console and gui scripts
-    {% for entry_point_type, entry_points in data.get("entry_points", dict()).items() -%}
-    {% for entry_point in entry_points -%}
-    - {{ entry_point }}
-    {% endfor %}
-    {% endfor %}
-  ignore_prefix_files: True
-
-requirements:
-  build:
-    - python >=3.5.3,<3.6
-    - setuptools 33.1.1
-  run:
-    - python >=3.5.3,<3.6
-    - llvmlite-artiq 0.23.0.dev py35_5
-    - binutils-or1k-linux >=2.27
-    - pythonparser >=1.1
-    - openocd 0.10.0 6
-    - lit
-    - outputcheck
-    - scipy
-    - numpy
-    - prettytable
-    - h5py 2.8
-    - python-dateutil
-    - pyqt >=5.5
-    - quamash
-    - pyqtgraph 0.10.0
-    - pygit2
-    - aiohttp >=3
-    - levenshtein
-
-test:
-  imports:
-    - artiq
-
-about:
-  home: https://m-labs.hk/artiq
-  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.'

doc/manual/installing.rst

@@ -110,7 +110,7 @@ After installing either Anaconda or Miniconda, open a new terminal (also known a
 
 Executing just ``conda`` should print the help of the ``conda`` command. If your shell does not find the ``conda`` command, make sure that the Conda binaries are in your ``$PATH``. If ``$ echo $PATH`` does not show the Conda directories, add them: execute ``$ export PATH=$HOME/miniconda3/bin:$PATH`` if you installed Conda into ``~/miniconda3``.
 
-Download the `ARTIQ installer script <https://raw.githubusercontent.com/m-labs/artiq/master/conda/install-artiq.py>`_ and edit its beginning to define the Conda environment name (you can leave the default environment name if you are just getting started) and select the desired ARTIQ packages. Non-ARTIQ packages should be installed manually later.
+Download the `ARTIQ installer script <https://raw.githubusercontent.com/m-labs/artiq/master/install-with-conda.py>`_ and edit its beginning to define the Conda environment name (you can leave the default environment name if you are just getting started) and select the desired ARTIQ packages. Non-ARTIQ packages should be installed manually later.
 
 .. note::
   If you do not need to flash boards, the ``artiq`` package from the ``main`` Hydra build is sufficient. The packages named ``artiq-board-*`` contain only firmware for the FPGA board and are never necessary for using an ARTIQ system without reflashing it.
@@ -120,7 +120,7 @@ Controllers for third-party devices (e.g. Thorlabs TCube, Lab Brick Digital Atte
 Make sure the base Conda environment is activated and then run the installer script: ::
 
   $ conda activate base
-  $ python install-artiq.py
+  $ python install-with-conda.py
 
 After the installation, activate the newly created environment by name. ::
 

doc/manual/list_of_ndsps.rst

@@ -29,6 +29,6 @@ The following network device support packages are available for ARTIQ. This list
 
 In the "Nix package" column, ``m-labs`` refer to the Nix channel at https://nixbld.m-labs.hk/channel/custom/artiq/main/channel.
 
-The "Conda package" column gives the line to add into ``install-artiq.py`` to install the corresponding package. Conda packages may also be downloaded from https://nixbld.m-labs.hk/project/artiq and installed manually.
+The "Conda package" column gives the line to add into ``install-with-conda.py`` to install the corresponding package. Conda packages may also be downloaded from https://nixbld.m-labs.hk/project/artiq and installed manually.
 
 For PDQ2 see https://github.com/m-labs/pdq. For PICam see https://github.com/quartiq/picam.

install-with-conda.py

@@ -1,5 +1,5 @@
 # This script installs ARTIQ using the conda packages built by the new Nix/Hydra system.
-# It needs to be run in the root (base) conda environment with "python install-artiq.py"
+# It needs to be run in the root (base) conda environment with "python install-with-conda.py"
 # It supports Linux and Windows, but Linux users should consider using the higher-quality
 # Nix package manager instead of Conda.