Preparing for the next release.

frederickjansen · Oct 12, 2014 · 5006f68 · 5006f68
1 parent f30692a
commit 5006f68
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,6 @@ python:
   - "3.3"
   - "3.4"
 install:
-  - "make --quiet travis-setup"
+  - "make --quiet reqs"
 script:
-  - "make --quiet travis-tests"
+  - "make --quiet test"
diff --git a/Makefile b/Makefile
@@ -10,6 +10,6 @@ pep8-tests:
 unit-tests:
 	nosetests
 
-travis-setup: setup-base-dependencies setup-test-dependencies
+reqs: setup-base-dependencies setup-test-dependencies
 
-travis-tests: pep8-tests unit-tests
+test: pep8-tests unit-tests
diff --git a/README.rst b/README.rst
@@ -10,12 +10,11 @@ polyline
 .. image:: https://pypip.in/d/polyline/badge.png
         :target: https://crate.io/packages/polyline/
 
-A Python implementation of Google's Encoded Polyline Algorithm Format
-(http://goo.gl/PvXf8Y). This is essentially a port of
+``polyline`` is a Python implementation of Google's Encoded Polyline Algorithm
+Format (http://goo.gl/PvXf8Y). It is essentially a port of
 https://github.com/mapbox/polyline built with Python 2 and 3 support in mind.
 
-The documentation for ``polyline`` can be found at
-http://polyline.readthedocs.org/.
+The documentation for ``polyline`` can be found at http://polyline.rtfd.org/.
 
 License
 -------

diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.0'
+release = '1.1-dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.rst b/docs/index.rst
@@ -3,17 +3,11 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-========
-polyline
-========
-
-.. contents::
-
 Introduction
 ============
 
-A Python implementation of Google's Encoded Polyline Algorithm Format
-(http://goo.gl/PvXf8Y). This is essentially a port of
+``polyline`` is a Python implementation of Google's Encoded Polyline Algorithm
+Format (http://goo.gl/PvXf8Y). It is essentially a port of
 https://github.com/mapbox/polyline built with Python 2 and 3 support in mind.
 
 Installation

diff --git a/polyline/__init__.py b/polyline/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '1.0'
+__version__ = '1.1-dev'
 
-from polyline.codec import PolylineCodec  # NOQA
+from .codec import PolylineCodec  # NOQA
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
 
 setup(
     name='polyline',
-    version='1.0',
+    version='1.1-dev',
     description=desc,
     long_description=long_desc,
     author='Bruno M. Custódio',
@@ -33,7 +33,7 @@
     license='MIT',
     zip_safe=False,
     classifiers=(
-        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 2 - Pre-Alpha',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',

diff --git a/test/test_codec.py b/test/test_codec.py
@@ -1,6 +1,6 @@
 import unittest
 
-from polyline.codec import PolylineCodec
+from polyline import PolylineCodec
 
 
 class PolylineCodecTestCase(unittest.TestCase):