Skip to content

Commit

Permalink
Merge pull request #1158 from sjsrey/2.2.0
Browse files Browse the repository at this point in the history
2.2.0
  • Loading branch information
sjsrey committed Feb 11, 2020
2 parents 5991f64 + 104075d commit 1177afb
Show file tree
Hide file tree
Showing 9 changed files with 5,082 additions and 12 deletions.
4 changes: 2 additions & 2 deletions ci/travis/36-latest-conda-forge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies:
- giddy
- mapclassify
- splot
- spvcm
- inequality
- pip:
- doc2dash
- spvcm
- inequality
4 changes: 2 additions & 2 deletions ci/travis/37-latest-conda-forge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies:
- giddy
- mapclassify
- splot
- spvcm
- inequality
- pip:
- doc2dash
- spvcm
- inequality
57 changes: 57 additions & 0 deletions ci/travis/38-latest-conda-forge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: test
channels:
- conda-forge
dependencies:
- python=3.8
- pip
- numpy>=1.17.0
- rtree
- sphinxcontrib-bibtex
- sphinx_bootstrap_theme
- numpydoc
- matplotlib
- python-dateutil<=2.8.0
- scipy
- pandas
- seaborn
- matplotlib
- descartes
- palettable
- statsmodels
- scikit-learn
- geopandas
- quantecon
- rtree
- tqdm
- quilt3
- rasterio
- rasterstats
- pytest
- coverage
- coveralls
- ipywidgets
- twine
- urbanaccess
- urllib3<1.25
- wheel
- dill
- pytest
- pytest-cov
- codecov
- bokeh
- libpysal
- esda
- spaghetti
- tobler
- spint
- spreg
- mgwr
- segregation
- pointpats
- giddy
- mapclassify
- splot
- spvcm
- inequality
- pip:
- doc2dash
2 changes: 1 addition & 1 deletion pysal/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__='v2.2.0rc'
__version__='2.2.0'
from . import lib
from . import explore
from . import viz
Expand Down
2 changes: 1 addition & 1 deletion pysal/frozen.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"spglm": "1.0.7",
"spint": "1.0.6",
"spreg": "1.0.4",
"spvcm": "0.2.1.post1",
"spvcm": "0.3.0",
"tobler": "0.2.0",
"mapclassify": "2.2.0",
"splot": "1.1.2"
Expand Down
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
libpysal>=4.2.1
esda>=2.2.0
libpysal>=4.2.2
esda>=2.2.1
giddy>=2.3.0
inequality>=1.0.0
pointpats>=2.1.0
segregation>=1.1.1
spaghetti>=1.4.0
segregation>=1.2.0
spaghetti>=1.4.1
mgwr>=2.1.1
spglm>=1.0.7
spint>=1.0.6
spreg>=1.0.4
spvcm==0.2.1.post1
spvcm>=0.3.0
tobler>=0.2.0
mapclassify>=2.2.0
splot>=1.1.2
Expand Down

0 comments on commit 1177afb

Please sign in to comment.