Merge pull request #98 from NextThought/dep-updates

Add support for Python3.8, PyYAML 5, and Persistent 4.4.3

.travis.yml

@@ -1,19 +1,18 @@
 language: python
-sudo: false
 group: travis_latest
 language: python
+python:
+- 2.7
+- 3.6
+- 3.7
+- 3.8
+- pypy
+- pypy3
 jobs:
     include:
-      - python: 2.7    # 2.7.14 pip  9.0.1
-      - python: 3.6    # 3.6.3  pip  9.0.1
-      - python: 3.7    # 3.7.0  pip 10.0.1
-        dist: xenial
-        sudo: true
-      - python: pypy   # 2.7.13 pip  9.0.1
-      - python: pypy3  # 3.5.3  pip  9.0.1
       - python: 2.7
         env: PURE_PYTHON=1
-      - python: 3.6
+      - python: 3.8
         env: PURE_PYTHON=1
 env:
     global:

CHANGES.rst

@@ -6,8 +6,13 @@
 1.0.0a14 (unreleased)
 =====================
 
-- Build with Cython 0.29 using '3str' as the language level.
+- Build with Cython 0.29.14 using '3str' as the language level.
 
+- Add support for Python 3.8.
+
+- Update PyYAML to 5.1 and change the default output style slightly.
+
+- Fix tests with Persistent 4.4.3 and above.
 
 1.0.0a13 (2018-09-20)
 =====================

setup.py

@@ -162,6 +162,7 @@ def _c(m):
         'Programming Language :: Python :: 3',
         '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',
     ],
@@ -178,8 +179,8 @@ def _c(m):
         'BTrees',
         'isodate',
         'nti.schema >= 1.7.0',
-        'persistent >= 4.4.0',
-        'PyYAML',
+        'persistent >= 4.4.3',
+        'PyYAML >= 5.1',
         'pytz',
         'simplejson',
         'transaction >= 2.2',

src/nti/externalization/representation.py

@@ -165,7 +165,13 @@ def construct_yaml_str(self, node):
 class YamlRepresenter(object):
 
     def dump(self, obj, fp=None):
-        return yaml.dump(obj, stream=fp, Dumper=_ExtDumper)
+        # The default_flow_style changed in PyYaml 5.1 from None to False.
+        # Using False produces multi-line, indented, verbose output. While being human readable,
+        # this consumes space and eliminates simple parsing with JSON. Using True
+        # produces JSON-compatible output in many cases. Using None (the old default)
+        # produces backwards-compatible output that's a hybrid of indented and JSON-like.
+        # https://github.com/yaml/pyyaml/issues/199
+        return yaml.dump(obj, stream=fp, Dumper=_ExtDumper, default_flow_style=True)
 
     def load(self, stream):
         return yaml.load(stream, Loader=_UnicodeLoader)

src/nti/externalization/tests/test_externalization.py

@@ -162,7 +162,7 @@ class SubUnicode(str if bytes is not str else unicode):
         l.append(LocatedExternalDict(k2=SubUnicode(u'foo')))
 
         assert_that(to_external_representation(l, EXT_REPR_YAML),
-                    is_('- {k: v}\n- {k2: foo}\n'))
+                    is_('[{k: v}, {k2: foo}]\n'))
 
     def test_external_class_name(self):
         class C(UserDict, ExternalizableDictionaryMixin):

src/nti/externalization/tests/test_representation.py

@@ -113,16 +113,17 @@ class Foo(Persistent):
 
         o._p_oid = b'12345678'
         r = self._normalized_repr(o)
-
+        # Persistent 4.4.3 and above represent the OID using hex; prior
+        # to that it was bytes.
         assert_that(r,
-                    is_("<Foo object at 0xdeadbeef oid b'12345678' _p_repr {}>"))
+                    is_("<Foo object at 0xdeadbeef oid 0xdeadbeef _p_repr {}>"))
 
         o.a = 1
 
         r = self._normalized_repr(o)
 
         assert_that(r,
-                    is_("<Foo object at 0xdeadbeef oid b'12345678' _p_repr {'a': 1}>"))
+                    is_("<Foo object at 0xdeadbeef oid 0xdeadbeef _p_repr {'a': 1}>"))
 
     def test_persistent_subclass_custom(self):
         @representation.WithRepr(lambda s: 'Hi')

tox.ini

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