Skip to content

Commit 33aefd3

Browse files
authored
Hotfix/readthedocs (#10)
Fix #9.
1 parent b7b1171 commit 33aefd3

File tree

4 files changed

+20
-152
lines changed

4 files changed

+20
-152
lines changed

.readthedocs.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
version: 2
2+
3+
build:
4+
image: stable
5+
26
conda:
37
environment: environment.yml
8+
49
python:
5-
version: 3
10+
system_packages: true
611
install:
712
- method: pip
813
path: .
14+
extra_requirements:
15+
- doc
16+
- fancy_progressbar

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@ install:
1515
- hash -r
1616
- conda config --set always_yes yes --set changeps1 no
1717
- conda config --append channels conda-forge
18-
- conda update -q conda
1918
# Useful for debugging any issues with conda
2019
- conda info -a
2120

2221
- conda env create -f ./environment.yml
23-
- source activate test-environment
24-
- python setup.py install
22+
- source activate filter_functions
23+
- pip install .[fancy_progressbar,doc,tests]
2524

2625
script:
2726
- "coverage run --rcfile=coverage.ini -m pytest"

environment.yml

Lines changed: 7 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -1,150 +1,11 @@
1-
name: test-environment
1+
name: filter_functions
2+
23
channels:
34
- conda-forge
4-
- defaults
5+
56
dependencies:
6-
- _libgcc_mutex=0.1=conda_forge
7-
- _openmp_mutex=4.5=0_gnu
8-
- alabaster=0.7.12=py_0
9-
- atomicwrites=1.3.0=py_0
10-
- attrs=19.3.0=py_0
11-
- babel=2.8.0=py_0
12-
- backcall=0.1.0=py_0
13-
- bleach=3.1.0=py_0
14-
- ca-certificates=2019.11.28=hecc5488_0
15-
- certifi=2019.11.28=py37_0
16-
- cffi=1.13.2=py37h8022711_0
17-
- chardet=3.0.4=py37_1003
18-
- coverage=5.0.3=py37h516909a_0
19-
- coveralls=1.10.0=py_0
20-
- cryptography=2.8=py37h72c5cf5_1
21-
- cycler=0.10.0=py_2
22-
- cython=0.29.14=py37he1b5a44_0
23-
- dbus=1.13.6=he372182_0
24-
- decorator=4.4.1=py_0
25-
- defusedxml=0.6.0=py_0
26-
- docopt=0.6.2=py_1
27-
- docutils=0.16=py37_0
28-
- entrypoints=0.3=py37_1000
29-
- expat=2.2.5=he1b5a44_1004
30-
- fontconfig=2.13.1=h86ecdb6_1001
31-
- freetype=2.10.0=he983fc9_1
32-
- gettext=0.19.8.1=hc5be6a0_1002
33-
- glib=2.58.3=py37h6f030ca_1002
34-
- gst-plugins-base=1.14.5=h0935bb2_0
35-
- gstreamer=1.14.5=h36ae1b5_0
36-
- icu=64.2=he1b5a44_1
37-
- idna=2.8=py37_1000
38-
- imagesize=1.2.0=py_0
39-
- importlib_metadata=1.4.0=py37_0
40-
- ipykernel=5.1.3=py37h5ca1d4c_0
41-
- ipython=7.11.1=py37h5ca1d4c_0
42-
- ipython_genutils=0.2.0=py_1
43-
- jedi=0.15.2=py37_0
44-
- jinja2=2.10.3=py_0
45-
- jpeg=9c=h14c3975_1001
46-
- jsonschema=3.2.0=py37_0
47-
- jupyter_client=5.3.4=py37_1
48-
- jupyter_core=4.6.1=py37_0
49-
- kiwisolver=1.1.0=py37hc9558a2_0
50-
- ld_impl_linux-64=2.33.1=h53a641e_7
51-
- libblas=3.8.0=14_openblas
52-
- libcblas=3.8.0=14_openblas
53-
- libclang=9.0.1=default_hde54327_0
54-
- libffi=3.2.1=he1b5a44_1006
55-
- libgcc-ng=9.2.0=h24d8f2e_2
56-
- libgfortran-ng=7.3.0=hdf63c60_4
57-
- libgomp=9.2.0=h24d8f2e_2
58-
- libiconv=1.15=h516909a_1005
59-
- liblapack=3.8.0=14_openblas
60-
- libllvm8=8.0.1=hc9558a2_0
61-
- libllvm9=9.0.1=hc9558a2_0
62-
- libopenblas=0.3.7=h5ec1e0e_6
63-
- libpng=1.6.37=hed695b0_0
64-
- libsodium=1.0.17=h516909a_0
65-
- libstdcxx-ng=9.2.0=hdf63c60_2
66-
- libuuid=2.32.1=h14c3975_1000
67-
- libxcb=1.13=h14c3975_1002
68-
- libxkbcommon=0.9.1=hebb1f50_0
69-
- libxml2=2.9.10=hee79883_0
70-
- llvmlite=0.31.0=py37h8b12597_0
71-
- markupsafe=1.1.1=py37h516909a_0
72-
- matplotlib=3.1.2=py37_1
73-
- matplotlib-base=3.1.2=py37h250f245_1
74-
- mistune=0.8.4=py37h516909a_1000
75-
- more-itertools=8.1.0=py_0
76-
- nbconvert=5.6.1=py37_0
77-
- nbformat=5.0.3=py_0
78-
- nbsphinx=0.5.0=py_0
79-
- ncurses=6.1=hf484d3e_1002
80-
- nspr=4.24=he1b5a44_0
81-
- nss=3.47=he751ad9_0
82-
- numba=0.47.0=py37hb3f55d8_0
83-
- numpy=1.17.5=py37h95a1406_0
84-
- numpydoc=0.9.2=py_0
85-
- openssl=1.1.1d=h516909a_0
86-
- opt_einsum=3.1.0=py_0
87-
- packaging=20.0=py_0
88-
- pandoc=2.9.1.1=0
89-
- pandocfilters=1.4.2=py_1
90-
- parso=0.5.2=py_0
91-
- pcre=8.43=he1b5a44_0
92-
- pexpect=4.7.0=py37_0
93-
- pickleshare=0.7.5=py37_1000
94-
- pip=19.3.1=py37_0
95-
- pluggy=0.13.0=py37_0
96-
- prompt_toolkit=3.0.2=py_0
97-
- pthread-stubs=0.4=h14c3975_1001
98-
- ptyprocess=0.6.0=py_1001
99-
- py=1.8.1=py_0
100-
- pycparser=2.19=py37_1
101-
- pygments=2.5.2=py_0
102-
- pyopenssl=19.1.0=py37_0
103-
- pyparsing=2.4.6=py_0
104-
- pyqt=5.12.3=py37hcca6a23_1
105-
- pyrsistent=0.15.7=py37h516909a_0
106-
- pysocks=1.7.1=py37_0
107-
- pytest=5.0.1=py37_0
108-
- python=3.7.6=h357f687_2
109-
- python-dateutil=2.8.1=py_0
110-
- pytz=2019.3=py_0
111-
- pyyaml=5.3=py37h516909a_0
112-
- pyzmq=18.1.1=py37h1768529_0
113-
- qt=5.12.5=hd8c4c69_1
114-
- qutip=4.4.1=py37h9de70de_0
115-
- readline=8.0=hf8c457e_0
116-
- requests=2.22.0=py37_1
117-
- scipy=1.4.1=py37h921218d_0
118-
- setuptools=45.1.0=py37_0
119-
- six=1.14.0=py37_0
120-
- snowballstemmer=2.0.0=py_0
121-
- sparse=0.8.0=py_0
122-
- sphinx=2.3.1=py_0
123-
- sphinx_rtd_theme=0.4.3=py_0
124-
- sphinxcontrib-applehelp=1.0.1=py_0
125-
- sphinxcontrib-devhelp=1.0.1=py_0
126-
- sphinxcontrib-htmlhelp=1.0.2=py_0
127-
- sphinxcontrib-jsmath=1.0.1=py_0
128-
- sphinxcontrib-qthelp=1.0.2=py_0
129-
- sphinxcontrib-serializinghtml=1.1.3=py_0
130-
- sqlite=3.30.1=hcee41ef_0
131-
- testpath=0.4.4=py_0
132-
- tk=8.6.10=hed695b0_0
133-
- tornado=6.0.3=py37h516909a_0
134-
- tqdm=4.41.1=py_0
135-
- traitlets=4.3.3=py37_0
136-
- urllib3=1.25.7=py37_0
137-
- wcwidth=0.1.8=py_0
138-
- webencodings=0.5.1=py_1
139-
- wheel=0.33.6=py37_0
140-
- xorg-libxau=1.0.9=h14c3975_0
141-
- xorg-libxdmcp=1.1.3=h516909a_0
142-
- xz=5.2.4=h14c3975_1001
143-
- yaml=0.2.2=h516909a_1
144-
- zeromq=4.3.2=he1b5a44_2
145-
- zipp=2.0.0=py_0
146-
- zlib=1.2.11=h516909a_1006
147-
- pip:
148-
- pyqt5-sip==4.19.18
149-
- pyqtwebengine==5.12.1
7+
- qutip
8+
- pip
9+
10+
prefix: /home/docs/.conda/envs/filter_functions
15011

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ def extract_version(version_file):
3939
extras_require={
4040
'fancy_progressbar': ['tqdm', 'requests'],
4141
'doc': ['ipython', 'ipykernel', 'nbsphinx', 'numpydoc', 'sphinx',
42-
'jupyter_client', 'sphinx_rtd_theme']
42+
'jupyter_client', 'sphinx_rtd_theme'],
43+
'tests': ['pytest', 'coverage', 'coveralls'],
4344
},
4445
test_suite='tests',
45-
tests_require=['pytest'],
4646
classifiers=[
4747
'Programming Language :: Python :: 3',
4848
'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',

0 commit comments

Comments
 (0)