summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Bishop <stuart@stuartbishop.net>2013-10-01 12:02:28 +0000
committerStuart Bishop <stuart@stuartbishop.net>2013-10-01 12:02:28 +0000
commit6bd8c8fcd58653e4cdb714f9a9cf7d08a75bc1eb (patch)
tree37dfc3eadbee2a48c0b9c66726159c128185a214
parent2255cfc00dadce3ac268ec75e14c8a049f40f8c1 (diff)
downloadpytz-6bd8c8fcd58653e4cdb714f9a9cf7d08a75bc1eb.tar.gz
Bump version to 2013.6, switching to pip compatible version numberingrelease_2013.6
-rw-r--r--src/pytz/__init__.py6
-rw-r--r--src/pytz/tests/test_tzinfo.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/pytz/__init__.py b/src/pytz/__init__.py
index 1903763..67783ca 100644
--- a/src/pytz/__init__.py
+++ b/src/pytz/__init__.py
@@ -9,11 +9,11 @@ on how to use these modules.
'''
# The Olson database is updated several times a year.
-OLSON_VERSION = '2013e'
-VERSION = OLSON_VERSION
+OLSON_VERSION = '2013f'
+VERSION = '2013.6' # Switching to pip compatible version numbering.
# Version format for a patch release - only one so far.
#VERSION = OLSON_VERSION + '.2'
-__version__ = OLSON_VERSION
+__version__ = VERSION
OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling
diff --git a/src/pytz/tests/test_tzinfo.py b/src/pytz/tests/test_tzinfo.py
index d56c7d0..1e1787d 100644
--- a/src/pytz/tests/test_tzinfo.py
+++ b/src/pytz/tests/test_tzinfo.py
@@ -21,7 +21,7 @@ from pytz.tzinfo import DstTzInfo, StaticTzInfo
# I test for expected version to ensure the correct version of pytz is
# actually being tested.
-EXPECTED_VERSION='2013e'
+EXPECTED_VERSION='2013.6'
fmt = '%Y-%m-%d %H:%M:%S %Z%z'