From d48c0ec0d14fd52e47ce7a7b5455027916c9604a Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Sun, 6 Jul 2014 18:19:13 -0500 Subject: [PATCH 1/4] RLS: Set release = True! --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fe309ae..3f9e90d 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ such as PostGIS. MAJOR = 0 MINOR = 1 MICRO = 0 -ISRELEASED = False +ISRELEASED = True VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO) QUALIFIER = '' From bd664b54d493e6a3cb3ed16aaf625bf9c23bad6f Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Sun, 6 Jul 2014 18:26:48 -0500 Subject: [PATCH 2/4] BLD: Set default version in __init__.py --- geopandas/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geopandas/__init__.py b/geopandas/__init__.py index 3f2a276..9cedc51 100644 --- a/geopandas/__init__.py +++ b/geopandas/__init__.py @@ -1,7 +1,7 @@ try: from geopandas.version import version as __version__ except ImportError: - __version__ = '0.1.0.dev-unknown' + __version__ = '0.1.0' from geopandas.geoseries import GeoSeries from geopandas.geodataframe import GeoDataFrame From 44e24314e4fa77a900424c75744e01b5ea86f869 Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Sun, 6 Jul 2014 18:27:33 -0500 Subject: [PATCH 3/4] DOC: Bump release version --- doc/source/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index d1524ee..18d2e0b 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -41,7 +41,7 @@ master_doc = 'index' # General information about the project. project = u'GeoPandas' -copyright = u'2013, GeoPandas developers' +copyright = u'2013-2014, GeoPandas developers' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -52,7 +52,7 @@ try: version = release = d['version'] except: # FIXME: This shouldn't be hardwired, but should be set one place only - version = release = '0.1.0.dev' + version = release = '0.1.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From f6ed51f0cee2e4fae15870f18c1f1123e2f2e727 Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Sun, 6 Jul 2014 18:28:24 -0500 Subject: [PATCH 4/4] DOC: Clarify installing released version vs. dev versions --- doc/source/install.rst | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/doc/source/install.rst b/doc/source/install.rst index 7b62299..3fc2467 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -1,14 +1,23 @@ Installation ============ -GeoPandas is continuous-release software. You may install the latest -source from `GitHub`_ and use the setup script:: +The released version of GeoPandas is 0.1. To install the released +version, use ``pip install geopandas``. +You may install the latest development version by cloning the +`GitHub`_ repository and using the setup script:: + + git clone https://github.com/kjordahl/geopandas.git + cd geopandas python setup.py install -GeoPandas is also available on `PyPI`_, so ``pip install geopandas`` -should work as well. You will have to add the ``--pre`` flag -for pip 1.4 and later. +It is also possible to install the latest development version +available on PyPI with `pip` by adding the ``--pre`` flag for pip 1.4 +and later, or to use `pip` to install directly from the GitHub +repository with:: + + pip install git+git://github.com/kjordahl/geopandas.git + Dependencies ------------