Skip to content

Commit

Permalink
PIN deps / remove conda envt to reduce RTD build size (#517)
Browse files Browse the repository at this point in the history
* rtree is causing pip install issues

i'm not sure we are even still using it so i'm going to test a local remove to see what happens.

* Remove clip (#515)

* Update codecov from 2.0.15 to 2.0.22 (#506)

* Update tox from 3.14.2 to 3.14.6 (#511)

* Update pytest from 5.3.5 to 5.4.1 (#503)

* Deprecated clip! (I think)

* changelog

* Update CHANGELOG.md

* remote rtree language in readme

Co-authored-by: pyup.io bot <github-bot@pyup.io>
Co-authored-by: Leah Wasser <leah.wasser@colorado.edu>

* small syntax updates

* rtd envt slim down

* test for rtd resources

* cleanup docs envt

* pin deps for RTD

* pin more packageS

* testing removing conda envt

* changelog and pinned deps for the future

* black

Co-authored-by: Nathan Korinek <nako1890@colorado.edu>
Co-authored-by: pyup.io bot <github-bot@pyup.io>
  • Loading branch information
3 people committed Mar 26, 2020
1 parent 829c74a commit e4bc8c5
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 18 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
* Remove conda envt for RTD build (@lwasser, #518)
* Deprecate clip function from earthpy given it's moved to geopandas now (@nkorinek, #510)
* Fix twitter flood data key in get_data (@lwasser, #512)
* Added new landsat data as a download option to get_data (@nkorinek)
Expand Down
21 changes: 13 additions & 8 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,20 @@ channels:
- conda-forge
dependencies:
- python=3.7
- numpy
- matplotlib=3.0.3
- geopandas=0.4.1
- rasterio=1.0.21
- scikit-image
- shapely=1.6.4
- fiona=1.8.4
- pyproj=1.9.6
- geopandas=0.7.0
- rasterio=1.1.3
- sphinx=1.8.4
- sphinx_rtd_theme=0.4.3
- m2r=0.2.1
- sphinx-gallery=0.2.0
- pandas=1.0.3
# To make conda resolution faster - following geopandas
- scikit-image=0.16.2
- libgdal=3.0.4
- pyproj=2.6.0
- gdal=3.0.4
- shapely=1.7.0
- fiona=1.8.4
- proj=6.3.1
- geos=3.8.1
- pillow=7.0.0
7 changes: 2 additions & 5 deletions earthpy/clip.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
"""

import pandas as pd
import geopandas as gpd


# @deprecate
def _clip_points(shp, clip_obj):
Expand Down Expand Up @@ -69,7 +66,7 @@ def clip_shp(shp, clip_obj):
Please use the clip() function in GeoPandas instead.
"""
raise Warning(
"clip_shp is deprecated. Use the clip() function in "
"GeoPandas. Exiting..."
"clip_shp is deprecated in earthpy and has been moved to Geopandas. "
"Please use the Geopandas clip() function. Exiting..."
)
sys.exit()
4 changes: 1 addition & 3 deletions earthpy/tests/test_clip.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,7 @@ def multi_point(point_gdf):


def test_warning_main_clip_function(point_gdf, single_rectangle_gdf):
with pytest.raises(
Warning, match="clip_shp is deprecated. Use the clip()"
):
with pytest.raises(Warning, match="clip_shp is deprecated in earthpy"):
cl.clip_shp(point_gdf, single_rectangle_gdf)


Expand Down
2 changes: 0 additions & 2 deletions readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
version: 2
formats: []
conda:
environment: docs/environment.yml
python:
version: 3.7
install:
Expand Down

0 comments on commit e4bc8c5

Please sign in to comment.