VERSION: 1.2.5

arvinpan · Jan 31, 2015 · 9220931 · 9220931
1 parent 882a018
commit 9220931
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 40 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.5a1
+current_version = 1.2.5
 files = behave/__init__.py setup.py VERSION.txt .bumpversion.cfg
 commit = False
 tag = False

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,14 +1,19 @@
 Version History
 ===============================================================================
 
-Version: 1.2.5a1 (unreleased)
+Version: 1.2.6a1 (unreleased)
 -------------------------------------------------------------------------------
 
 GOALS:
 
-  - Improve support for Python3 (>= 3.3)
   - Improve support for Windows
 
+
+Version: 1.2.5 (2015-01-31)
+-------------------------------------------------------------------------------
+
+:Same as: Version 1.2.5a1 (unreleased).
+
 NEWS and CHANGES:
 
   - General:

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-1.2.5a1
+1.2.5
diff --git a/behave/__init__.py b/behave/__init__.py
@@ -26,4 +26,4 @@
     # -- DEPRECATING:
     "step_matcher"
 ]
-__version__ = '1.2.5a1'
+__version__ = '1.2.5'
diff --git a/behave/configuration.py b/behave/configuration.py
@@ -85,7 +85,8 @@ class ConfigError(Exception):
 
     (('-D', '--define'),
      dict(dest='userdata_defines', type=parse_user_define, action='append',
-          help="""Define user-specific data in config.userdata dictionary.
+          metavar="NAME=VALUE",
+          help="""Define user-specific data for the config.userdata dictionary.
                   Example: -D foo=bar to store it in config.userdata["foo"].""")),
 
     (('-e', '--exclude'),

diff --git a/requirements/all.txt b/requirements/all.txt
@@ -12,6 +12,5 @@
 -r testing.txt
 -r develop.txt
 -r docs.txt
--r more_py25.txt
 -r more_py26.txt
 -r json.txt
diff --git a/requirements/basic.txt b/requirements/basic.txt
@@ -8,7 +8,7 @@
 #  * http://www.pip-installer.org/
 # ============================================================================
 
-argparse >= 1.1
+argparse >= 1.3
 parse >= 1.6.3
 parse_type >= 0.3.4
-six >= 1.5
+six >= 1.9
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -1,15 +1,10 @@
 # ============================================================================
 # BEHAVE: PYTHON PACKAGE REQUIREMENTS: For documentation generation
 # ============================================================================
+# REQUIRES: pip >= 6.0
 
-Sphinx >= 1.2.2
+Sphinx >= 1.2.3
 
 # -- PROBLEM-WITH-PYTHON3:
-# sphinxcontrib-cheeseshop >= 0.2
-sphinxcontrib-cheeseshop >= 0.2
-
-# -- PIP WHEEL OOPS: with pip 1.5.2
-# When Sphinx wheel is downloaded, the dependent packages are not downloaded.
-# Pygments
-# Jinja2
-# docutils
+# ONLY PYTHON2: sphinxcontrib-cheeseshop
+sphinxcontrib-cheeseshop >= 0.2; python_version < '3.0'
diff --git a/requirements/more_py25.txt b/requirements/more_py25.txt
diff --git a/requirements/more_py26.txt b/requirements/more_py26.txt
@@ -1,6 +1,7 @@
 # ============================================================================
 # BEHAVE: PYTHON PACKAGE REQUIREMENTS: More packages for Python2.6
 # ============================================================================
+# REQUIRE: pip >= 6.0
 
-ordereddict
-importlib
+ordereddict; python_version <= '2.6'
+importlib;   python_version <= '2.6'
diff --git a/requirements/optional.txt b/requirements/optional.txt
diff --git a/setup.cfg b/setup.cfg
@@ -2,6 +2,12 @@
 docs = build_sphinx
 test = nosetests
 
+[sdist]
+formats = zip, gztar, bztar
+
+[bdist_wheel]
+universal = true
+
 [upload_docs]
 upload-dir = build/docs/html
 

diff --git a/setup.py b/setup.py
@@ -56,7 +56,7 @@ def find_packages_by_root_package(where):
 # -----------------------------------------------------------------------------
 setup(
     name="behave",
-    version="1.2.5a1",
+    version="1.2.5",
     description="behave is behaviour-driven development, Python style",
     long_description=description,
     author="Benno Rice, Richard Jones and Jens Engel",

diff --git a/setuptools_behave.py b/setuptools_behave.py
@@ -31,7 +31,7 @@ class behave_test(Command):
     description = "Run feature tests with behave"
     default_format = "progress"
     default_args   = "features"
-    local_egg_dir  = "eggs"
+    local_egg_dir  = ".eggs"
     command_consumes_arguments = False
     user_options = [
         ("format=", "f", "Use formatter (default: %s)" % default_format),
@@ -71,7 +71,7 @@ def _ensure_required_packages_are_installed(self, install_dir="."):
         initial_dir = os.getcwd()
         try:
             dir_util.mkpath(install_dir)
-            os.chdir(self.local_egg_dir)
+            # -- NO LONGER NEEDED: os.chdir(self.local_egg_dir)
             if self.distribution.install_requires:
                 self.distribution.fetch_build_eggs(self.distribution.install_requires)
             if self.distribution.tests_require:

diff --git a/tox.ini b/tox.ini
@@ -37,10 +37,11 @@ minversion   = 1.8
 envlist      = py26, py27, py33, py34, pypy, docs
 sitepackages = False
 indexserver =
-    default = file://{homedir}/.pip/downloads/simple
-    local1  = file://{toxinidir}/downloads/simple
-    local2  = file://{homedir}/.pip/downloads/simple
-    pypi    = https://pypi.python.org/simple
+    default  = https://pypi.python.org/simple
+    default2 = file://{homedir}/.pip/downloads/simple
+    local1   = file://{toxinidir}/downloads/simple
+    local2   = file://{homedir}/.pip/downloads/simple
+    pypi     = https://pypi.python.org/simple
 
 # -----------------------------------------------------------------------------
 # TOX PREPARE/BOOTSTRAP: Initialize local workspace for tox off-line usage