Merge branch 'master' into py34,py38

* master: Back to development: 4.5.1 Preparing release 4.5.0 Drop Python 3.4 support Oh, actually it was my mistake Why does Microsoft even exist? Fix C compilation warning # Conflicts: # CHANGES.rst # setup.py # tox.ini
zopefoundation · May 15, 2019 · 0dd3332 · 0dd3332
2 parents 3c4f527 + 1b2ffc3
commit 0dd3332
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 15 deletions.
diff --git a/.manylinux-install.sh b/.manylinux-install.sh
@@ -5,7 +5,6 @@ set -e -x
 # Compile wheels
 for PYBIN in /opt/python/*/bin; do
     if [[ "${PYBIN}" == *"cp27"* ]] || \
-       [[ "${PYBIN}" == *"cp34"* ]] || \
        [[ "${PYBIN}" == *"cp35"* ]] || \
        [[ "${PYBIN}" == *"cp36"* ]] || \
        [[ "${PYBIN}" == *"cp37"* ]]; then

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,7 +1,13 @@
 ``persistent`` Changelog
 ========================
 
-4.5.0 (unreleased)
+4.5.1 (unreleased)
+------------------
+
+- Add support for Python 3.8a3.
+
+
+4.5.0 (2019-05-09)
 ------------------
 
 - Fully test the C implementation of the PickleCache, and fix
@@ -32,8 +38,6 @@
 
 - Drop support for Python 3.4.
 
-- Add support for Python 3.8a3.
-
 
 4.4.3 (2018-10-22)
 ------------------
@@ -48,6 +52,7 @@
   ZODB does. This eliminates some issues in doctests. See `issue 95
   <https://github.com/zopefoundation/persistent/pull/95>`_.
 
+
 4.4.2 (2018-08-28)
 ------------------
 
@@ -114,6 +119,7 @@
   values have not changed. See `issue 41
   <https://github.com/zopefoundation/persistent/issues/41>`_.
 
+
 4.3.0 (2018-07-30)
 ------------------
 
@@ -129,6 +135,7 @@
   be eligible for the pickle cache; that is no longer the case. See
   `issue 69 <https://github.com/zopefoundation/persistent/issues/69>`_.
 
+
 4.2.4.2 (2017-04-23)
 --------------------
 
@@ -183,12 +190,14 @@
   https://github.com/zopefoundation/persistent/wiki/Notes_on_state_new_and_slots
   if you're curious.)
 
+
 4.2.1 (2016-05-26)
 ------------------
 
 - Fix the hashcode of C ``TimeStamp`` objects on 64-bit Python 3 on
   Windows.
 
+
 4.2.0 (2016-05-05)
 ------------------
 
@@ -202,11 +211,13 @@
 
 - Drop support for Python 2.6 and 3.2.
 
+
 4.1.1 (2015-06-02)
 ------------------
 
 - Fix manifest and re-upload to fix stray files included in 4.1.0.
 
+
 4.1.0 (2015-05-19)
 ------------------
 
@@ -216,6 +227,7 @@
 
 - Fix the hashcode of the Python ``TimeStamp`` on 32-bit platforms.
 
+
 4.0.9 (2015-04-08)
 ------------------
 
@@ -231,6 +243,7 @@
 
 - 100% branch coverage.
 
+
 4.0.8 (2014-03-20)
 ------------------
 
@@ -249,6 +262,7 @@
   ``Persistent`` object which has been removed from the jar's cache
   (fixes aborting a ZODB Connection that has added objects). (PR #7)
 
+
 4.0.7 (2014-02-20)
 ------------------
 
@@ -287,6 +301,7 @@
 - C extenstions now build under Python 3.2, passing the same tests as
   the pure-Python reference implementation.
 
+
 4.0.3 (2012-11-19)
 ------------------
 

diff --git a/persistent/cPersistence.c b/persistent/cPersistence.c
@@ -31,8 +31,10 @@ struct ccobject_head_struct
 */
 #if !defined(PY3K) && defined(_WIN32)
 typedef unsigned long long uint64_t;
+#  define PRIx64 "llx"
 #else
-#include <stdint.h>
+#  include <stdint.h>
+#  include <inttypes.h>
 #endif
 
 /* These two objects are initialized when the module is loaded */
@@ -1478,7 +1480,7 @@ Per_repr(cPersistentObject *self)
           length modifier for %x, so to format a 64-bit value we need to
           use stdio.
         */
-        snprintf(buf, sizeof(buf) - 1, "%llx", oid_value);
+        snprintf(buf, sizeof(buf) - 1, "%" PRIx64, oid_value);
         oid_str = PyUnicode_FromFormat(" oid 0x%s", buf);
     }
 

diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '4.5.0.dev0'
+version = '4.5.1.dev0'
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -89,13 +89,13 @@ def _read_file(filename):
           "Development Status :: 6 - Mature",
           "License :: OSI Approved :: Zope Public License",
           "Programming Language :: Python",
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.7',
-          'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.5',
-          'Programming Language :: Python :: 3.6',
-          'Programming Language :: Python :: 3.7',
-          'Programming Language :: Python :: 3.8',
+          "Programming Language :: Python :: 2",
+          "Programming Language :: Python :: 2.7",
+          "Programming Language :: Python :: 3",
+          "Programming Language :: Python :: 3.5",
+          "Programming Language :: Python :: 3.6",
+          "Programming Language :: Python :: 3.7",
+          "Programming Language :: Python :: 3.8",
           "Programming Language :: Python :: Implementation :: CPython",
           "Programming Language :: Python :: Implementation :: PyPy",
           "Framework :: ZODB",

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py27-pure,py27-pure-cffi,pypy,py35,py36,py37,py37-pure,py38,pypy3,coverage,docs
+    py27,py35,py36,py37,py37-pure,py38,py27-pure,py27-pure-cffi,pypy, pypy3,coverage,docs
 
 [testenv]
 deps =