Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'release/1.1' into develop

  • Loading branch information...
commit 5b093e2470d54a8226090d65294060f89357f1fe 2 parents e063132 + 40ac381
@jezdez jezdez authored
Showing with 6 additions and 6 deletions.
  1. +1 −1  docs/conf.py
  2. +4 −4 docs/news.txt
  3. +1 −1  setup.py
View
2  docs/conf.py
@@ -47,7 +47,7 @@
# built documents.
#
# The short X.Y version.
-release = "1.0.2.post1"
+release = "1.1"
version = '.'.join(release.split('.')[:2])
# The language for content autogenerated by Sphinx. Refer to documentation
View
8 docs/news.txt
@@ -5,13 +5,13 @@ News
Changelog
=========
-Next release (1.1) schedule
+Next release (1.2) schedule
---------------------------
-Beta and final releases planned for the first half of 2012.
+Beta and final releases planned for the second half of 2012.
-develop (unreleased)
---------------------
+1.1 (2012-02-16)
+----------------
* Fixed issue #326 - don't crash when a package's setup.py emits UTF-8 and
then fails. Thanks Marc Abramowitz.
View
2  setup.py
@@ -3,7 +3,7 @@
from setuptools import setup
# If you change this version, change it also in docs/conf.py
-version = "1.0.2.post1"
+version = "1.1"
doc_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)), "docs")
index_filename = os.path.join(doc_dir, "index.txt")
Please sign in to comment.
Something went wrong with that request. Please try again.