Skip to content

Commit 53c5792

Browse files
authored
Merge pull request Geosyntec#99 from phobson/restore-doc-build
build travis against cf pygridgen, fix its pin
2 parents f8f9112 + ef53cb9 commit 53c5792

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ before_install:
2525
install:
2626
# We just set up a conda environment with the right Python version. This
2727
# should not need changing.
28-
- conda create --yes --channel=conda-forge --name=test python=$TRAVIS_PYTHON_VERSION gridgen fiona geopandas scipy matplotlib ipywidgets pytest pytest-mpl pytest-cov pytest-pep8 coverage docopt requests pyyaml
28+
- conda create --yes --channel=conda-forge --name=test python=$TRAVIS_PYTHON_VERSION gridgen fiona geopandas scipy matplotlib ipywidgets pytest pytest-mpl pytest-cov pytest-pep8 coverage docopt requests pyyaml pygridgen
2929
- source activate test
3030
- pip install codecov
31-
- pip install git+https://github.com/pygridgen/pygridgen.git
3231
- pip install .
3332

3433
script:

docs/docenv.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ dependencies:
134134
- py=1.8.0=py_0
135135
- pycparser=2.19=py37_1
136136
- pygments=2.4.2=py_0
137-
- pygridgen=0.2.dev0=dev_0
138-
- pygridtools=0.3.1=dev_0
137+
- pygridgen=0.2.1=py37hc1659b7_0
139138
- pyopenssl=19.0.0=py37_0
140139
- pyparsing=2.4.2=py_0
141140
- pyproj=2.3.1=py37h2fd02e8_0

readthedocs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build:
44
image: latest
55

66
python:
7-
version: 3.6
7+
version: 3.7
88
pip_install: true
99

1010
conda:

0 commit comments

Comments
 (0)