Merge branch 'python-openxml:master' into master

Author: michael-koeller

.travis.yml

@@ -1,7 +1,7 @@
 language: python
 python:
+  - "3.8"
   - "3.6"
-  - "3.5"
   - "2.7"
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install: pip install -r requirements.txt

HISTORY.rst

@@ -3,6 +3,12 @@
 Release History
 ---------------
 
+0.8.11 (2021-05-15)
++++++++++++++++++++
+
+- Small build changes and Python 3.8 version changes like collections.abc location.
+
+
 0.8.10 (2019-01-08)
 +++++++++++++++++++
 

docs/api/enum/WdLineSpacing.rst

@@ -10,7 +10,7 @@ Example::
     from docx.enum.text import WD_LINE_SPACING
 
     paragraph = document.add_paragraph()
-    paragraph.line_spacing_rule = WD_LINE_SPACING.EXACTLY
+    paragraph.paragraph_format.line_spacing_rule = WD_LINE_SPACING.EXACTLY
 
 ----
 

docs/api/style.rst

@@ -6,7 +6,7 @@ Style-related objects
 
 A style is used to collect a set of formatting properties under a single name
 and apply those properties to a content object all at once. This promotes
-formatting consistency thoroughout a document and across related documents
+formatting consistency throughout a document and across related documents
 and allows formatting changes to be made globally by changing the definition
 in the appropriate style.
 

docs/dev/analysis/features/shapes/picture.rst

@@ -12,7 +12,7 @@ Candidate protocol
 ::
 
     >>> run = paragraph.add_run()
-    >>> inline_shape = run.add_inline_picture(file_like_image, MIME_type=None)
+    >>> inline_shape = run.add_picture(file_like_image, MIME_type=None)
     >>> inline_shape.width = width
     >>> inline_shape.height = height
 

docx/__init__.py

@@ -2,7 +2,7 @@
 
 from docx.api import Document  # noqa
 
-__version__ = '0.8.10'
+__version__ = "0.8.11"
 
 
 # register custom Part classes with opc package reader

docx/compat.py

@@ -34,6 +34,6 @@ def is_string(obj):
 
     def is_string(obj):
         """Return True if *obj* is a string, False otherwise."""
-        return isinstance(obj, basestring)
+        return isinstance(obj, basestring)  # noqa
 
-    Unicode = unicode
+    Unicode = unicode  # noqa

docx/opc/compat.py

@@ -4,9 +4,7 @@
 Provides Python 2/3 compatibility objects
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import sys
 
@@ -29,6 +27,7 @@ def is_string(obj):
         """
         return isinstance(obj, str)
 
+
 # ===========================================================================
 # Python 2 versions
 # ===========================================================================
@@ -47,4 +46,4 @@ def is_string(obj):
         """
         Return True if *obj* is a string, False otherwise.
         """
-        return isinstance(obj, basestring)
+        return isinstance(obj, basestring)  # noqa

setup.py

@@ -21,62 +21,62 @@ def text_of(relpath):
 # Read the version from docx.__version__ without importing the package
 # (and thus attempting to import packages it depends on that may not be
 # installed yet)
-version = re.search(
-    "__version__ = '([^']+)'", text_of('docx/__init__.py')
-).group(1)
+version = re.search(r'__version__ = "([^"]+)"', text_of("docx/__init__.py")).group(1)
 
 
-NAME = 'python-docx'
+NAME = "python-docx"
 VERSION = version
-DESCRIPTION = 'Create and update Microsoft Word .docx files.'
-KEYWORDS = 'docx office openxml word'
-AUTHOR = 'Steve Canny'
-AUTHOR_EMAIL = '[email protected]'
-URL = 'https://github.com/python-openxml/python-docx'
-LICENSE = text_of('LICENSE')
-PACKAGES = find_packages(exclude=['tests', 'tests.*'])
-PACKAGE_DATA = {'docx': ['templates/*.xml', 'templates/*.docx']}
+DESCRIPTION = "Create and update Microsoft Word .docx files."
+KEYWORDS = "docx office openxml word"
+AUTHOR = "Steve Canny"
+AUTHOR_EMAIL = "[email protected]"
+URL = "https://github.com/python-openxml/python-docx"
+LICENSE = text_of("LICENSE")
+PACKAGES = find_packages(exclude=["tests", "tests.*"])
+PACKAGE_DATA = {"docx": ["templates/*.xml", "templates/*.docx"]}
 
-INSTALL_REQUIRES = ['lxml>=2.3.2']
-TEST_SUITE = 'tests'
-TESTS_REQUIRE = ['behave', 'mock', 'pyparsing', 'pytest']
+INSTALL_REQUIRES = ["lxml>=2.3.2"]
+TEST_SUITE = "tests"
+TESTS_REQUIRE = ["behave", "mock", "pyparsing", "pytest"]
 
 CLASSIFIERS = [
-    'Development Status :: 3 - Alpha',
-    'Environment :: Console',
-    'Intended Audience :: Developers',
-    'License :: OSI Approved :: MIT License',
-    'Operating System :: OS Independent',
-    'Programming Language :: Python',
-    'Programming Language :: Python :: 2',
-    'Programming Language :: Python :: 2.6',
-    'Programming Language :: Python :: 2.7',
-    'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.3',
-    'Programming Language :: Python :: 3.4',
-    'Topic :: Office/Business :: Office Suites',
-    'Topic :: Software Development :: Libraries'
+    "Development Status :: 3 - Alpha",
+    "Environment :: Console",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 2",
+    "Programming Language :: Python :: 2.6",
+    "Programming Language :: Python :: 2.7",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.3",
+    "Programming Language :: Python :: 3.4",
+    "Topic :: Office/Business :: Office Suites",
+    "Topic :: Software Development :: Libraries",
 ]
 
-LONG_DESCRIPTION = text_of('README.rst') + '\n\n' + text_of('HISTORY.rst')
+LONG_DESCRIPTION = text_of("README.rst") + "\n\n" + text_of("HISTORY.rst")
 
+ZIP_SAFE = False
 
 params = {
-    'name':             NAME,
-    'version':          VERSION,
-    'description':      DESCRIPTION,
-    'keywords':         KEYWORDS,
-    'long_description': LONG_DESCRIPTION,
-    'author':           AUTHOR,
-    'author_email':     AUTHOR_EMAIL,
-    'url':              URL,
-    'license':          LICENSE,
-    'packages':         PACKAGES,
-    'package_data':     PACKAGE_DATA,
-    'install_requires': INSTALL_REQUIRES,
-    'tests_require':    TESTS_REQUIRE,
-    'test_suite':       TEST_SUITE,
-    'classifiers':      CLASSIFIERS,
+    "name": NAME,
+    "version": VERSION,
+    "description": DESCRIPTION,
+    "keywords": KEYWORDS,
+    "long_description": LONG_DESCRIPTION,
+    "author": AUTHOR,
+    "author_email": AUTHOR_EMAIL,
+    "url": URL,
+    "license": LICENSE,
+    "packages": PACKAGES,
+    "package_data": PACKAGE_DATA,
+    "install_requires": INSTALL_REQUIRES,
+    "tests_require": TESTS_REQUIRE,
+    "test_suite": TEST_SUITE,
+    "classifiers": CLASSIFIERS,
+    "zip_safe": ZIP_SAFE,
 }
 
 setup(**params)

tox.ini

@@ -12,7 +12,7 @@ python_classes = Test Describe
 python_functions = it_ they_ and_it_ but_it_
 
 [tox]
-envlist = py26, py27, py34, py35, py36
+envlist = py26, py27, py34, py35, py36, py38
 
 [testenv]
 deps =