Merge branch 'master' into develop

Author: sdispater

CHANGELOG.md

@@ -1,3 +1,15 @@
+### 0.5.4
+
+(August 30th, 2016)
+
+- [Fix] Fixes broken previous release.
+
+(August 29th, 2016)
+
+- [Fix] Fixes setters and modifiers (start_of/end_of) to properly apply DST transitions.
+- [Fix] Fixes timezone file loading on some installs (See [#34](https://github.com/sdispater/pendulum/issues/34))
+(Thanks to [mayfield](https://github.com/mayfield))
+
 ### 0.5.2
 
 (August 22nd, 2016)

Makefile

@@ -21,26 +21,28 @@ setup: setup-python
 test:
 	@py.test --cov=pendulum --cov-config .coveragerc tests/ -sq
 
-wheels: clean-wheels wheels_x64 wheels_i686
+wheels_x64: clean_wheels build_wheels_x64
 
-wheels_x64:
+wheels_i686: clean_wheels build_wheels_i686
+
+build_wheels_x64:
 	docker pull quay.io/pypa/manylinux1_x86_64
 	docker run --rm -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/build-wheels.sh
 
-wheels_i686:
+build_wheels_i686:
 	docker pull quay.io/pypa/manylinux1_i686
 	docker run --rm -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/build-wheels.sh
 
-clean-wheels:
+clean_wheels:
 	rm -rf wheelhouse/
 
-upload-wheels_x64:
+upload_wheels_x64:
 	@for f in wheelhouse/*manylinux1_x86_64.whl ; do \
 		echo "Upload $$f" ; \
 		python -m twine upload $$f ; \
 	done
 
-upload-wheels_i686:
+upload_wheels_i686:
 	@for f in wheelhouse/*manylinux1_i686.whl ; do \
 		echo "Upload $$f" ; \
 		python -m twine upload $$f ; \

build-wheels.sh

@@ -3,8 +3,12 @@ PYTHON_VERSIONS="cp27-cp27m cp35-cp35m"
 
 echo "Compile wheels"
 for PYTHON in ${PYTHON_VERSIONS}; do
-    /opt/python/${PYTHON}/bin/pip install -r /io/wheels-requirements.txt
-    /opt/python/${PYTHON}/bin/pip wheel /io/ -w /io/wheelhouse/
+    cd /io
+    /opt/python/${PYTHON}/bin/pip install -r wheels-requirements.txt
+    /opt/python/${PYTHON}/bin/pip install -r tests-requirements.txt
+    /opt/python/${PYTHON}/bin/python setup.py sdist --dist-dir wheelhouse --formats=gztar
+    /opt/python/${PYTHON}/bin/pip wheel --no-index --no-deps --wheel-dir wheelhouse wheelhouse/*.tar.gz
+    cd -
 done
 
 echo "Bundle external shared libraries into the wheels"

docs/conf.py

@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '0.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.2'
+release = '0.5.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pendulum/pendulum.py

@@ -471,25 +471,30 @@ def copy(self):
     ### Getters/Setters
 
     def year_(self, year):
-        return self.instance(self._datetime.replace(year=year))
+        return self._setter(year=year)
 
     def month_(self, month):
-        return self.instance(self._datetime.replace(month=month))
+        return self._setter(month=month)
 
     def day_(self, day):
-        return self.instance(self._datetime.replace(day=day))
+        return self._setter(day=day)
 
     def hour_(self, hour):
-        return self.instance(self._datetime.replace(hour=hour))
+        return self._setter(hour=hour)
 
     def minute_(self, minute):
-        return self.instance(self._datetime.replace(minute=minute))
+        return self._setter(minute=minute)
 
     def second_(self, second):
-        return self.instance(self._datetime.replace(second=second))
+        return self._setter(second=second)
 
     def microsecond_(self, microsecond):
-        return self.instance(self._datetime.replace(microsecond=microsecond))
+        return self._setter(microsecond=microsecond)
+
+    def _setter(self, **kwargs):
+        kwargs['tzinfo'] = None
+
+        return self.instance(self._datetime.replace(**kwargs), self._tz)
 
     def timezone_(self, tz):
         tz = self._safe_create_datetime_zone(tz)
@@ -642,10 +647,11 @@ def with_date(self, year, month, day):
         :rtype: Pendulum
         """
         dt = self._datetime.replace(
-            year=int(year), month=int(month), day=int(day)
+            year=int(year), month=int(month), day=int(day),
+            tzinfo=None
         )
 
-        return self.instance(dt)
+        return self.instance(dt, self._tz)
 
     def with_time(self, hour, minute, second, microsecond=0):
         """
@@ -667,10 +673,11 @@ def with_time(self, hour, minute, second, microsecond=0):
         """
         dt = self._datetime.replace(
             hour=int(hour), minute=int(minute), second=int(second),
-            microsecond=microsecond
+            microsecond=microsecond,
+            tzinfo=None
         )
 
-        return self.instance(dt)
+        return self.instance(dt, self._tz)
 
     def with_date_time(self, year, month, day, hour, minute, second, microsecond=0):
         """
@@ -688,10 +695,11 @@ def with_date_time(self, year, month, day, hour, minute, second, microsecond=0):
         dt = self._datetime.replace(
             year=year, month=month, day=day,
             hour=int(hour), minute=int(minute), second=int(second),
-            microsecond=microsecond
+            microsecond=microsecond,
+            tzinfo=None
         )
 
-        return self.instance(dt)
+        return self.instance(dt, self._tz)
 
     def with_time_from_string(self, time):
         """

pendulum/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-VERSION = '0.5.2'
+VERSION = '0.5.4'

setup.py

@@ -90,7 +90,7 @@ def build_extension(self, ext):
     author_email='[email protected]',
     url='https://github.com/sdispater/pendulum',
     download_url='https://github.com/sdispater/pendulum/archive/%s.tar.gz' % __version__,
-    packages=['pendulum'],
+    packages=find_packages(exclude=['tests']),
     install_requires=[
         'tzlocal',
         'pytz',

tests/localization_tests/__init__.py

@@ -14,7 +14,8 @@ def tearDown(self):
         Pendulum.set_locale('en')
 
     def test_diff_for_humans_localized(self):
-        self.diff_for_humans()
+        with Pendulum.test(Pendulum(2016, 8, 29)):
+            self.diff_for_humans()
 
     def diff_for_humans(self):
         raise NotImplementedError()

tests/localization_tests/test_da.py

@@ -12,56 +12,55 @@ class DaTest(AbstractLocalizationTestCase, AbstractTestCase):
     locale = 'da'
 
     def diff_for_humans(self):
-        with self.wrap_with_test_now():
-            d = Pendulum.now().subtract(seconds=1)
-            self.assertEqual('1 sekund siden', d.diff_for_humans())
+        d = Pendulum.now().subtract(seconds=1)
+        self.assertEqual('1 sekund siden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(seconds=2)
-            self.assertEqual('2 sekunder siden', d.diff_for_humans())
+        d = Pendulum.now().subtract(seconds=2)
+        self.assertEqual('2 sekunder siden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(minutes=1)
-            self.assertEqual('1 minut siden', d.diff_for_humans())
+        d = Pendulum.now().subtract(minutes=1)
+        self.assertEqual('1 minut siden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(minutes=2)
-            self.assertEqual('2 minutter siden', d.diff_for_humans())
+        d = Pendulum.now().subtract(minutes=2)
+        self.assertEqual('2 minutter siden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(hours=1)
-            self.assertEqual('1 time siden', d.diff_for_humans())
+        d = Pendulum.now().subtract(hours=1)
+        self.assertEqual('1 time siden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(hours=2)
-            self.assertEqual('2 timer siden', d.diff_for_humans())
+        d = Pendulum.now().subtract(hours=2)
+        self.assertEqual('2 timer siden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(days=1)
-            self.assertEqual('1 dag siden', d.diff_for_humans())
+        d = Pendulum.now().subtract(days=1)
+        self.assertEqual('1 dag siden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(days=2)
-            self.assertEqual('2 dage siden', d.diff_for_humans())
+        d = Pendulum.now().subtract(days=2)
+        self.assertEqual('2 dage siden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(weeks=1)
-            self.assertEqual('1 uge siden', d.diff_for_humans())
+        d = Pendulum.now().subtract(weeks=1)
+        self.assertEqual('1 uge siden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(weeks=2)
-            self.assertEqual('2 uger siden', d.diff_for_humans())
+        d = Pendulum.now().subtract(weeks=2)
+        self.assertEqual('2 uger siden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(months=1)
-            self.assertEqual('1 måned siden', d.diff_for_humans())
+        d = Pendulum.now().subtract(months=1)
+        self.assertEqual('1 måned siden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(months=2)
-            self.assertEqual('2 måneder siden', d.diff_for_humans())
+        d = Pendulum.now().subtract(months=2)
+        self.assertEqual('2 måneder siden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(years=1)
-            self.assertEqual('1 år siden', d.diff_for_humans())
+        d = Pendulum.now().subtract(years=1)
+        self.assertEqual('1 år siden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(years=2)
-            self.assertEqual('2 år siden', d.diff_for_humans())
+        d = Pendulum.now().subtract(years=2)
+        self.assertEqual('2 år siden', d.diff_for_humans())
 
-            d = Pendulum.now().add(seconds=1)
-            self.assertEqual('om 1 sekund', d.diff_for_humans())
+        d = Pendulum.now().add(seconds=1)
+        self.assertEqual('om 1 sekund', d.diff_for_humans())
 
-            d = Pendulum.now().add(seconds=1)
-            d2 = Pendulum.now()
-            self.assertEqual('1 sekund efter', d.diff_for_humans(d2))
-            self.assertEqual('1 sekund før', d2.diff_for_humans(d))
+        d = Pendulum.now().add(seconds=1)
+        d2 = Pendulum.now()
+        self.assertEqual('1 sekund efter', d.diff_for_humans(d2))
+        self.assertEqual('1 sekund før', d2.diff_for_humans(d))
 
-            self.assertEqual('1 sekund', d.diff_for_humans(d2, True))
-            self.assertEqual('2 sekunder', d2.diff_for_humans(d.add(seconds=1), True))
+        self.assertEqual('1 sekund', d.diff_for_humans(d2, True))
+        self.assertEqual('2 sekunder', d2.diff_for_humans(d.add(seconds=1), True))

tests/localization_tests/test_de.py

@@ -12,56 +12,55 @@ class DeTest(AbstractLocalizationTestCase, AbstractTestCase):
     locale = 'de'
 
     def diff_for_humans(self):
-        with self.wrap_with_test_now():
-            d = Pendulum.now().subtract(seconds=1)
-            self.assertEqual('vor 1 Sekunde', d.diff_for_humans())
+        d = Pendulum.now().subtract(seconds=1)
+        self.assertEqual('vor 1 Sekunde', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(seconds=2)
-            self.assertEqual('vor 2 Sekunden', d.diff_for_humans())
+        d = Pendulum.now().subtract(seconds=2)
+        self.assertEqual('vor 2 Sekunden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(minutes=1)
-            self.assertEqual('vor 1 Minute', d.diff_for_humans())
+        d = Pendulum.now().subtract(minutes=1)
+        self.assertEqual('vor 1 Minute', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(minutes=2)
-            self.assertEqual('vor 2 Minuten', d.diff_for_humans())
+        d = Pendulum.now().subtract(minutes=2)
+        self.assertEqual('vor 2 Minuten', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(hours=1)
-            self.assertEqual('vor 1 Stunde', d.diff_for_humans())
+        d = Pendulum.now().subtract(hours=1)
+        self.assertEqual('vor 1 Stunde', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(hours=2)
-            self.assertEqual('vor 2 Stunden', d.diff_for_humans())
+        d = Pendulum.now().subtract(hours=2)
+        self.assertEqual('vor 2 Stunden', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(days=1)
-            self.assertEqual('vor 1 Tag', d.diff_for_humans())
+        d = Pendulum.now().subtract(days=1)
+        self.assertEqual('vor 1 Tag', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(days=2)
-            self.assertEqual('vor 2 Tagen', d.diff_for_humans())
+        d = Pendulum.now().subtract(days=2)
+        self.assertEqual('vor 2 Tagen', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(weeks=1)
-            self.assertEqual('vor 1 Woche', d.diff_for_humans())
+        d = Pendulum.now().subtract(weeks=1)
+        self.assertEqual('vor 1 Woche', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(weeks=2)
-            self.assertEqual('vor 2 Wochen', d.diff_for_humans())
+        d = Pendulum.now().subtract(weeks=2)
+        self.assertEqual('vor 2 Wochen', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(months=1)
-            self.assertEqual('vor 1 Monat', d.diff_for_humans())
+        d = Pendulum.now().subtract(months=1)
+        self.assertEqual('vor 1 Monat', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(months=2)
-            self.assertEqual('vor 2 Monaten', d.diff_for_humans())
+        d = Pendulum.now().subtract(months=2)
+        self.assertEqual('vor 2 Monaten', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(years=1)
-            self.assertEqual('vor 1 Jahr', d.diff_for_humans())
+        d = Pendulum.now().subtract(years=1)
+        self.assertEqual('vor 1 Jahr', d.diff_for_humans())
 
-            d = Pendulum.now().subtract(years=2)
-            self.assertEqual('vor 2 Jahren', d.diff_for_humans())
+        d = Pendulum.now().subtract(years=2)
+        self.assertEqual('vor 2 Jahren', d.diff_for_humans())
 
-            d = Pendulum.now().add(seconds=1)
-            self.assertEqual('in 1 Sekunde', d.diff_for_humans())
+        d = Pendulum.now().add(seconds=1)
+        self.assertEqual('in 1 Sekunde', d.diff_for_humans())
 
-            d = Pendulum.now().add(seconds=1)
-            d2 = Pendulum.now()
-            self.assertEqual('1 Sekunde später', d.diff_for_humans(d2))
-            self.assertEqual('1 Sekunde zuvor', d2.diff_for_humans(d))
+        d = Pendulum.now().add(seconds=1)
+        d2 = Pendulum.now()
+        self.assertEqual('1 Sekunde später', d.diff_for_humans(d2))
+        self.assertEqual('1 Sekunde zuvor', d2.diff_for_humans(d))
 
-            self.assertEqual('1 Sekunde', d.diff_for_humans(d2, True))
-            self.assertEqual('2 Sekunden', d2.diff_for_humans(d.add(seconds=1), True))
+        self.assertEqual('1 Sekunde', d.diff_for_humans(d2, True))
+        self.assertEqual('2 Sekunden', d2.diff_for_humans(d.add(seconds=1), True))