Merge branch 'master' into develop

Author: sdispater

CHANGELOG.md

@@ -1,6 +1,44 @@
 # Change Log
 
-## [Unreleased]
+## [1.2.5] - 2017-09-04
+
+### Fixed
+
+- Fixed normalization of microseconds in durations.
+- Fixed microseconds not being included in `average()`. (Thanks to [ericfrederich](https://github.com/ericfrederich)) 
+
+
+## [1.2.4] - 2017-06-20
+
+### Fixed
+
+- Fixed parsing of the `now` string.
+
+
+## [1.2.3] - 2017-06-18
+
+### Fixed
+
+- Fixed behavior of some short timezones (like EST, MST or HST).
+- Fixed warning when building C extensions.
+
+
+## [1.2.2] - 2017-06-15
+
+### Fixed
+
+- Fixed `next()` and `previous()` hanging when passed an invalid input.
+- Fixed wrong result when adding/subtracting a Period if a DST transition occurs.
+
+
+## [1.2.1] - 2017-05-23
+
+### Fixed
+- Fixed incorrect `fold` attribute on Python 3.6 when not passing a timezone. (Thanks to [neonquill](https://github.com/neonquill))
+
+
+
+## [1.2.0] - 2017-03-24
 
 ### Added
 
@@ -356,7 +394,13 @@ Initial release
 
 
 
-[Unreleased]: https://github.com/sdispater/pendulum/compare/master...develop
+[Unreleased]: https://github.com/sdispater/pendulum/compare/1.2.5...master
+[1.2.5]: https://github.com/sdispater/pendulum/releases/tag/1.2.5
+[1.2.4]: https://github.com/sdispater/pendulum/releases/tag/1.2.4
+[1.2.3]: https://github.com/sdispater/pendulum/releases/tag/1.2.3
+[1.2.2]: https://github.com/sdispater/pendulum/releases/tag/1.2.2
+[1.2.1]: https://github.com/sdispater/pendulum/releases/tag/1.2.1
+[1.2.0]: https://github.com/sdispater/pendulum/releases/tag/1.2.0
 [1.1.1]: https://github.com/sdispater/pendulum/releases/tag/1.1.1
 [1.1.0]: https://github.com/sdispater/pendulum/releases/tag/1.1.0
 [1.0.2]: https://github.com/sdispater/pendulum/releases/tag/1.0.2

MANIFEST.in

@@ -1,3 +1,2 @@
 include README.rst LICENSE
-recursive-exclude tests *
-recursive-exclude benchmark *
+exclude test*

README.rst

@@ -10,7 +10,7 @@ Pendulum
 .. image:: https://img.shields.io/codecov/c/github/sdispater/pendulum/master.svg
     :target: https://codecov.io/gh/sdispater/pendulum/branch/master
 
-.. image:: https://travis-ci.org/sdispater/pendulum.png
+.. image:: https://travis-ci.org/sdispater/pendulum.svg
     :alt: Pendulum Build status
     :target: https://travis-ci.org/sdispater/pendulum
 

docs/_docs/difference.rst

@@ -83,7 +83,7 @@ You may also pass ``True`` as a 2nd parameter to remove the modifiers `ago`, `fr
     # The most typical usage is for comments
     # The instance is the date the comment was created
     # and its being compared to default now()
-    pendulum.now().subtract(dayss=1).diff_for_humans()
+    pendulum.now().subtract(days=1).diff_for_humans()
     '5 days ago'
 
     pendulum.now().diff_for_humans(Pendulum.now().subtract(years=1))

docs/_docs/instantiation.rst

@@ -18,6 +18,12 @@ You'll notice above that the timezone (2nd) parameter was passed as a string and
 rather than a ``tzinfo`` instance. All timezone parameters have been augmented
 so you can pass a ``tzinfo`` instance, string or integer offset to GMT
 and the timezone will be created for you.
+
+.. note::
+
+    Supported strings for timezones are the one provided by the `IANA time zone database <https://www.iana.org/time-zones>`_.
+    The special ``local`` string is also supported and will return your current timezone.
+
 This is again shown in the next example which also introduces the ``now()`` function.
 
 .. code-block:: python
@@ -74,7 +80,7 @@ or simply a string timezone value.
 
 .. code-block:: python
 
-    pendulum.from_format(time, format, tz)
+    pendulum.from_format(time, fmt, tz)
 
 ``from_format()`` is mostly a wrapper for the base Python function ``datetime.strptime()``.
 The difference being the addition the ``tz`` argument that can be a ``tzinfo`` instance or a string timezone value

docs/conf.py

@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1'
+version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.1'
+release = '1.2.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pendulum/_compat.py

@@ -4,23 +4,22 @@
 
 PY2 = sys.version_info[0] == 2
 PY3K = sys.version_info[0] >= 3
-PY33 = sys.version_info >= (3, 3)
 PY36 = sys.version_info >= (3, 6)
 
 
-if PY2:
-    long = long
-    unicode = unicode
-    basestring = basestring
-else:
+try:               # Python 2
+    long
+    unicode
+    basestring
+except NameError:  # Python 3
     long = int
     unicode = str
     basestring = str
 
-if PY33:
+try:               # Python >= 3.3
     FileNotFoundError = FileNotFoundError
-else:
-    FileNotFoundError = IOError # cf PEP-3151 
+except NameError:  # Python < 3.3
+    FileNotFoundError = IOError  # cf PEP-3151 
 
 def decode(string, encodings=None):
     if not PY2 and not isinstance(string, bytes):
@@ -29,8 +28,7 @@ def decode(string, encodings=None):
     if PY2 and isinstance(string, unicode):
         return string
 
-    if encodings is None:
-        encodings = ['utf-8', 'latin1', 'ascii']
+    encodings = encodings or ['utf-8', 'latin1', 'ascii']
 
     for encoding in encodings:
         try:
@@ -48,8 +46,7 @@ def encode(string, encodings=None):
     if PY2 and isinstance(string, str):
         return string
 
-    if encodings is None:
-        encodings = ['utf-8', 'latin1', 'ascii']
+    encodings = encodings or ['utf-8', 'latin1', 'ascii']
 
     for encoding in encodings:
         try:

pendulum/_extensions/_helpers.c

@@ -426,7 +426,6 @@ PyObject* parse_iso8601(PyObject *self, PyObject *args) {
     int separators = 0;
     int time = 0;
     int has_time = 0;
-    int has_hour = 0;
     int has_offset = 0;
     int i;
     int j;
@@ -710,7 +709,6 @@ PyObject* parse_iso8601(PyObject *self, PyObject *args) {
                 }
 
                 hour = time;
-                has_hour = 1;
                 break;
             case 4:
                 // Hours and minutes
@@ -725,7 +723,6 @@ PyObject* parse_iso8601(PyObject *self, PyObject *args) {
 
                 hour = time / 100;
                 minute = time % 100;
-                has_hour = 1;
                 break;
             case 6:
                 // Hours, minutes and seconds
@@ -740,7 +737,6 @@ PyObject* parse_iso8601(PyObject *self, PyObject *args) {
                 hour = time / 10000;
                 minute = time / 100 % 100;
                 second = time % 100;
-                has_hour = 1;
                 break;
             default:
                 // Any other case is wrong

pendulum/date.py

@@ -848,6 +848,9 @@ def next(self, day_of_week=None):
         if day_of_week is None:
             day_of_week = self.day_of_week
 
+        if day_of_week < SUNDAY or day_of_week > SATURDAY:
+            raise ValueError('Invalid day of week')
+
         dt = self.add(days=1)
         while dt.day_of_week != day_of_week:
             dt = dt.add(days=1)
@@ -869,6 +872,9 @@ def previous(self, day_of_week=None):
         if day_of_week is None:
             day_of_week = self.day_of_week
 
+        if day_of_week < SUNDAY or day_of_week > SATURDAY:
+            raise ValueError('Invalid day of week')
+
         dt = self.subtract(days=1)
         while dt.day_of_week != day_of_week:
             dt = dt.subtract(days=1)

pendulum/formatting/difference_formatter.py

@@ -55,7 +55,7 @@ def diff_for_humans(self, date, other=None, absolute=False, locale=None):
             unit = 'month'
             count = diff.months
 
-            if (diff.weeks * 7 + diff.remaining_days) > 28:
+            if (diff.weeks * 7 + diff.remaining_days) >= 27:
                 count += 1
         elif diff.weeks > 0:
             unit = 'week'