summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Collins <robertc@robertcollins.net>2015-05-04 16:06:50 +1200
committerRobert Collins <robertc@robertcollins.net>2015-05-04 16:06:50 +1200
commit18ea57d2ef915c35e953864b1f8aa4cb98cbd75c (patch)
tree07728eac103cc95f393003e3403d830a2d1bf890
parent89856bda75a45e4ffa634e214cfc9ecdbf74aed6 (diff)
downloadfixtures-git-18ea57d2ef915c35e953864b1f8aa4cb98cbd75c.tar.gz
Release 1.1.0 and use pbr 0.11 features.1.1.0
-rw-r--r--HACKING6
-rw-r--r--NEWS3
-rw-r--r--fixtures/__init__.py11
-rw-r--r--requirements.txt1
4 files changed, 11 insertions, 10 deletions
diff --git a/HACKING b/HACKING
index b27e72b..075f234 100644
--- a/HACKING
+++ b/HACKING
@@ -36,12 +36,12 @@ the fixtures __init__.py.
Releasing
+++++++++
-1. Update the version number in __init__.py and add a version to NEWS.
-
-1. Upload to pypi, signed.
+1. Add a version to NEWS.
1. commit, tag.
+1. Upload to pypi, signed.
+
1. Close bugs.
1. Rename the next milestone, release it, and make a new one.
diff --git a/NEWS b/NEWS
index c887864..22dc7a6 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ fixtures release notes
NEXT
~~~~
+1.1.0
+~~~~~
+
CHANGES
-------
diff --git a/fixtures/__init__.py b/fixtures/__init__.py
index 0eb7c04..192643d 100644
--- a/fixtures/__init__.py
+++ b/fixtures/__init__.py
@@ -36,13 +36,10 @@ Most users will want to look at TestWithFixtures and Fixture, to start with.
# established at this point, and setup.py will use a version of next-$(revno).
# If the releaselevel is 'final', then the tarball will be major.minor.micro.
# Otherwise it is major.minor.micro~$(revno).
-
-# Uncomment when pbr 0.11 is released.
-#import pbr.version
-#_version = pbr.version.VersionInfo('fixtures').semantic_version()
-#__version__ = _version.version_tuple()
-#version = _version.release_string()
-__version__ = (1, 0, 0, 'final', 0)
+from pbr.version import VersionInfo
+_version = VersionInfo('fixtures')
+__version__ = _version.semantic_version().version_tuple()
+version = _version.release_string()
__all__ = [
diff --git a/requirements.txt b/requirements.txt
index 61b1d47..f9efc61 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
+pbr>=0.11
testtools>=0.9.22