diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh index 790a723ad..69f107dce 100755 --- a/.travis/get-anaconda.sh +++ b/.travis/get-anaconda.sh @@ -10,4 +10,5 @@ conda update -q conda conda info -a conda install conda-build jinja2 conda create -q -n py35 python=$TRAVIS_PYTHON_VERSION +conda config --add channels https://conda.anaconda.org/m-labs/channel/main conda config --add channels https://conda.anaconda.org/m-labs/channel/dev diff --git a/conda/README.md b/conda/README.md deleted file mode 100644 index 017742a8b..000000000 --- a/conda/README.md +++ /dev/null @@ -1,17 +0,0 @@ -Uploading conda packages (Python 3.5) -===================================== - -Preparing: - - 1. [Install miniconda][miniconda] - 2. `conda update -q conda` - 3. `conda install conda-build jinja2 anaconda` - 4. `conda create -q -n py35 python=3.5` - 5. `conda config --add channels https://conda.anaconda.org/m-labs/channel/dev` - -Building: - - 1. `conda build pkgname --python 3.5`; this command displays a path to the freshly built package - 2. `anaconda upload -c main -c dev` - -[miniconda]: http://conda.pydata.org/docs/install/quick.html#linux-miniconda-install diff --git a/conda/aiohttp/bld.bat b/conda/aiohttp/bld.bat deleted file mode 100644 index c40a9bbef..000000000 --- a/conda/aiohttp/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ -"%PYTHON%" setup.py install -if errorlevel 1 exit 1 diff --git a/conda/aiohttp/build.sh b/conda/aiohttp/build.sh deleted file mode 100644 index 8e25a1455..000000000 --- a/conda/aiohttp/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -$PYTHON setup.py install diff --git a/conda/aiohttp/meta.yaml b/conda/aiohttp/meta.yaml deleted file mode 100644 index 2b196ffc1..000000000 --- a/conda/aiohttp/meta.yaml +++ /dev/null @@ -1,36 +0,0 @@ -package: - name: aiohttp - version: "0.17.2" - -source: - fn: aiohttp-0.17.2.tar.gz - url: https://pypi.python.org/packages/source/a/aiohttp/aiohttp-0.17.2.tar.gz - md5: 7640928fd4b5c1ccf1f8bcad276d39d6 - -build: - number: 0 - -requirements: - build: - - python - - setuptools - - chardet - - run: - - python - - chardet - -test: - # Python imports - imports: - - aiohttp - - requires: - - chardet - - gunicorn # [not win] - - nose - -about: - home: https://github.com/KeepSafe/aiohttp/ - license: Apache Software License - summary: 'http client/server for asyncio' diff --git a/conda/binutils-or1k-linux/README.md b/conda/binutils-or1k-linux/README.md deleted file mode 100755 index d812cc7b2..000000000 --- a/conda/binutils-or1k-linux/README.md +++ /dev/null @@ -1,8 +0,0 @@ -binutils-or1k-linux -=================== - -To build this package on Windows: - -* Install cygwin -* Install the following packages: gcc-core g++-core make texinfo patch -* Run cygwin terminal and execute $ conda build binutils-or1k-linux \ No newline at end of file diff --git a/conda/binutils-or1k-linux/bld.bat b/conda/binutils-or1k-linux/bld.bat deleted file mode 100644 index 6c709129f..000000000 --- a/conda/binutils-or1k-linux/bld.bat +++ /dev/null @@ -1,10 +0,0 @@ -FOR /F "tokens=* USEBACKQ" %%F IN (`cygpath -u %PREFIX%`) DO ( -SET var=%%F -) -set PREFIX=%var% -FOR /F "tokens=* USEBACKQ" %%F IN (`cygpath -u %RECIPE_DIR%`) DO ( -SET var=%%F -) -set RECIPE_DIR=%var% -sh %RECIPE_DIR%/build.sh -if errorlevel 1 exit 1 diff --git a/conda/binutils-or1k-linux/build.sh b/conda/binutils-or1k-linux/build.sh deleted file mode 100755 index faa6aa8e4..000000000 --- a/conda/binutils-or1k-linux/build.sh +++ /dev/null @@ -1,6 +0,0 @@ -patch -p1 < $RECIPE_DIR/../../misc/binutils-2.25.1-or1k-R_PCREL-pcrel_offset.patch -mkdir build -cd build -../configure --target=or1k-linux --prefix=$PREFIX -make -j2 -make install diff --git a/conda/binutils-or1k-linux/meta.yaml b/conda/binutils-or1k-linux/meta.yaml deleted file mode 100644 index d8e8f9e71..000000000 --- a/conda/binutils-or1k-linux/meta.yaml +++ /dev/null @@ -1,20 +0,0 @@ -package: - name: binutils-or1k-linux - version: 2.25.1 - -source: - fn: binutils-2.25.1.tar.bz2 - url: https://ftp.gnu.org/gnu/binutils/binutils-2.25.1.tar.bz2 - sha256: b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22 - -build: - number: 0 - -requirements: - build: - - system # [not win] - -about: - home: https://www.gnu.org/software/binutils/ - license: GPL - summary: 'A set of programming tools for creating and managing binary programs, object files, libraries, profile data, and assembly source code.' diff --git a/conda/chardet/bld.bat b/conda/chardet/bld.bat deleted file mode 100644 index c40a9bbef..000000000 --- a/conda/chardet/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ -"%PYTHON%" setup.py install -if errorlevel 1 exit 1 diff --git a/conda/chardet/build.sh b/conda/chardet/build.sh deleted file mode 100644 index 5a5aeeb48..000000000 --- a/conda/chardet/build.sh +++ /dev/null @@ -1 +0,0 @@ -$PYTHON setup.py install diff --git a/conda/chardet/meta.yaml b/conda/chardet/meta.yaml deleted file mode 100644 index e9b7c795c..000000000 --- a/conda/chardet/meta.yaml +++ /dev/null @@ -1,33 +0,0 @@ -package: - name: chardet - version: 2.2.1 - -source: - fn: chardet-2.2.1.tar.gz - url: https://pypi.python.org/packages/source/c/chardet/chardet-2.2.1.tar.gz - md5: 4a758402eaefd0331bdedc7ecb6f452c - -build: - entry_points: - - chardetect = chardet.chardetect:main - number: 0 - -requirements: - build: - - python - - setuptools - - run: - - python - -test: - # Python imports - imports: - - chardet - - commands: - - chardetect run_test.py - -about: - home: https://github.com/chardet/chardet - license: GNU Library or Lesser General Public License (LGPL) diff --git a/conda/dateutil/bld.bat b/conda/dateutil/bld.bat deleted file mode 100644 index 39b5e1fee..000000000 --- a/conda/dateutil/bld.bat +++ /dev/null @@ -1 +0,0 @@ -%PYTHON% setup.py install diff --git a/conda/dateutil/build.sh b/conda/dateutil/build.sh deleted file mode 100644 index 5a5aeeb48..000000000 --- a/conda/dateutil/build.sh +++ /dev/null @@ -1 +0,0 @@ -$PYTHON setup.py install diff --git a/conda/dateutil/meta.yaml b/conda/dateutil/meta.yaml deleted file mode 100644 index fd9d40a3e..000000000 --- a/conda/dateutil/meta.yaml +++ /dev/null @@ -1,30 +0,0 @@ -package: - name: dateutil - version: 2.4.2 - -source: - fn: python-dateutil-2.4.2.tar.gz - url: https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.4.2.tar.gz - md5: 4ef68e1c485b09e9f034e10473e5add2 - -build: - number: 0 - -requirements: - build: - - python - - setuptools - - six >=1.5 - run: - - python - - six >=1.5 - -test: - imports: - - dateutil - - dateutil.zoneinfo - -about: - home: https://dateutil.readthedocs.org - license: BSD - summary: 'Extensions to the standard Python datetime module' diff --git a/conda/flterm/build.sh b/conda/flterm/build.sh deleted file mode 100644 index 1121beb65..000000000 --- a/conda/flterm/build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -make -C $SRC_DIR/tools flterm -mkdir -p $PREFIX/bin -cp $SRC_DIR/tools/flterm $PREFIX/bin/ diff --git a/conda/flterm/meta.yaml b/conda/flterm/meta.yaml deleted file mode 100644 index 16afb47cb..000000000 --- a/conda/flterm/meta.yaml +++ /dev/null @@ -1,12 +0,0 @@ -package: - name: flterm - version: 0 - -source: - git_url: https://github.com/m-labs/misoc - git_tag: master - -about: - home: https://github.com/m-labs/misoc/blob/master/tools/flterm.c - license: 3-clause BSD - summary: 'Serial terminal to connect to MiSoC uart.' diff --git a/conda/libgit2/bld.bat b/conda/libgit2/bld.bat deleted file mode 100644 index 268c18cd9..000000000 --- a/conda/libgit2/bld.bat +++ /dev/null @@ -1,20 +0,0 @@ -mkdir build -cd build -REM Configure step -if "%ARCH%"=="32" ( -set CMAKE_GENERATOR=Visual Studio 12 2013 -) else ( -set CMAKE_GENERATOR=Visual Studio 12 2013 Win64 -) -set CMAKE_GENERATOR_TOOLSET=v120_xp -cmake -G "%CMAKE_GENERATOR%" -DCMAKE_INSTALL_PREFIX=%PREFIX% -DSTDCALL=OFF -DCMAKE_PREFIX_PATH=$PREFIX %SRC_DIR% -if errorlevel 1 exit 1 -REM Build step -cmake --build . -if errorlevel 1 exit 1 -REM Install step -cmake --build . --target install -if errorlevel 1 exit 1 -REM Hack to help pygit2 to find libgit2 -mkdir %PREFIX%\Scripts -copy "%PREFIX%\bin\git2.dll" "%PREFIX%\Scripts\" \ No newline at end of file diff --git a/conda/libgit2/build.sh b/conda/libgit2/build.sh deleted file mode 100644 index dc4a85aa0..000000000 --- a/conda/libgit2/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -mkdir build -cd build -cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -make -j2 -make install diff --git a/conda/libgit2/meta.yaml b/conda/libgit2/meta.yaml deleted file mode 100644 index 5741b44b4..000000000 --- a/conda/libgit2/meta.yaml +++ /dev/null @@ -1,27 +0,0 @@ -package: - name: libgit2 - version: 0.22.3 - -source: - git_url: https://github.com/libgit2/libgit2 - git_tag: v0.22.3 - -build: - number: 1 - -requirements: - build: - - system # [linux] - - cmake # [linux] - - openssl - - libssh2 - - zlib - run: - - openssl - - zlib - - libssh2 - -about: - home: https://libgit2.github.com/ - license: GPLv2 with a special Linking Exception - summary: 'libgit2 is a portable, pure C implementation of the Git core methods provided as a re-entrant linkable library with a solid API, allowing you to write native speed custom Git applications in any language with bindings.' diff --git a/conda/libssh2/bld.bat b/conda/libssh2/bld.bat deleted file mode 100644 index ed957bd42..000000000 --- a/conda/libssh2/bld.bat +++ /dev/null @@ -1,17 +0,0 @@ -mkdir build -cd build -REM Configure step -if "%ARCH%"=="32" ( -set CMAKE_GENERATOR=Visual Studio 12 2013 -) else ( -set CMAKE_GENERATOR=Visual Studio 12 2013 Win64 -) -set CMAKE_GENERATOR_TOOLSET=v120_xp -cmake -G "%CMAKE_GENERATOR%" -DCMAKE_INSTALL_PREFIX=%PREFIX% -DOPENSSL_ROOT_DIR=%PREFIX%\Library -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DCMAKE_PREFIX_PATH=$PREFIX %SRC_DIR% -if errorlevel 1 exit 1 -REM Build step -cmake --build . -if errorlevel 1 exit 1 -REM Install step -cmake --build . --target install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/conda/libssh2/build.sh b/conda/libssh2/build.sh deleted file mode 100644 index 773dda78b..000000000 --- a/conda/libssh2/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -mkdir build -cd build -cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DOPENSSL_ROOT_DIR=$PREFIX -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DCMAKE_PREFIX_PATH=$PREFIX -make -j2 -make install diff --git a/conda/libssh2/meta.yaml b/conda/libssh2/meta.yaml deleted file mode 100644 index 28c0f59b6..000000000 --- a/conda/libssh2/meta.yaml +++ /dev/null @@ -1,23 +0,0 @@ -package: - name: libssh2 - version: 1.6.0 - -source: - git_url: https://github.com/libssh2/libssh2 - git_tag: libssh2-1.6.0 - -build: - number: 1 - -requirements: - build: - - system # [linux] - - cmake # [linux] - - openssl - run: - - openssl - -about: - home: http://www.libssh2.org/ - license: BSD - summary: 'libssh2 is a client-side C library implementing the SSH2 protocol' diff --git a/conda/lit/bld.bat b/conda/lit/bld.bat deleted file mode 100644 index c40a9bbef..000000000 --- a/conda/lit/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ -"%PYTHON%" setup.py install -if errorlevel 1 exit 1 diff --git a/conda/lit/build.sh b/conda/lit/build.sh deleted file mode 100644 index 5a5aeeb48..000000000 --- a/conda/lit/build.sh +++ /dev/null @@ -1 +0,0 @@ -$PYTHON setup.py install diff --git a/conda/lit/meta.yaml b/conda/lit/meta.yaml deleted file mode 100644 index 14cf41555..000000000 --- a/conda/lit/meta.yaml +++ /dev/null @@ -1,27 +0,0 @@ -package: - name: lit - version: 0.4.1 - -source: - fn: lit-0.4.1.tar.gz - url: https://pypi.python.org/packages/source/l/lit/lit-0.4.1.tar.gz - md5: ea6f00470e1bf7ed9e4edcff0f650fe6 - -build: - number: 0 - -requirements: - build: - - python - - setuptools - - run: - - python - -test: - commands: - - lit --version - -about: - home: http://llvm.org/docs/CommandGuide/lit.html - license: MIT diff --git a/conda/llvmdev-or1k/bld.bat b/conda/llvmdev-or1k/bld.bat deleted file mode 100644 index 654b44d64..000000000 --- a/conda/llvmdev-or1k/bld.bat +++ /dev/null @@ -1,25 +0,0 @@ -mkdir build -cd build -set BUILD_CONFIG=Release -REM Configure step -if "%ARCH%"=="32" ( -set CMAKE_GENERATOR=Visual Studio 12 2013 -) else ( -set CMAKE_GENERATOR=Visual Studio 12 2013 Win64 -) -set CMAKE_GENERATOR_TOOLSET=v120_xp -@rem Reduce build times and package size by removing unused stuff -set CMAKE_CUSTOM=-DLLVM_TARGETS_TO_BUILD="OR1K;X86" -DLLVM_INCLUDE_TESTS=OFF ^ --DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF ^ --DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF ^ --DLLVM_ENABLE_ASSERTIONS=ON -cmake -G "%CMAKE_GENERATOR%" -T "%CMAKE_GENERATOR_TOOLSET%" ^ --DCMAKE_BUILD_TYPE="%BUILD_CONFIG%" -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ --DCMAKE_INSTALL_PREFIX:PATH=%LIBRARY_PREFIX% %CMAKE_CUSTOM% %SRC_DIR% -if errorlevel 1 exit 1 -REM Build step -cmake --build . --config "%BUILD_CONFIG%" -if errorlevel 1 exit 1 -REM Install step -cmake --build . --config "%BUILD_CONFIG%" --target install -if errorlevel 1 exit 1 diff --git a/conda/llvmdev-or1k/build.sh b/conda/llvmdev-or1k/build.sh deleted file mode 100644 index 391f592cc..000000000 --- a/conda/llvmdev-or1k/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -cd tools -git clone https://github.com/openrisc/clang-or1k clang -cd .. -mkdir build -cd build -cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DLLVM_TARGETS_TO_BUILD="OR1K;X86" -DCMAKE_BUILD_TYPE=Rel -DLLVM_ENABLE_ASSERTIONS=ON -make -j2 -make install diff --git a/conda/llvmdev-or1k/meta.yaml b/conda/llvmdev-or1k/meta.yaml deleted file mode 100644 index 09ca7046a..000000000 --- a/conda/llvmdev-or1k/meta.yaml +++ /dev/null @@ -1,22 +0,0 @@ -package: - name: llvmdev-or1k - version: "3.5.0" - -source: - git_url: https://github.com/openrisc/llvm-or1k - git_tag: master - -build: - number: 5 - -requirements: - build: - - system [linux] - - cmake [linux] - run: - - system [linux] - -about: - home: http://llvm.org/ - license: Open Source (http://llvm.org/releases/3.5.0/LICENSE.TXT) - summary: Development headers and libraries for LLVM diff --git a/conda/llvmlite-artiq/bld.bat b/conda/llvmlite-artiq/bld.bat deleted file mode 100644 index 8b58512c1..000000000 --- a/conda/llvmlite-artiq/bld.bat +++ /dev/null @@ -1,8 +0,0 @@ -@rem Let CMake know about the LLVM install path, for find_package() -set CMAKE_PREFIX_PATH=%LIBRARY_PREFIX% - -@rem Ensure there are no build leftovers (CMake can complain) -if exist ffi\build rmdir /S /Q ffi\build - -%PYTHON% setup.py install -if errorlevel 1 exit 1 diff --git a/conda/llvmlite-artiq/build.sh b/conda/llvmlite-artiq/build.sh deleted file mode 100755 index 8e25a1455..000000000 --- a/conda/llvmlite-artiq/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -$PYTHON setup.py install diff --git a/conda/llvmlite-artiq/meta.yaml b/conda/llvmlite-artiq/meta.yaml deleted file mode 100644 index 45c964b0f..000000000 --- a/conda/llvmlite-artiq/meta.yaml +++ /dev/null @@ -1,27 +0,0 @@ -package: - name: llvmlite-artiq - version: "0.5.1" - -source: - git_url: https://github.com/m-labs/llvmlite - git_tag: artiq - -requirements: - build: - - python - - llvmdev-or1k - - setuptools - run: - - python - -build: - number: 5 - -test: - imports: - - llvmlite_artiq - - llvmlite_artiq.binding - -about: - home: https://pypi.python.org/pypi/llvmlite/ - license: BSD diff --git a/conda/prettytable/bld.bat b/conda/prettytable/bld.bat deleted file mode 100644 index 87b1481d7..000000000 --- a/conda/prettytable/bld.bat +++ /dev/null @@ -1,8 +0,0 @@ -"%PYTHON%" setup.py install -if errorlevel 1 exit 1 - -:: Add more build steps here, if they are necessary. - -:: See -:: http://docs.continuum.io/conda/build.html -:: for a list of environment variables that are set during the build process. diff --git a/conda/prettytable/build.sh b/conda/prettytable/build.sh deleted file mode 100644 index 8e25a1455..000000000 --- a/conda/prettytable/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -$PYTHON setup.py install diff --git a/conda/prettytable/meta.yaml b/conda/prettytable/meta.yaml deleted file mode 100644 index ca359db92..000000000 --- a/conda/prettytable/meta.yaml +++ /dev/null @@ -1,26 +0,0 @@ -package: - name: prettytable - version: !!str 0.7.2 - -source: - fn: prettytable-0.7.2.tar.bz2 - url: https://pypi.python.org/packages/source/P/PrettyTable/prettytable-0.7.2.tar.bz2 - md5: 760dc900590ac3c46736167e09fa463a - -requirements: - build: - - python - - setuptools - - run: - - python - -test: - imports: - - prettytable - - -about: - home: http://code.google.com/p/prettytable/ - license: BSD License - summary: 'A simple Python library for easily displaying tabular data in a visually appealing ASCII table format.' diff --git a/conda/pydaqmx/bld.bat b/conda/pydaqmx/bld.bat deleted file mode 100644 index add2c3c60..000000000 --- a/conda/pydaqmx/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ -"%PYTHON%" setup.py build -"%PYTHON%" setup.py install diff --git a/conda/pydaqmx/build.sh b/conda/pydaqmx/build.sh deleted file mode 100644 index f1d91245e..000000000 --- a/conda/pydaqmx/build.sh +++ /dev/null @@ -1,2 +0,0 @@ -$PYTHON setup.py build -$PYTHON setup.py install diff --git a/conda/pydaqmx/meta.yaml b/conda/pydaqmx/meta.yaml deleted file mode 100644 index 36f4636f9..000000000 --- a/conda/pydaqmx/meta.yaml +++ /dev/null @@ -1,22 +0,0 @@ -package: - name: pydaqmx - version: "1.3.1" - -source: - git_url: https://github.com/clade/pydaqmx - git_tag: master - -build: - number: 0 - -requirements: - build: - - python - - setuptools - run: - - python - -about: - home: http://pythonhosted.org/PyDAQmx/ - license: BSD - summary: PyDAQmx allows users to use data acquisition hardware from National Instruments with Python. It provides an interface between the NIDAQmx driver and Python. The package works on Windows and Linux.' diff --git a/conda/pyelftools/bld.bat b/conda/pyelftools/bld.bat deleted file mode 100644 index 39b5e1fee..000000000 --- a/conda/pyelftools/bld.bat +++ /dev/null @@ -1 +0,0 @@ -%PYTHON% setup.py install diff --git a/conda/pyelftools/build.sh b/conda/pyelftools/build.sh deleted file mode 100644 index 5a5aeeb48..000000000 --- a/conda/pyelftools/build.sh +++ /dev/null @@ -1 +0,0 @@ -$PYTHON setup.py install diff --git a/conda/pyelftools/meta.yaml b/conda/pyelftools/meta.yaml deleted file mode 100644 index f65b271dd..000000000 --- a/conda/pyelftools/meta.yaml +++ /dev/null @@ -1,26 +0,0 @@ -package: - name: pyelftools - version: 0.23 - -source: - git_url: https://github.com/eliben/pyelftools.git - git_tag: v0.23 - -build: - number: 0 - -requirements: - build: - - python - - setuptools - run: - - python - -test: - imports: - - elftools - -about: - home: https://github.com/eliben/pyelftools.git - license: Public domain - summary: 'Library for analyzing ELF files and DWARF debugging information' diff --git a/conda/pygit2/bld.bat b/conda/pygit2/bld.bat deleted file mode 100644 index 0b9010888..000000000 --- a/conda/pygit2/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ -set LIBGIT2=%PREFIX% -set VS100COMNTOOLS=%VS120COMNTOOLS% -%PYTHON% setup.py install \ No newline at end of file diff --git a/conda/pygit2/build.sh b/conda/pygit2/build.sh deleted file mode 100644 index 833768d01..000000000 --- a/conda/pygit2/build.sh +++ /dev/null @@ -1,2 +0,0 @@ -export LIBGIT2=$PREFIX -$PYTHON setup.py install diff --git a/conda/pygit2/meta.yaml b/conda/pygit2/meta.yaml deleted file mode 100644 index fcc222f29..000000000 --- a/conda/pygit2/meta.yaml +++ /dev/null @@ -1,28 +0,0 @@ -package: - name: pygit2 - version: 0.22.1 - -source: - git_url: https://github.com/libgit2/pygit2 - git_tag: v0.22.1 - -build: - number: 1 - -requirements: - build: - - system # [linux] - - python - - libgit2 - - cffi >=0.8.1 - - pkgconfig # [linux] - run: - - system # [linux] - - python - - libgit2 - - cffi >=0.8.1 - -about: - home: http://www.pygit2.org/ - license: GPLv2 with a special Linking Exception - summary: 'Pygit2 is a set of Python bindings to the libgit2 shared library, libgit2 implements the core of Git.' diff --git a/conda/pyqtgraph/bld.bat b/conda/pyqtgraph/bld.bat deleted file mode 100644 index c40a9bbef..000000000 --- a/conda/pyqtgraph/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ -"%PYTHON%" setup.py install -if errorlevel 1 exit 1 diff --git a/conda/pyqtgraph/build.sh b/conda/pyqtgraph/build.sh deleted file mode 100644 index 8e25a1455..000000000 --- a/conda/pyqtgraph/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -$PYTHON setup.py install diff --git a/conda/pyqtgraph/meta.yaml b/conda/pyqtgraph/meta.yaml deleted file mode 100644 index f060acf0b..000000000 --- a/conda/pyqtgraph/meta.yaml +++ /dev/null @@ -1,27 +0,0 @@ -package: - name: pyqtgraph - version: 0.9.10.1036edf - -source: - git_url: https://github.com/pyqtgraph/pyqtgraph.git - git_rev: 1036edf - -requirements: - build: - - python - - setuptools - - numpy - - run: - - python - - numpy - - pyqt >=4.7 - -test: - imports: - - pyqtgraph - -about: - home: http://www.pyqtgraph.org - license: MIT License - summary: 'Scientific Graphics and GUI Library for Python' diff --git a/conda/pythonparser/bld.bat b/conda/pythonparser/bld.bat deleted file mode 100644 index c8c1ee0d1..000000000 --- a/conda/pythonparser/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ -pip install regex -%PYTHON% setup.py install diff --git a/conda/pythonparser/build.sh b/conda/pythonparser/build.sh deleted file mode 100644 index 1e07e90fb..000000000 --- a/conda/pythonparser/build.sh +++ /dev/null @@ -1,2 +0,0 @@ -pip install regex -$PYTHON setup.py install diff --git a/conda/pythonparser/meta.yaml b/conda/pythonparser/meta.yaml deleted file mode 100644 index 6ef508192..000000000 --- a/conda/pythonparser/meta.yaml +++ /dev/null @@ -1,24 +0,0 @@ -package: - name: pythonparser - version: 0.0 - -source: - git_url: https://github.com/m-labs/pythonparser - git_tag: master - -build: - number: 0 - -requirements: - build: - - python - - setuptools - -test: - imports: - - pythonparser - -about: - home: http://m-labs.hk/pythonparser/ - license: BSD - summary: 'PythonParser is a Python parser written specifically for use in tooling. It parses source code into an AST that is a superset of Python’s built-in ast module, but returns precise location information for every token.' diff --git a/conda/quamash/bld.bat b/conda/quamash/bld.bat deleted file mode 100644 index 39b5e1fee..000000000 --- a/conda/quamash/bld.bat +++ /dev/null @@ -1 +0,0 @@ -%PYTHON% setup.py install diff --git a/conda/quamash/build.sh b/conda/quamash/build.sh deleted file mode 100644 index 8e25a1455..000000000 --- a/conda/quamash/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -$PYTHON setup.py install diff --git a/conda/quamash/meta.yaml b/conda/quamash/meta.yaml deleted file mode 100644 index 724e9b674..000000000 --- a/conda/quamash/meta.yaml +++ /dev/null @@ -1,29 +0,0 @@ -package: - name: quamash - version: 0.5.1 - -source: - fn: Quamash-0.5.1.tar.gz - url: https://pypi.python.org/packages/source/Q/Quamash/Quamash-0.5.1.tar.gz#md5=c5fa317f615eafd492560771bc2caeca - md5: c5fa317f615eafd492560771bc2caeca - -build: - number: 0 - -requirements: - build: - - python - - setuptools - - pyqt 4.* - run: - - python - - pyqt 4.* - -test: - imports: - - quamash - -about: - home: https://github.com/harvimt/quamash - license: BSD - summary: 'Implementation of the PEP 3156 Event-Loop with Qt' diff --git a/conda/sphinx-argparse/bld.bat b/conda/sphinx-argparse/bld.bat deleted file mode 100644 index 39b5e1fee..000000000 --- a/conda/sphinx-argparse/bld.bat +++ /dev/null @@ -1 +0,0 @@ -%PYTHON% setup.py install diff --git a/conda/sphinx-argparse/build.sh b/conda/sphinx-argparse/build.sh deleted file mode 100644 index 5a5aeeb48..000000000 --- a/conda/sphinx-argparse/build.sh +++ /dev/null @@ -1 +0,0 @@ -$PYTHON setup.py install diff --git a/conda/sphinx-argparse/meta.yaml b/conda/sphinx-argparse/meta.yaml deleted file mode 100644 index 6ead92292..000000000 --- a/conda/sphinx-argparse/meta.yaml +++ /dev/null @@ -1,28 +0,0 @@ -package: - name: sphinx-argparse - version: 0.1.13 - -source: - fn: sphinx-argparse-0.1.13.tar.gz - url: https://pypi.python.org/packages/source/s/sphinx-argparse/sphinx-argparse-0.1.13.tar.gz - md5: 5ec84e75e1c4b2ae7ca5fb92a6abd738 - -build: - number: 0 - -requirements: - build: - - python - - setuptools - - sphinx - run: - - python - - sphinx - -test: - imports: - - sphinxarg - -about: - license: MIT - summary: 'Sphinx extension that automatically documents argparse commands and options' diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst index 8cb1727a2..6d2498121 100644 --- a/doc/manual/installing.rst +++ b/doc/manual/installing.rst @@ -13,12 +13,12 @@ Installing using conda Installing Anaconda or Miniconda ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -* You can either install Anaconda (chose Python 3.5) from https://store.continuum.io/cshop/anaconda/ +* You can either install Anaconda (choose Python 3.5) from https://store.continuum.io/cshop/anaconda/ -* Or install the more minimalistic Miniconda (chose Python 3.5) from http://conda.pydata.org/miniconda.html +* Or install the more minimalistic Miniconda (choose Python 3.5) from http://conda.pydata.org/miniconda.html .. warning:: - If you are installing on Windows, chose the Windows 32-bit version regardless of whether you have + If you are installing on Windows, choose the Windows 32-bit version regardless of whether you have a 32-bit or 64-bit Windows. After installing either Anaconda or Miniconda, open a new terminal and make sure the following command works:: @@ -40,6 +40,7 @@ Installing the host side software For this, you need to add our binstar repository to your conda configuration:: + $ conda config --add channels http://conda.anaconda.org/m-labs/channel/main $ conda config --add channels http://conda.anaconda.org/m-labs/channel/dev Then you can install the ARTIQ package, it will pull all the necessary dependencies::