Merge branch 'master' into develop

Author: sdispater

CHANGELOG.md

@@ -36,6 +36,13 @@
 - Fixed `minute_()`, `second_()` and `microsecond_()` setters changing the hour unit.
 
 
+## [0.6.6] - 2016-11-25
+
+### Fixed
+
+- Fixed a memory leak in C extension. (thanks to [ntoll](https://github.com/ntoll))
+
+
 ## [0.6.5] - 2016-10-31
 
 ### Changed
@@ -263,7 +270,11 @@ This version causes major breaking API changes to simplify it and making it more
 Initial release
 
 
+<<<<<<< HEAD
 [Unreleased]: https://github.com/sdispater/pendulum/compare/master...develop
+=======
+[0.6.6]: https://github.com/sdispater/pendulum/releases/tag/0.6.6
+>>>>>>> master
 [0.6.5]: https://github.com/sdispater/pendulum/releases/tag/0.6.5
 [0.6.4]: https://github.com/sdispater/pendulum/releases/tag/0.6.4
 [0.6.3]: https://github.com/sdispater/pendulum/releases/tag/0.6.3

MANIFEST.in

@@ -1,4 +1,3 @@
 include README.rst LICENSE
-include pendulum/_extensions/tz/*.pyx
 recursive-exclude tests *
 recursive-exclude benchmark *

docs/conf.py

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

pendulum/_extensions/_helpers.c

@@ -181,8 +181,7 @@ PyObject* local_time(PyObject *self, PyObject *args) {
     minute = seconds / SECS_PER_MIN;
     second = seconds % SECS_PER_MIN;
 
-    return PyTuple_Pack(
-        7,
+    return Py_BuildValue("NNNNNNN",
         PyLong_FromLong(year),
         PyLong_FromLong(month),
         PyLong_FromLong(day),

pendulum/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-VERSION = '0.6.5'
+VERSION = '0.6.6'

setup.py

@@ -35,7 +35,7 @@ def get_version():
 if with_extensions == '1' or with_extensions is None:
     with_extensions = True
 
-if hasattr(sys, 'pypy_version_info'):
+if with_extensions == '0' or hasattr(sys, 'pypy_version_info'):
     with_extensions = False
 
 extensions = []
@@ -46,7 +46,6 @@ def get_version():
                   extra_compile_args=['-Wno-unused-function']),
     ]
 
-
 class BuildFailed(Exception):
 
     pass