This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely.
commit e82313113d3780ae11bde4e0b9dd9af05069b0c6 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Wed Aug 23 16:08:57 2017 +0200 New upstream version 1.6.0 --- CHANGES.txt | 6 ++++++ CREDITS.txt | 16 +++++++++------- README.rst | 52 ++++++++++++++++++++++++++-------------------------- docs/conf.py | 2 +- docs/manual.rst | 12 ++++++++---- environment.yml | 11 +++++++++++ readthedocs.yml | 5 +++++ shapely/__init__.py | 2 +- 8 files changed, 67 insertions(+), 39 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 73dfcd1..b556b35 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,12 @@ Changes ======= +1.6.0 (2017-08-21) +------------------ + +- Project documentation is now hosted at + https://shapely.readthedocs.io/en/latest/. + 1.6b5 (2017-08-18) ------------------ diff --git a/CREDITS.txt b/CREDITS.txt index abca549..d1c2c84 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -8,16 +8,17 @@ Shapely is written by: * Joshua Arnott <j...@snorfalorpagus.net> * Mike Toews <mwto...@gmail.com> * Jacob Wasserman <jwasser...@gmail.com> -* aronbierbaum <aronbierbaum@b426a367-1105-0410-b9ff-cdf4ab011145> +* Aron Bierbaum <aronbierb...@gmail.com> * Allan Adair <al...@rfspot.com> * Johannes Schönberger <jschoenber...@demuc.de> * georgeouzou <geothr...@gmail.com> * Phil Elson <pelson....@gmail.com> * Howard Butler <hobu....@gmail.com> +* Kelsey Jordahl <kjord...@enthought.com> * dokai <dokai@b426a367-1105-0410-b9ff-cdf4ab011145> -* Gabi Davar <grizzly....@gmail.com> * Kevin Wurster <ke...@skytruth.org> -* Kelsey Jordahl <kjord...@enthought.com> +* Gabi Davar <grizzly....@gmail.com> +* Thibault Deutsch <thibault.deut...@gmail.com> * Dave Collins <d...@hopest.net> * fredj <frederic.ju...@camptocamp.com> * Brad Hards <br...@frogmouth.net> @@ -33,16 +34,18 @@ Shapely is written by: * Jeethu Rao <jee...@jeethurao.com> * Peter Sagerson <psagers.git...@ignorare.net> * Jason Sanford <jason.sanf...@mapmyfitness.com> +* mindw <grizzly....@gmail.com> * Jamie Hall <jamie1...@gmail.com> * James Spencer <james.s.spen...@gmail.com> * Stephan Hügel <ursch...@gmail.com> -* Benjamin Root <ben.v.r...@gmail.com> +* Bas Couwenberg <sebas...@xs4all.nl> +* James Douglass <jamesdouglass...@gmail.com> * Tobias Sauerwein <tobias.sauerw...@camptocamp.com> * WANG Aiyong <gepcel...@gmail.com> -* James Douglass <jamesdouglass...@gmail.com> * Brandon Wood <btw...@geometeor.com> -* Andy Freeland <a...@andyfreeland.net> * BertrandGervais <bertrand.gervais....@gmail.com> +* Andy Freeland <a...@andyfreeland.net> +* Benjamin Root <ben.v.r...@gmail.com> * giumas <gmase...@ccom.unh.edu> * Leandro Lima <lean...@limaesilva.com.br> * Maarten Vermeyen <maarten.verme...@rwo.vlaanderen.be> @@ -56,7 +59,6 @@ Additional help from: * Justin Bronn (GeoDjango) for ctypes inspiration * Martin Davis (JTS) -* Jaakko Salli for the Windows distributions * Sandro Santilli, Mateusz Loskot, Paul Ramsey, et al (GEOS Project) Major portions of this work were supported by a grant (for Pleiades_) from the diff --git a/README.rst b/README.rst index 2e2db82..ac21395 100644 --- a/README.rst +++ b/README.rst @@ -22,58 +22,61 @@ planar geometric objects. It is based on the widely deployed `GEOS libraries. Shapely is not concerned with data formats or coordinate systems, but can be readily integrated with packages that are. For more details, see: -* Shapely on `GitHub <https://github.com/Toblerity/Shapely>`__ -* The Shapely `manual <http://toblerity.github.com/shapely/manual.html>`__ +* `Shapely GitHub repository <https://github.com/Toblerity/Shapely>`__ +* `Shapely documentation and manual <https://shapely.readthedocs.io/en/latest/>`__ Requirements ============ -Shapely 1.6.x requires +Shapely 1.6 requires * Python >=2.6 (including Python 3.x) * GEOS >=3.3 -Installing Shapely (1.6b5) -========================== +Installing Shapely 1.6 +====================== + +Shapely may be installed from a source distribution or one of several kinds +of built distribution. + +Built distributions +------------------- Windows users have two good installation options: the wheels at http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely and the Anaconda platform's [conda-forge](https://conda-forge.github.io/) channel. -OS X users can get Shapely wheels with GEOS included from the +OS X and Linux users can get Shapely wheels with GEOS included from the Python Package Index with a recent version of pip (8+): .. code-block:: console - $ pip install shapely==1.6b5 + $ pip install shapely A few extra speedups that require Numpy can be had by running .. code-block:: console - $ pip install shapely[vectorized]==1.6b5 - -If you want to build Shapely from source for compatibility with -other modules that depend on GEOS (such as cartopy or osgeo.ogr) -you may ignore the binary wheels. - -.. code-block:: console + $ pip install shapely[vectorized] - $ pip install shapely --no-binary shapely +Shapely is available via system package management tools like apt, yum, and +Homebrew, and is also provided by popular Python distributions like Canopy and +Anaconda. -Binary wheels are also available for Linux. To get them, use `pip shapely -shapely==1.6b5`. To avoid them, use `pip install shapely --no-binary -shapely==1.6b5`. +Source distributions +-------------------- -In other situations, install `geos_c` libs and headers by any means -(for example, `brew install geos` on OS X or -`apt-get install libgeos-dev` on Debian/Ubuntu) and install Shapely -from the Python package index. +If you want to build Shapely from source for compatibility with +other modules that depend on GEOS (such as cartopy or osgeo.ogr) or want to +use a different version of GEOS than the one included in the project wheels +you should first install the GEOS library, Cython, and Numpy on your system +(using apt, yum, brew, or other means) and then direct pip to ignore the binary +wheels. .. code-block:: console - $ pip install shapely + $ pip install shapely --no-binary shapely If you've installed GEOS to a standard location, the geos-config program will be used to get compiler and linker options. If geos-config is not on @@ -84,9 +87,6 @@ variable, e.g.: $ GEOS_CONFIG=/path/to/geos-config pip install shapely -Shapely is also provided by popular Python distributions like Canopy -(Enthought) and Anaconda (Continuum Analytics). - Usage ===== diff --git a/docs/conf.py b/docs/conf.py index fe3b911..0d575a5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -121,7 +121,7 @@ html_theme_path = ['themes'] # The name for this set of Sphinx documents. If None, it defaults to # "<project> v<release> documentation". -html_title = "Shapely 1.2 and 1.3 documentation" +html_title = "Shapely 1.6 documentation" # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None diff --git a/docs/manual.rst b/docs/manual.rst index 244c9c0..12c7536 100644 --- a/docs/manual.rst +++ b/docs/manual.rst @@ -5,7 +5,7 @@ The Shapely User Manual ======================= :Author: Sean Gillies, <sean.gill...@gmail.com> -:Version: 1.2 and 1.3 +:Version: 1.6 :Date: |today| :Copyright: This work is licensed under a `Creative Commons Attribution 3.0 @@ -1521,8 +1521,10 @@ With a `resolution` of 1, the buffer is a square patch. >>> q.area 200.0 -Passed a `distance` of 0, :meth:`buffer` can be used to "clean" self-touching -or self-crossing polygons such as the classic "bowtie". +Passed a `distance` of 0, :meth:`buffer` can sometimes be used to "clean" self-touching +or self-crossing polygons such as the classic "bowtie". Users have reported +that very small distance values sometimes produce cleaner results than 0. Your +mileage may vary when cleaning surfaces. .. code-block:: pycon @@ -1662,7 +1664,9 @@ Figure 14. Simplification of a nearly circular polygon using a tolerance of 0.2 .. note:: `Invalid` geometric objects may result from simplification that does not - preserve topology. + preserve topology and simplification may be sensitive to the order of + coordinates: two geometries differing only in order of coordinates may be + simplified differently. Affine Transformations diff --git a/environment.yml b/environment.yml new file mode 100644 index 0000000..000f494 --- /dev/null +++ b/environment.yml @@ -0,0 +1,11 @@ +name: _shapely +channels: + - defaults + - conda-forge +dependencies: + - python>=3.5 + - cython + - descartes + - geos>=3.3 + - matplotlib + - numpy>=1.9 diff --git a/readthedocs.yml b/readthedocs.yml new file mode 100644 index 0000000..df1e840 --- /dev/null +++ b/readthedocs.yml @@ -0,0 +1,5 @@ +python: + version: 3 + pip_install: true +conda: + file: environment.yml diff --git a/shapely/__init__.py b/shapely/__init__.py index 69599ff..e4adfb8 100644 --- a/shapely/__init__.py +++ b/shapely/__init__.py @@ -1 +1 @@ -__version__ = "1.6b5" +__version__ = "1.6.0" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel