From b9fd0ca09d2f16a2037eb28f1be7062d8a5e6677 Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Sun, 2 Feb 2020 11:09:57 +0100 Subject: [PATCH 01/16] Disable updating conda to prevent solving environment --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 68f588c..1336136 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,13 +15,12 @@ install: - hash -r - conda config --set always_yes yes --set changeps1 no - conda config --append channels conda-forge - - conda update -q conda # Useful for debugging any issues with conda - conda info -a - conda env create -f ./environment.yml - source activate test-environment - - python setup.py install + - pip install .[fancy_progressbar,doc] script: - "coverage run --rcfile=coverage.ini -m pytest" From 5a91361977f88321841da3808fd31aaff73cf68e Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Mon, 3 Feb 2020 12:48:54 +0100 Subject: [PATCH 02/16] Update .readthedocs.yml --- .readthedocs.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index a53add7..431f7fb 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,8 +1,15 @@ version: 2 + conda: - environment: environment.yml + file: environment.yml + +sphinx: + configuration: doc/source/conf.py + python: - version: 3 install: - method: pip path: . + extra_requirements: + - doc + - fancy_progressbar From 0095dd9613d9ccf961b6ea4536a151bc3d5faf36 Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Mon, 3 Feb 2020 12:49:53 +0100 Subject: [PATCH 03/16] Fix environment setting --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 431f7fb..20021fd 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,7 +1,7 @@ version: 2 conda: - file: environment.yml + environment: environment.yml sphinx: configuration: doc/source/conf.py From b2667ab49cc33eaf6eb875b7df79ef26001862ae Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Mon, 3 Feb 2020 17:55:44 +0100 Subject: [PATCH 04/16] Remove unnecessary conf.py pointer --- .readthedocs.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 20021fd..16ce582 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -3,9 +3,6 @@ version: 2 conda: environment: environment.yml -sphinx: - configuration: doc/source/conf.py - python: install: - method: pip From 38a3d2b9cb35d0b96229ceb88920944c8b57d159 Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Mon, 3 Feb 2020 18:55:56 +0100 Subject: [PATCH 05/16] Allow access to system packages --- .readthedocs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index 16ce582..493d10b 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -4,6 +4,7 @@ conda: environment: environment.yml python: + system_packages: true install: - method: pip path: . From cf1c79df1eb13e316cad13b7d1d956f34dbe44d7 Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Mon, 3 Feb 2020 19:02:42 +0100 Subject: [PATCH 06/16] Remove conda due to large memory consumption --- .readthedocs.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 493d10b..6f10fde 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,8 +1,5 @@ version: 2 -conda: - environment: environment.yml - python: system_packages: true install: From c31431e29b05e8ba86499e9469f4c03ccd0b81ff Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Tue, 4 Feb 2020 14:57:07 +0100 Subject: [PATCH 07/16] Doesn't work w/o conda Qutip imports cython when installing, cython can only be installed at the same time as qutip. --- .readthedocs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index 6f10fde..7deb429 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,5 +1,8 @@ version: 2 +conda: + environment: environment.yml + python: system_packages: true install: From f06c17875fcce1fc76b2cc0ba7a52916497e1a76 Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Tue, 25 Feb 2020 19:02:16 +0100 Subject: [PATCH 08/16] Use only conda-forge for build env --- environment.yml | 155 ++++++++++++++++++++++-------------------------- 1 file changed, 72 insertions(+), 83 deletions(-) diff --git a/environment.yml b/environment.yml index 375fc5b..ec38760 100644 --- a/environment.yml +++ b/environment.yml @@ -1,150 +1,139 @@ name: test-environment channels: - conda-forge - - defaults dependencies: - _libgcc_mutex=0.1=conda_forge - - _openmp_mutex=4.5=0_gnu + - _openmp_mutex=4.5=1_llvm - alabaster=0.7.12=py_0 - - atomicwrites=1.3.0=py_0 - attrs=19.3.0=py_0 - babel=2.8.0=py_0 - backcall=0.1.0=py_0 - - bleach=3.1.0=py_0 + - bleach=3.1.1=py_0 - ca-certificates=2019.11.28=hecc5488_0 - - certifi=2019.11.28=py37_0 - - cffi=1.13.2=py37h8022711_0 - - chardet=3.0.4=py37_1003 - - coverage=5.0.3=py37h516909a_0 - - coveralls=1.10.0=py_0 - - cryptography=2.8=py37h72c5cf5_1 + - certifi=2019.11.28=py38_0 + - cffi=1.13.2=py38h8022711_0 + - chardet=3.0.4=py38_1003 + - cryptography=2.8=py38h72c5cf5_1 - cycler=0.10.0=py_2 - - cython=0.29.14=py37he1b5a44_0 + - cython=0.29.15=py38he1b5a44_0 - dbus=1.13.6=he372182_0 - decorator=4.4.1=py_0 - defusedxml=0.6.0=py_0 - - docopt=0.6.2=py_1 - - docutils=0.16=py37_0 - - entrypoints=0.3=py37_1000 - - expat=2.2.5=he1b5a44_1004 + - docutils=0.16=py38_0 + - entrypoints=0.3=py38_1000 + - expat=2.2.9=he1b5a44_2 - fontconfig=2.13.1=h86ecdb6_1001 - freetype=2.10.0=he983fc9_1 - gettext=0.19.8.1=hc5be6a0_1002 - - glib=2.58.3=py37h6f030ca_1002 - - gst-plugins-base=1.14.5=h0935bb2_0 - - gstreamer=1.14.5=h36ae1b5_0 + - glib=2.58.3=py38h6f030ca_1002 + - gst-plugins-base=1.14.5=h0935bb2_2 + - gstreamer=1.14.5=h36ae1b5_2 - icu=64.2=he1b5a44_1 - - idna=2.8=py37_1000 + - idna=2.9=py_1 - imagesize=1.2.0=py_0 - - importlib_metadata=1.4.0=py37_0 - - ipykernel=5.1.3=py37h5ca1d4c_0 - - ipython=7.11.1=py37h5ca1d4c_0 + - importlib_metadata=1.5.0=py38_0 + - ipykernel=5.1.4=py38h5ca1d4c_0 + - ipython=7.12.0=py38h5ca1d4c_0 - ipython_genutils=0.2.0=py_1 - - jedi=0.15.2=py37_0 - - jinja2=2.10.3=py_0 + - jedi=0.16.0=py38_0 + - jinja2=2.11.1=py_0 - jpeg=9c=h14c3975_1001 - - jsonschema=3.2.0=py37_0 - - jupyter_client=5.3.4=py37_1 - - jupyter_core=4.6.1=py37_0 - - kiwisolver=1.1.0=py37hc9558a2_0 - - ld_impl_linux-64=2.33.1=h53a641e_7 - - libblas=3.8.0=14_openblas - - libcblas=3.8.0=14_openblas + - jsonschema=3.2.0=py38_0 + - jupyter_client=6.0.0=py_0 + - jupyter_core=4.6.3=py38_0 + - kiwisolver=1.1.0=py38hc9558a2_0 + - ld_impl_linux-64=2.33.1=h53a641e_8 + - libblas=3.8.0=15_openblas + - libcblas=3.8.0=15_openblas - libclang=9.0.1=default_hde54327_0 - libffi=3.2.1=he1b5a44_1006 - libgcc-ng=9.2.0=h24d8f2e_2 - - libgfortran-ng=7.3.0=hdf63c60_4 - - libgomp=9.2.0=h24d8f2e_2 + - libgfortran-ng=7.3.0=hdf63c60_5 - libiconv=1.15=h516909a_1005 - - liblapack=3.8.0=14_openblas + - liblapack=3.8.0=15_openblas - libllvm8=8.0.1=hc9558a2_0 - libllvm9=9.0.1=hc9558a2_0 - - libopenblas=0.3.7=h5ec1e0e_6 + - libopenblas=0.3.8=h5ec1e0e_0 - libpng=1.6.37=hed695b0_0 - libsodium=1.0.17=h516909a_0 - libstdcxx-ng=9.2.0=hdf63c60_2 - libuuid=2.32.1=h14c3975_1000 - libxcb=1.13=h14c3975_1002 - - libxkbcommon=0.9.1=hebb1f50_0 + - libxkbcommon=0.10.0=he1b5a44_0 - libxml2=2.9.10=hee79883_0 - - llvmlite=0.31.0=py37h8b12597_0 - - markupsafe=1.1.1=py37h516909a_0 - - matplotlib=3.1.2=py37_1 - - matplotlib-base=3.1.2=py37h250f245_1 - - mistune=0.8.4=py37h516909a_1000 - - more-itertools=8.1.0=py_0 - - nbconvert=5.6.1=py37_0 - - nbformat=5.0.3=py_0 - - nbsphinx=0.5.0=py_0 + - llvm-openmp=9.0.1=hc9558a2_2 + - llvmlite=0.31.0=py38h8b12597_0 + - markupsafe=1.1.1=py38h516909a_0 + - matplotlib=3.1.3=py38_0 + - matplotlib-base=3.1.3=py38h250f245_0 + - mistune=0.8.4=py38h516909a_1000 + - nbconvert=5.6.1=py38_0 + - nbformat=5.0.4=py_0 + - nbsphinx=0.5.1=py_0 - ncurses=6.1=hf484d3e_1002 - - nspr=4.24=he1b5a44_0 + - nspr=4.25=he1b5a44_0 - nss=3.47=he751ad9_0 - - numba=0.47.0=py37hb3f55d8_0 - - numpy=1.17.5=py37h95a1406_0 + - numba=0.48.0=py38hb3f55d8_0 + - numpy=1.18.1=py38h95a1406_0 - numpydoc=0.9.2=py_0 - openssl=1.1.1d=h516909a_0 - opt_einsum=3.1.0=py_0 - - packaging=20.0=py_0 - - pandoc=2.9.1.1=0 + - packaging=20.1=py_0 + - pandoc=2.9.2=0 - pandocfilters=1.4.2=py_1 - - parso=0.5.2=py_0 - - pcre=8.43=he1b5a44_0 - - pexpect=4.7.0=py37_0 - - pickleshare=0.7.5=py37_1000 - - pip=19.3.1=py37_0 - - pluggy=0.13.0=py37_0 - - prompt_toolkit=3.0.2=py_0 + - parso=0.6.1=py_0 + - pcre=8.44=he1b5a44_0 + - pexpect=4.8.0=py38_0 + - pickleshare=0.7.5=py38_1000 + - pip=20.0.2=py_2 + - prompt_toolkit=3.0.3=py_0 - pthread-stubs=0.4=h14c3975_1001 - ptyprocess=0.6.0=py_1001 - - py=1.8.1=py_0 - - pycparser=2.19=py37_1 + - pycparser=2.19=py_2 - pygments=2.5.2=py_0 - - pyopenssl=19.1.0=py37_0 + - pyopenssl=19.1.0=py_1 - pyparsing=2.4.6=py_0 - - pyqt=5.12.3=py37hcca6a23_1 - - pyrsistent=0.15.7=py37h516909a_0 - - pysocks=1.7.1=py37_0 - - pytest=5.0.1=py37_0 - - python=3.7.6=h357f687_2 + - pyqt=5.12.3=py38hcca6a23_1 + - pyrsistent=0.15.7=py38h516909a_0 + - pysocks=1.7.1=py38_0 + - python=3.8.1=h357f687_2 - python-dateutil=2.8.1=py_0 - pytz=2019.3=py_0 - - pyyaml=5.3=py37h516909a_0 - - pyzmq=18.1.1=py37h1768529_0 + - pyzmq=19.0.0=py38h1768529_0 - qt=5.12.5=hd8c4c69_1 - - qutip=4.4.1=py37h9de70de_0 + - qutip=4.5.0=py38h9de70de_0 - readline=8.0=hf8c457e_0 - - requests=2.22.0=py37_1 - - scipy=1.4.1=py37h921218d_0 - - setuptools=45.1.0=py37_0 - - six=1.14.0=py37_0 + - requests=2.23.0=py38_0 + - scipy=1.4.1=py38h921218d_0 + - setuptools=45.2.0=py38_0 + - six=1.14.0=py38_0 - snowballstemmer=2.0.0=py_0 - - sparse=0.8.0=py_0 - - sphinx=2.3.1=py_0 + - sparse=0.9.1=py_0 + - sphinx=2.4.3=py_0 - sphinx_rtd_theme=0.4.3=py_0 - sphinxcontrib-applehelp=1.0.1=py_0 - sphinxcontrib-devhelp=1.0.1=py_0 - - sphinxcontrib-htmlhelp=1.0.2=py_0 + - sphinxcontrib-htmlhelp=1.0.3=py_0 - sphinxcontrib-jsmath=1.0.1=py_0 - sphinxcontrib-qthelp=1.0.2=py_0 - sphinxcontrib-serializinghtml=1.1.3=py_0 - sqlite=3.30.1=hcee41ef_0 - testpath=0.4.4=py_0 - tk=8.6.10=hed695b0_0 - - tornado=6.0.3=py37h516909a_0 - - tqdm=4.41.1=py_0 - - traitlets=4.3.3=py37_0 - - urllib3=1.25.7=py37_0 + - tornado=6.0.3=py38h516909a_4 + - tqdm=4.43.0=py_0 + - traitlets=4.3.3=py38_0 + - urllib3=1.25.7=py38_0 - wcwidth=0.1.8=py_0 - webencodings=0.5.1=py_1 - - wheel=0.33.6=py37_0 + - wheel=0.34.2=py_1 - xorg-libxau=1.0.9=h14c3975_0 - xorg-libxdmcp=1.1.3=h516909a_0 - xz=5.2.4=h14c3975_1001 - - yaml=0.2.2=h516909a_1 - zeromq=4.3.2=he1b5a44_2 - - zipp=2.0.0=py_0 + - zipp=3.0.0=py_0 - zlib=1.2.11=h516909a_1006 - pip: - pyqt5-sip==4.19.18 - pyqtwebengine==5.12.1 - +prefix: /home/docs/.conda/envs/test-environment From b4ed2d94ef7f86e912f939980c3df9c5e1beb03b Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Wed, 26 Feb 2020 13:37:19 +0000 Subject: [PATCH 09/16] Only use conda env for qutip, get the rest via pip --- environment.yml | 107 +----------------------------------------------- 1 file changed, 2 insertions(+), 105 deletions(-) diff --git a/environment.yml b/environment.yml index ec38760..b1085e4 100644 --- a/environment.yml +++ b/environment.yml @@ -1,139 +1,36 @@ name: test-environment channels: - conda-forge + - defaults dependencies: - _libgcc_mutex=0.1=conda_forge - _openmp_mutex=4.5=1_llvm - - alabaster=0.7.12=py_0 - - attrs=19.3.0=py_0 - - babel=2.8.0=py_0 - - backcall=0.1.0=py_0 - - bleach=3.1.1=py_0 - ca-certificates=2019.11.28=hecc5488_0 - certifi=2019.11.28=py38_0 - - cffi=1.13.2=py38h8022711_0 - - chardet=3.0.4=py38_1003 - - cryptography=2.8=py38h72c5cf5_1 - - cycler=0.10.0=py_2 - cython=0.29.15=py38he1b5a44_0 - - dbus=1.13.6=he372182_0 - - decorator=4.4.1=py_0 - - defusedxml=0.6.0=py_0 - - docutils=0.16=py38_0 - - entrypoints=0.3=py38_1000 - - expat=2.2.9=he1b5a44_2 - - fontconfig=2.13.1=h86ecdb6_1001 - - freetype=2.10.0=he983fc9_1 - - gettext=0.19.8.1=hc5be6a0_1002 - - glib=2.58.3=py38h6f030ca_1002 - - gst-plugins-base=1.14.5=h0935bb2_2 - - gstreamer=1.14.5=h36ae1b5_2 - - icu=64.2=he1b5a44_1 - - idna=2.9=py_1 - - imagesize=1.2.0=py_0 - - importlib_metadata=1.5.0=py38_0 - - ipykernel=5.1.4=py38h5ca1d4c_0 - - ipython=7.12.0=py38h5ca1d4c_0 - - ipython_genutils=0.2.0=py_1 - - jedi=0.16.0=py38_0 - - jinja2=2.11.1=py_0 - - jpeg=9c=h14c3975_1001 - - jsonschema=3.2.0=py38_0 - - jupyter_client=6.0.0=py_0 - - jupyter_core=4.6.3=py38_0 - - kiwisolver=1.1.0=py38hc9558a2_0 - ld_impl_linux-64=2.33.1=h53a641e_8 - libblas=3.8.0=15_openblas - libcblas=3.8.0=15_openblas - - libclang=9.0.1=default_hde54327_0 - libffi=3.2.1=he1b5a44_1006 - libgcc-ng=9.2.0=h24d8f2e_2 - libgfortran-ng=7.3.0=hdf63c60_5 - - libiconv=1.15=h516909a_1005 - liblapack=3.8.0=15_openblas - - libllvm8=8.0.1=hc9558a2_0 - - libllvm9=9.0.1=hc9558a2_0 - libopenblas=0.3.8=h5ec1e0e_0 - - libpng=1.6.37=hed695b0_0 - - libsodium=1.0.17=h516909a_0 - libstdcxx-ng=9.2.0=hdf63c60_2 - - libuuid=2.32.1=h14c3975_1000 - - libxcb=1.13=h14c3975_1002 - - libxkbcommon=0.10.0=he1b5a44_0 - - libxml2=2.9.10=hee79883_0 - llvm-openmp=9.0.1=hc9558a2_2 - - llvmlite=0.31.0=py38h8b12597_0 - - markupsafe=1.1.1=py38h516909a_0 - - matplotlib=3.1.3=py38_0 - - matplotlib-base=3.1.3=py38h250f245_0 - - mistune=0.8.4=py38h516909a_1000 - - nbconvert=5.6.1=py38_0 - - nbformat=5.0.4=py_0 - - nbsphinx=0.5.1=py_0 - ncurses=6.1=hf484d3e_1002 - - nspr=4.25=he1b5a44_0 - - nss=3.47=he751ad9_0 - - numba=0.48.0=py38hb3f55d8_0 - numpy=1.18.1=py38h95a1406_0 - - numpydoc=0.9.2=py_0 - openssl=1.1.1d=h516909a_0 - - opt_einsum=3.1.0=py_0 - - packaging=20.1=py_0 - - pandoc=2.9.2=0 - - pandocfilters=1.4.2=py_1 - - parso=0.6.1=py_0 - - pcre=8.44=he1b5a44_0 - - pexpect=4.8.0=py38_0 - - pickleshare=0.7.5=py38_1000 - pip=20.0.2=py_2 - - prompt_toolkit=3.0.3=py_0 - - pthread-stubs=0.4=h14c3975_1001 - - ptyprocess=0.6.0=py_1001 - - pycparser=2.19=py_2 - - pygments=2.5.2=py_0 - - pyopenssl=19.1.0=py_1 - - pyparsing=2.4.6=py_0 - - pyqt=5.12.3=py38hcca6a23_1 - - pyrsistent=0.15.7=py38h516909a_0 - - pysocks=1.7.1=py38_0 - python=3.8.1=h357f687_2 - - python-dateutil=2.8.1=py_0 - - pytz=2019.3=py_0 - - pyzmq=19.0.0=py38h1768529_0 - - qt=5.12.5=hd8c4c69_1 - qutip=4.5.0=py38h9de70de_0 - readline=8.0=hf8c457e_0 - - requests=2.23.0=py38_0 - scipy=1.4.1=py38h921218d_0 - setuptools=45.2.0=py38_0 - - six=1.14.0=py38_0 - - snowballstemmer=2.0.0=py_0 - - sparse=0.9.1=py_0 - - sphinx=2.4.3=py_0 - - sphinx_rtd_theme=0.4.3=py_0 - - sphinxcontrib-applehelp=1.0.1=py_0 - - sphinxcontrib-devhelp=1.0.1=py_0 - - sphinxcontrib-htmlhelp=1.0.3=py_0 - - sphinxcontrib-jsmath=1.0.1=py_0 - - sphinxcontrib-qthelp=1.0.2=py_0 - - sphinxcontrib-serializinghtml=1.1.3=py_0 - sqlite=3.30.1=hcee41ef_0 - - testpath=0.4.4=py_0 - tk=8.6.10=hed695b0_0 - - tornado=6.0.3=py38h516909a_4 - - tqdm=4.43.0=py_0 - - traitlets=4.3.3=py38_0 - - urllib3=1.25.7=py38_0 - - wcwidth=0.1.8=py_0 - - webencodings=0.5.1=py_1 - wheel=0.34.2=py_1 - - xorg-libxau=1.0.9=h14c3975_0 - - xorg-libxdmcp=1.1.3=h516909a_0 - xz=5.2.4=h14c3975_1001 - - zeromq=4.3.2=he1b5a44_2 - - zipp=3.0.0=py_0 - zlib=1.2.11=h516909a_1006 - - pip: - - pyqt5-sip==4.19.18 - - pyqtwebengine==5.12.1 prefix: /home/docs/.conda/envs/test-environment + From 43a2ee4e875417f6dd322226dd4c3b31e0c62d64 Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Wed, 26 Feb 2020 13:40:49 +0000 Subject: [PATCH 10/16] Remove defaults channel --- environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment.yml b/environment.yml index b1085e4..8e2b7b6 100644 --- a/environment.yml +++ b/environment.yml @@ -1,7 +1,6 @@ name: test-environment channels: - conda-forge - - defaults dependencies: - _libgcc_mutex=0.1=conda_forge - _openmp_mutex=4.5=1_llvm From a3087de4ca8b1df35700fddce7e1fd20938df307 Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Wed, 26 Feb 2020 14:11:28 +0000 Subject: [PATCH 11/16] Try suggestion from readthedocs.org/#6692 --- .readthedocs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index 7deb429..720be39 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,5 +1,8 @@ version: 2 +build: + image: stable + conda: environment: environment.yml From 7a3f6ef92ae552dfe8bd62ad5b942d3802fa563e Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Wed, 26 Feb 2020 14:20:31 +0000 Subject: [PATCH 12/16] Minimal environment without pinned versions --- environment.yml | 38 +++++++------------------------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/environment.yml b/environment.yml index 8e2b7b6..b07179c 100644 --- a/environment.yml +++ b/environment.yml @@ -1,35 +1,11 @@ -name: test-environment +name: filter_functions + channels: - conda-forge + dependencies: - - _libgcc_mutex=0.1=conda_forge - - _openmp_mutex=4.5=1_llvm - - ca-certificates=2019.11.28=hecc5488_0 - - certifi=2019.11.28=py38_0 - - cython=0.29.15=py38he1b5a44_0 - - ld_impl_linux-64=2.33.1=h53a641e_8 - - libblas=3.8.0=15_openblas - - libcblas=3.8.0=15_openblas - - libffi=3.2.1=he1b5a44_1006 - - libgcc-ng=9.2.0=h24d8f2e_2 - - libgfortran-ng=7.3.0=hdf63c60_5 - - liblapack=3.8.0=15_openblas - - libopenblas=0.3.8=h5ec1e0e_0 - - libstdcxx-ng=9.2.0=hdf63c60_2 - - llvm-openmp=9.0.1=hc9558a2_2 - - ncurses=6.1=hf484d3e_1002 - - numpy=1.18.1=py38h95a1406_0 - - openssl=1.1.1d=h516909a_0 - - pip=20.0.2=py_2 - - python=3.8.1=h357f687_2 - - qutip=4.5.0=py38h9de70de_0 - - readline=8.0=hf8c457e_0 - - scipy=1.4.1=py38h921218d_0 - - setuptools=45.2.0=py38_0 - - sqlite=3.30.1=hcee41ef_0 - - tk=8.6.10=hed695b0_0 - - wheel=0.34.2=py_1 - - xz=5.2.4=h14c3975_1001 - - zlib=1.2.11=h516909a_1006 -prefix: /home/docs/.conda/envs/test-environment + - qutip + - pip + +prefix: /home/docs/.conda/envs/filter_functions From 19ed97ad7f682f13eb288b04bedb412ff15f2966 Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Wed, 26 Feb 2020 17:20:57 +0100 Subject: [PATCH 13/16] Update test environment name --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1336136..9d805dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ install: - conda info -a - conda env create -f ./environment.yml - - source activate test-environment + - source activate filter_functions - pip install .[fancy_progressbar,doc] script: From bac97fe512803c9138841644c7cda8b9e9bf4342 Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Wed, 26 Feb 2020 17:25:30 +0100 Subject: [PATCH 14/16] Include coverage & coveralls in test requirements --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e0ba6c5..7b4b5ea 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ def extract_version(version_file): 'jupyter_client', 'sphinx_rtd_theme'] }, test_suite='tests', - tests_require=['pytest'], + tests_require=['pytest', 'coverage', 'coveralls'], classifiers=[ 'Programming Language :: Python :: 3', 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', From 13d835e84258a81b28c08c04826f2a483da6173a Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Wed, 26 Feb 2020 18:01:14 +0100 Subject: [PATCH 15/16] Include installing tests dependencies --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9d805dd..6fcf6cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ install: - conda env create -f ./environment.yml - source activate filter_functions - - pip install .[fancy_progressbar,doc] + - pip install .[fancy_progressbar,doc,tests] script: - "coverage run --rcfile=coverage.ini -m pytest" From f74cbec339747ad3991289d8af2b16f385a03ed3 Mon Sep 17 00:00:00 2001 From: Tobias Hangleiter Date: Thu, 27 Feb 2020 16:33:22 +0100 Subject: [PATCH 16/16] Move test suite requirements to extra --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 7b4b5ea..58fa871 100644 --- a/setup.py +++ b/setup.py @@ -39,10 +39,10 @@ def extract_version(version_file): extras_require={ 'fancy_progressbar': ['tqdm', 'requests'], 'doc': ['ipython', 'ipykernel', 'nbsphinx', 'numpydoc', 'sphinx', - 'jupyter_client', 'sphinx_rtd_theme'] + 'jupyter_client', 'sphinx_rtd_theme'], + 'tests': ['pytest', 'coverage', 'coveralls'], }, test_suite='tests', - tests_require=['pytest', 'coverage', 'coveralls'], classifiers=[ 'Programming Language :: Python :: 3', 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',