wassname/geopandas
1
0 Fork 0
mirror of https://github.com/wassname/geopandas.git synced 2026-10-04 12:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
698 Commits 19 Branches 4 Tags
c51d83bb6a4ec9cff2bb8a59b0e14869dbcff335
Commit Graph
698 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kelsey Jordahl c51d83bb6a TST CLN: Remove unused imports 2016-04-27 23:58:12 +02:00
Kelsey Jordahl c8fb3de4a1 TST: Use the full path for examples directory 2016-04-27 23:58:08 +02:00
Kelsey Jordahl cbc479f46b TST: Import test utilities with fully qualified name 2016-04-27 23:56:16 +02:00
Kelsey Jordahl a56deb777d TST: Move the tests into the main package and subpackages 2016-04-27 23:52:05 +02:00
Nick Eubank 5f9f130287 updated mapping doc (#299) 
* updated maps

* add cities

* overlapping layers added

* tweak to docs

* both layering options
 2016-04-27 23:46:03 +02:00
Nick Eubank d6308826ad moved docs for plotting to more accessible location (#300) 
* moved docs for plotting to more accessible location

* more supportable docs
 2016-04-21 18:15:49 +02:00
Joris Van den Bossche 8358fc761d Merge pull request #298 from geopandas/doc/readthedocs-requirements 
DOC: add readthedocs yaml config file + use conda for doc deps
 2016-04-21 11:48:45 +02:00
Joris Van den Bossche 142393c60a TEMP: change path to example data (for rtd, does not work locally) 2016-04-11 22:37:26 +02:00
Joris Van den Bossche b2c84e6491 DOC: pin ipython version to avoid bug with savefig 
See https://github.com/ipython/ipython/issues/8733#issuecomment-208544701 for more details
 2016-04-11 22:33:25 +02:00
Joris Van den Bossche 3988fb52a0 DOC: add readthedocs yaml config file + use conda for doc deps 2016-04-11 22:32:58 +02:00
Joris Van den Bossche 3232187324 Merge pull request #297 from jorisvandenbossche/doc-cleanup 
DOC: some clean-up after #283
 2016-04-11 22:31:38 +02:00
Joris Van den Bossche 66f47ffbf2 Merge pull request #296 from micahcochran/nybb-fix 
Update nybb url.
 2016-04-10 22:58:53 +02:00
Joris Van den Bossche 13952f12c6 DOC: add ipython as doc requirement 
For the ipython directive
 2016-04-10 21:11:29 +02:00
Joris Van den Bossche 364e93169b DOC: clean-up user guide (remaining comments from GH283) 2016-04-10 20:29:14 +02:00
Joris Van den Bossche 1061810076 DOC: update contributing guide 2016-04-10 20:12:32 +02:00
Joris Van den Bossche 5376ef745f DOC: correct requirements file syntax 2016-04-10 13:36:02 +02:00
Micah Cochran 9d68a8237f Update nybb url. Change download_nybb() to return shapefile name within the zip file. 2016-04-08 11:34:40 -05:00
Joris Van den Bossche 2a64076d36 Merge pull request #283 from nickeubank/docs_02 
Updated Docs for 0.2 Release
 2016-04-08 10:54:59 +02:00
Nick Eubank 54ca8b90e6 integrate jorisvandenbossche comments 2016-03-31 10:00:36 -07:00
Nick Eubank 623634113d Edits for kjordahl comments 2016-03-30 12:01:37 -07:00
Kelsey Jordahl 5bdb9e013b Merge pull request #287 from micahcochran/patch-1 
Universal Python Wheel
 2016-03-29 23:11:58 -07:00
Kelsey Jordahl f273db6226 Merge pull request #263 from BibMartin/geoseries_tojson 
Fix GeoSeries.to_json
 2016-03-29 23:09:21 -07:00
Kelsey Jordahl 0cee1425f1 Merge pull request #289 from nickeubank/fixreaddocs 
improve read_file docstring
 2016-03-29 22:47:21 -07:00
Kelsey Jordahl e038eb5872 Merge pull request #288 from nickeubank/tweak_crs 
make crs more flexible
 2016-03-29 22:46:25 -07:00
Nick Eubank 8327a14fc3 new structure for docs; draft of several sections 2016-03-29 19:00:01 -07:00
Nick Eubank 8280e5bfdf additional proj4 conversion test 2016-03-29 13:48:48 -07:00
Nick Eubank 0e2324df07 updated to_crs docstring 2016-03-29 11:36:58 -07:00
Nick Eubank ff84246015 improve read_file docstring 2016-03-27 09:18:16 -07:00
Nick Eubank 70c0166049 make crs more flexible 2016-03-26 17:22:53 -07:00
Micah Cochran 51e6f997c1 Universal Python Wheel 
... has the potential to make geopandas slightly easier to install.  Since geopandas itself it pure python, this should be an extra step during release: `python setup.py sdist bdist_wheel upload`

See: http://pythonwheels.com/
 2016-03-26 17:26:56 -05:00
Kelsey Jordahl cab00b14f7 Merge pull request #275 from micahcochran/travis-matplotlib 
Travis:Test different versions of matplotlib
 2016-03-21 19:30:57 -07:00
Micah Cochran 1489a9e8b0 Test different versions of matplotlib. 
Add Pandas 0.18.0 to testing.  Have one requirements.txt file for all
versions (remove .requirements-2.6.txt).  Allow MATPLOTLIB=master tests
to fail (which a few of the tests currently fail).
 2016-03-15 13:54:27 -05:00
Joris Van den Bossche 77b9b3b7e8 Merge pull request #273 from micahcochran/test-setup-class 
unittest: call mkdir & rmtree once for the class
 2016-02-27 00:24:41 +01:00
Micah Cochran 73f7233134 unittest: call mkdir & rmtree once for the class 
This patch calls setUpClass and tearDownClass once. (setUp and tearDown were called once for each test fixture [3-4 times]).  This is very minor change.
 2016-02-26 11:41:27 -06:00
Kelsey Jordahl 5c5d9e13f9 Merge pull request #272 from micahcochran/travis-changes 
Travis: "Matrix" Changes
 2016-02-22 08:16:11 -08:00
Micah Cochran db68f18bb1 Travis: Matrix Changes 
This is not a beautiful way to change it, but it is an attempt at resolving issues raised in PR #243.  It results in 11 test.  Eight (8) test focused on testing Python 2.7 and 3.5 with many versions of Pandas.
 2016-02-09 16:10:41 -06:00
Joris Van den Bossche 1451292060 Merge pull request #260 from jorisvandenbossche/plot-point-kwargs 
Plotting: pass kwargs also for lines and points
 2015-12-18 14:24:22 +01:00
Joris Van den Bossche a177855d62 Plotting: pass kwargs also for lines and points 2015-12-18 13:46:19 +01:00
Joris Van den Bossche 8e13353275 Merge pull request #229 from darribas/fix_facecolor_conflict 
ENH: Fix facecolor conflict
 2015-12-17 08:59:13 +01:00
Dani Arribas-Bel f16e7415f4 Fix for #229 2015-12-17 00:15:55 +00:00
Martin Journois a4deea79a9 GeoSeries.to_json uses __geo_interface__ 2015-12-11 21:06:25 +01:00
Martin Journois 77e02c34fe Fix test_to_json 2015-12-11 20:52:27 +01:00
Martin Journois 9af05475b8 Add Docstring to GeoSeries.to_json 2015-12-11 20:46:44 +01:00
Martin Journois 2e3700f77a Fix GeoSeries.to_json 2015-12-11 20:20:55 +01:00
Kelsey Jordahl ff5787c15d Merge pull request #261 from micahcochran/rtree-req 
rtree requirements.txt
 2015-12-06 13:40:17 -08:00
Micah Cochran a775361608 Create constraints.txt: rtree 
"Constraints files are requirements files that only control which version of a requirement is installed, not whether it is installed or not. " from Constraits Files in pip's docs     http://pip.readthedocs.org/en/stable/user_guide/#constraints-files
 2015-12-03 15:37:35 -06:00
Micah Cochran bee54369a0 requirements.test.txt: adding rtree 2015-12-03 10:00:22 -06:00
Micah Cochran 707bd18b40 requirements.txt: removing rtree 2015-12-03 09:59:01 -06:00
Kelsey Jordahl b49991ef79 Merge pull request #255 from geopandas/doc/readthedocs-requirements 
Revive readthedocs build
 2015-12-01 07:42:52 -08:00
Kelsey Jordahl b3d07f3518 Merge pull request #256 from jorisvandenbossche/doc-install 
DOC: update install instructions
 2015-11-22 10:35:26 -07:00