summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Bishop <stuart@stuartbishop.net>2016-03-14 03:34:42 +0000
committerStuart Bishop <stuart@stuartbishop.net>2016-03-14 03:34:42 +0000
commite25bb4d61dfab080937dae8e1a3a8b3a64d1df89 (patch)
tree8a3d49e5ed866b5466f46c5830162277f8947450
parentd2bf4282cc2ecfedd9f3a005ea33b3a2d4239349 (diff)
downloadpytz-e25bb4d61dfab080937dae8e1a3a8b3a64d1df89.tar.gz
Bump version numbers to 2016.1/2016a
-rw-r--r--src/pytz/__init__.py10
-rw-r--r--src/pytz/tests/test_tzinfo.py4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/pytz/__init__.py b/src/pytz/__init__.py
index 51406ca..373e1fb 100644
--- a/src/pytz/__init__.py
+++ b/src/pytz/__init__.py
@@ -9,8 +9,8 @@ on how to use these modules.
'''
# The Olson database is updated several times a year.
-OLSON_VERSION = '2015g'
-VERSION = '2015.7' # Switching to pip compatible version numbering.
+OLSON_VERSION = '2016a'
+VERSION = '2016.1' # Switching to pip compatible version numbering.
__version__ = VERSION
OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling
@@ -110,7 +110,7 @@ def resource_exists(name):
# module, as well as the Zope3 i18n package. Perhaps we should just provide
# the POT file and translations, and leave it up to callers to make use
# of them.
-#
+#
# t = gettext.translation(
# 'pytz', os.path.join(os.path.dirname(__file__), 'locales'),
# fallback=True
@@ -123,7 +123,7 @@ def resource_exists(name):
_tzinfo_cache = {}
def timezone(zone):
- r''' Return a datetime.tzinfo implementation for the given timezone
+ r''' Return a datetime.tzinfo implementation for the given timezone
>>> from datetime import datetime, timedelta
>>> utc = timezone('UTC')
@@ -247,7 +247,7 @@ UTC = utc = UTC() # UTC is a singleton
def _UTC():
"""Factory function for utc unpickling.
- Makes sure that unpickling a utc instance always returns the same
+ Makes sure that unpickling a utc instance always returns the same
module global.
These examples belong in the UTC class above, but it is obscured; or in
diff --git a/src/pytz/tests/test_tzinfo.py b/src/pytz/tests/test_tzinfo.py
index 4b192a0..567be45 100644
--- a/src/pytz/tests/test_tzinfo.py
+++ b/src/pytz/tests/test_tzinfo.py
@@ -21,8 +21,8 @@ from pytz.tzinfo import DstTzInfo, StaticTzInfo
# I test for expected version to ensure the correct version of pytz is
# actually being tested.
-EXPECTED_VERSION='2015.7'
-EXPECTED_OLSON_VERSION='2015g'
+EXPECTED_VERSION='2016.1'
+EXPECTED_OLSON_VERSION='2016a'
fmt = '%Y-%m-%d %H:%M:%S %Z%z'