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.

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

Add dependency of shapely separately as Geopandas is dependency for building docs #683

Merged
merged 2 commits into from
Aug 24, 2020

Conversation

sackh
Copy link
Contributor

@sackh sackh commented Aug 22, 2020

Signed-off-by: Kharude, Sachin [email protected]

@davidbrochart - We need to add the dependency of shapely, as geopandas is the only dependency for building docs, hence docs build is not failing.
When I tested WKT functionality geopandas was already installed in my env hence it did not fail.
Now, when I created a new environment from scratch it fails as shapely is not added as a dependency. Hence adding it as a dependency.

setup.py Outdated Show resolved Hide resolved
@martinRenou
Copy link
Member

I am not sure I get why we need shapely as dependency, is it used in ipyleaflet? Other than in the docs?

@sackh
Copy link
Contributor Author

sackh commented Aug 23, 2020

@martinRenou - I added a new feature called WKTLayer in #679, which needs shapely, I thought geopandas is dependency hence I did not add it initially as shapely is a dependency of Geopandas. but later realized that geopandas is only required for docs, hence we need shapely as a dependency for ipyleaflet.

@martinRenou
Copy link
Member

I need to catch up on notifications, I did not look at the WKT PR yet, sorry!

@martinRenou martinRenou merged commit 86b4413 into jupyter-widgets:master Aug 24, 2020
@sackh sackh deleted the wkt_shapely branch August 29, 2020 12:23
martinRenou added a commit that referenced this pull request Sep 23, 2020
* Bump elliptic from 6.5.2 to 6.5.3 in /js

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](indutny/elliptic@v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <[email protected]>

* Added better way to update GeoJSON data

Signed-off-by: Kharude, Sachin <[email protected]>

* fixed tooltip popup for title of marker (#677)

* fixed tooltip popup for title of marker

Signed-off-by: Kharude, Sachin <[email protected]>

* Made changes as per review comments

Signed-off-by: Kharude, Sachin <[email protected]>

* Added WKT layer to view WKT data on map (#679)

* Added WKT layer to view WKT data on map

Signed-off-by: Kharude, Sachin <[email protected]>

* Documentation changes for WKT and changes as per review comments

Signed-off-by: Kharude, Sachin <[email protected]>

* refactored code as per comments to use list comprehension

Signed-off-by: Kharude, Sachin <[email protected]>

* Add dependency of shapely (#683)

* Add dependency of shapely separately as geopandas is not dependency

Signed-off-by: Kharude, Sachin <[email protected]>

* removed latest version pin from shapely

Signed-off-by: Kharude, Sachin <[email protected]>

* Revert "fixed tooltip popup for title of marker (#677)"

This reverts commit 118ee5c.

* add gaode (#681)

Co-authored-by: meng.xiang <[email protected]>

* Made default value of zoom trait for SearchControl None so it will not change by default

Signed-off-by: Kharude, Sachin <[email protected]>

* Added example notebooks for KML and GPX file formats

Signed-off-by: Kharude, Sachin <[email protected]>

* Bump node-fetch from 2.6.0 to 2.6.1 in /js

Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](node-fetch/node-fetch@v2.6.0...v2.6.1)

Signed-off-by: dependabot[bot] <[email protected]>

* Update xleaflet URL

* Update environment.yml

Pin nodejs version, for #699

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kharude, Sachin <[email protected]>
Co-authored-by: David Brochart <[email protected]>
Co-authored-by: sachin kharude <[email protected]>
Co-authored-by: 向蒙 <[email protected]>
Co-authored-by: meng.xiang <[email protected]>
Co-authored-by: Sylvain Corlay <[email protected]>
Co-authored-by: banjaxedben <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants