Merge 700d25c into dc2283d

.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

.travis.yml

@@ -1,11 +1,8 @@
 language: python
-sudo: false
 matrix:
     include:
         - os: linux
           python: 2.7
-        - os: linux
-          python: 3.4
         - os: linux
           python: 3.5
         - os: linux
@@ -18,17 +15,13 @@ matrix:
           python: pypy3
         - os: linux
           dist: xenial
-          sudo: true
           python: 3.7
         # It's important to use 'macpython' builds to get the least
         # restrictive wheel tag. It's also important to avoid
         # 'homebrew 3' because it floats instead of being a specific version.
         - os: osx
           language: generic
           env: TERRYFY_PYTHON='macpython 2.7'
-        - os: osx
-          language: generic
-          env: TERRYFY_PYTHON='macpython 3.4'
         - os: osx
           language: generic
           env: TERRYFY_PYTHON='macpython 3.5'

CHANGES.rst

@@ -30,6 +30,8 @@
 - Fix DeprecationWarning about ``PY_SSIZE_T_CLEAN``.
   See `issue 108 <https://github.com/zopefoundation/persistent/issues/108>`_.
 
+- Drop support for Python 3.4.
+
 
 4.4.3 (2018-10-22)
 ------------------
@@ -44,6 +46,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)
 ------------------
 
@@ -110,6 +113,7 @@
   values have not changed. See `issue 41
   <https://github.com/zopefoundation/persistent/issues/41>`_.
 
+
 4.3.0 (2018-07-30)
 ------------------
 
@@ -125,6 +129,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)
 --------------------
 
@@ -179,12 +184,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)
 ------------------
 
@@ -198,11 +205,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)
 ------------------
 
@@ -212,6 +221,7 @@
 
 - Fix the hashcode of the Python ``TimeStamp`` on 32-bit platforms.
 
+
 4.0.9 (2015-04-08)
 ------------------
 
@@ -227,6 +237,7 @@
 
 - 100% branch coverage.
 
+
 4.0.8 (2014-03-20)
 ------------------
 
@@ -245,6 +256,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)
 ------------------
 
@@ -283,6 +295,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)
 ------------------
 

appveyor.yml

@@ -7,8 +7,6 @@ environment:
   matrix:
     - python: 27
     - python: 27-x64
-    - python: 34
-    - python: 34-x64
     - python: 35
     - python: 35-x64
     - python: 36

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);
     }
 

setup.py

@@ -89,13 +89,12 @@ 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.4',
-          'Programming Language :: Python :: 3.5',
-          'Programming Language :: Python :: 3.6',
-          'Programming Language :: Python :: 3.7',
+          "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 :: Implementation :: CPython",
           "Programming Language :: Python :: Implementation :: PyPy",
           "Framework :: ZODB",

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py27-pure,py27-pure-cffi,pypy,py34,py35,py36,py37,pypy3,coverage,docs
+    py27,py35,py36,py37,py27-pure,py27-pure-cffi,pypy,pypy3,coverage,docs
 
 [testenv]
 deps =