Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rtd again #406

Merged
merged 5 commits into from
May 1, 2019
Merged

Rtd again #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f429222
trying a new env
doutriaux1 Apr 10, 2019
f85d099
Merge branch 'master' into rtd_again
doutriaux1 May 1, 2019
00124da
this seems to allow creation of docs
doutriaux1 May 1, 2019
3440bff
since mac uses so much resources and linux is fast now, only run mac …
doutriaux1 May 1, 2019
6dbfbe4
mved env file so people don't think it's a valid env, just for rtd to…
doutriaux1 May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ workflows:
vcs:
jobs:
#- macos_vcs_py2
- macos_vcs_py3
- linux_vcs_py2
- linux_vcs_py3
- macos_vcs_py3:
requires:
- linux_vcs_py3
110 changes: 110 additions & 0 deletions docs/rtd_environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
name: lite
channels:
- conda-forge
- defaults
dependencies:
- alabaster=0.7.12=py_0
- asn1crypto=0.24.0=py37_1003
- attrs=19.1.0=py_0
- babel=2.6.0=py_1
- blas=1.1=openblas
- bleach=3.1.0=py_0
- bzip2=1.0.6=h14c3975_1002
- ca-certificates=2019.3.9=hecc5488_0
- cdat_info=8.1.1=py_2
- cdms2=3.1.2=py37h6091dcd_7
- cdtime=3.1.2=py37h6091dcd_1
- cdutil=8.1=py_1
- certifi=2019.3.9=py37_0
- cffi=1.12.3=py37h8022711_0
- chardet=3.0.4=py37_1003
- cryptography=2.6.1=py37h72c5cf5_0
- curl=7.64.1=hf8cf82a_0
- decorator=4.4.0=py_0
- defusedxml=0.5.0=py_1
- distarray=2.12.2=py_1
- docutils=0.14=py37_1001
- entrypoints=0.3=py37_1000
- esmf=7.1.0=hdfb41a0_1004
- esmpy=7.1.0=py37h24bf2e0_3
- expat=2.2.5=hf484d3e_1002
- future=0.17.1=py37_1000
- g2clib=1.6.0=hf3f1b0b_9
- genutil=8.1.1=py37h3010b51_0
- hdf4=4.2.13=h9a582f1_1002
- hdf5=1.10.4=nompi_h3c11f04_1106
- idna=2.8=py37_1000
- imagesize=1.1.0=py_0
- ipython_genutils=0.2.0=py_1
- jasper=1.900.1=h07fcdf6_1006
- jinja2=2.10.1=py_0
- jpeg=9c=h14c3975_1001
- jsonschema=3.0.1=py37_0
- jupyter_core=4.4.0=py_0
- krb5=1.16.3=h05b26f9_1001
- libcdms=3.1.2=hcbdc9ef_1000
- libcf=1.0.2=py37h6d95edf_1007
- libcurl=7.64.1=hda55be3_0
- libdrs=3.1.2=h6e3784b_1
- libdrs_f=3.1.2=h750f5ca_1
- libedit=3.1.20170329=hf8c457e_1001
- libffi=3.2.1=he1b5a44_1006
- libnetcdf=4.6.2=hbdf4f91_1001
- libpng=1.6.37=hed695b0_0
- libssh2=1.8.2=h22169c7_2
- libtiff=4.0.10=h648cc4a_1001
- libuuid=2.32.1=h14c3975_1000
- markupsafe=1.1.1=py37h14c3975_0
- mistune=0.8.4=py37h14c3975_1000
- mpi=1.0=mpich
- mpich=3.2.1=h1c2f66e_1008
- nbconvert=5.5.0=py_0
- nbformat=4.4.0=py_1
- nbsphinx=0.4.2=py_0
- ncurses=6.1=hf484d3e_1002
- netcdf-fortran=4.4.5=hea25ff8_1000
- numpy=1.16.2=py37_blas_openblash1522bff_0
- openblas=0.3.3=h9ac9557_1001
- openssl=1.1.1b=h14c3975_1
- packaging=19.0=py_0
- pandoc=2.7.2=0
- pandocfilters=1.4.2=py_1
- pip=19.1=py37_0
- pycparser=2.19=py37_1
- pygments=2.3.1=py_0
- pyopenssl=19.0.0=py37_0
- pyparsing=2.4.0=py_0
- pyrsistent=0.15.1=py37h516909a_0
- pysocks=1.6.8=py37_1002
- python=3.7.3=h5b0a415_0
- pytz=2019.1=py_0
- readline=7.0=hf8c457e_1001
- requests=2.21.0=py37_1000
- setuptools=41.0.1=py37_0
- six=1.12.0=py37_1000
- snowballstemmer=1.2.1=py_1
- sphinx=2.0.1=py_0
- sphinxcontrib-applehelp=1.0.1=py_0
- sphinxcontrib-devhelp=1.0.1=py_0
- sphinxcontrib-htmlhelp=1.0.2=py_0
- sphinxcontrib-jsmath=1.0.1=py_0
- sphinxcontrib-qthelp=1.0.2=py_0
- sphinxcontrib-serializinghtml=1.1.1=py_0
- sqlite=3.26.0=h67949de_1001
- testpath=0.4.2=py_1001
- tk=8.6.9=h84994c4_1001
- traitlets=4.3.2=py37_1000
- udunits2=2.2.27.6=h4e0c4b3_1001
- urllib3=1.24.2=py37_0
- webencodings=0.5.1=py_1
- wheel=0.33.1=py37_0
- xz=5.2.4=h14c3975_1001
- zlib=1.2.11=h14c3975_1004
- libgcc-ng=8.2.0=hdf63c60_1
- libgfortran-ng=7.3.0=hdf63c60_0
- libstdcxx-ng=8.2.0=hdf63c60_1
- pip:
- mv2==3.0.0
- regrid2==3.0.0
prefix: /home/docs/.conda/envs/lite

227 changes: 0 additions & 227 deletions environment.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion readthedocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ python:
setup_py_install: true

conda:
file: environment.yml
file: docs/rtd_environment.yml

12 changes: 8 additions & 4 deletions vcs/Canvas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,12 @@
from . import textcombined
from . import template
from . import displayplot
import vtk
from .VTKPlots import VTKVCSBackend
try:
import vtk
from .VTKPlots import VTKVCSBackend
HAS_VTK = True
except Exception:
HAS_VTK = False
from weakref import WeakSet, WeakKeyDictionary

from .error import vcsError
Expand Down Expand Up @@ -934,9 +938,9 @@ def __init__(self, mode=1, pause_time=0, call_from_gui=0, size=None,
bg = True
except (AttributeError, NameError):
pass
if backend == "vtk":
if HAS_VTK and backend == "vtk":
self.backend = VTKVCSBackend(self, bg=bg)
elif isinstance(backend, vtk.vtkRenderWindow):
elif HAS_VTK and isinstance(backend, vtk.vtkRenderWindow):
self.backend = VTKVCSBackend(self, renWin=backend, bg=bg)
else:
warnings.warn(
Expand Down
Loading