From 123900fdbbf85d9713d2045a10e71367f89239ed Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 7 Sep 2017 14:20:30 +0200 Subject: [PATCH] conda's not Python specific --- tests/conda/requirements/README.rst | 24 ++++++++++++------------ tests/conda/requirements/verify | 4 ++-- tests/conda/simple/README.rst | 6 +++--- tests/conda/simple/verify | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/conda/requirements/README.rst b/tests/conda/requirements/README.rst index afb58840..b8121f20 100644 --- a/tests/conda/requirements/README.rst +++ b/tests/conda/requirements/README.rst @@ -1,12 +1,12 @@ -Python - Mixed Requirements ---------------------------- - -An ``environment.yml`` takes precedence over ``requirements.txt``. -To install files into a conda environment with pip, use the ``pip`` key in ``environment.yml``: - -.. sourcecode:: yaml - - dependencies: - - numpy - - pip: - - tornado +Conda - Mixed Requirements +-------------------------- + +An ``environment.yml`` takes precedence over ``requirements.txt``. +To install Python packages into a conda environment with pip, use the ``pip`` key in ``environment.yml``: + +.. sourcecode:: yaml + + dependencies: + - numpy + - pip: + - tornado diff --git a/tests/conda/requirements/verify b/tests/conda/requirements/verify index 8f344fdc..09dcf196 100755 --- a/tests/conda/requirements/verify +++ b/tests/conda/requirements/verify @@ -1,12 +1,12 @@ #!/usr/bin/env python import sys -assert sys.version_info[:2] == (3, 6) +assert sys.version_info[:2] == (3, 6), sys.version import numpy try: import there except ImportError: - print('ok') + pass else: raise Exception("'there' shouldn't have been installed from requirements.txt") diff --git a/tests/conda/simple/README.rst b/tests/conda/simple/README.rst index 72b752ad..51084708 100644 --- a/tests/conda/simple/README.rst +++ b/tests/conda/simple/README.rst @@ -1,5 +1,5 @@ -Python - Conda Environment --------------------------- +Conda Environment +----------------- Conda environments files may allow for more complex builds and dependencies. You -can specify them in the standard YAML structure. +can specify them in the standard `environment.yml` files. diff --git a/tests/conda/simple/verify b/tests/conda/simple/verify index 4ad54bfd..2269714c 100755 --- a/tests/conda/simple/verify +++ b/tests/conda/simple/verify @@ -1,6 +1,6 @@ #!/usr/bin/env python import sys -assert sys.version_info[:2] == (3, 6) +assert sys.version_info[:2] == (3, 6), sys.version import numpy