Make Python 3.6+ only, update packaging boilerplate

madig · madig · commit c376f1e0191f · 2019-11-13T17:26:12.000Z
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,5 @@ Lib/booleanOperations.egg-info
 
 .tox/
 .cache/
+
+_version.py
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,6 @@ env:
 
 matrix:
   include:
-    - python: 2.7
     - python: 3.6
     - python: 3.7
       # required to run python3.7 on Travis CI
diff --git a/Lib/booleanOperations/__init__.py b/Lib/booleanOperations/__init__.py
@@ -1,7 +1,11 @@
 from __future__ import print_function, division, absolute_import
 from .booleanOperationManager import BooleanOperationManager
 from .exceptions import BooleanOperationsError
-from .version import __version__
+
+try:
+    from ._version import version as __version__
+except ImportError:
+    __version__ = "0.0.0+unknown"
 
 # export BooleanOperationManager static methods
 union = BooleanOperationManager.union
diff --git a/Lib/booleanOperations/version.py b/Lib/booleanOperations/version.py
diff --git a/README.rst b/README.rst
@@ -195,4 +195,4 @@ List the **anchors** of the glyph.
    :target: https://travis-ci.org/typemytype/booleanOperations
 .. |PyPI| image:: https://img.shields.io/pypi/v/booleanOperations.svg
    :target: https://pypi.org/project/booleanOperations/
-.. |Python Versions| image:: https://img.shields.io/badge/python-2.7%2C%203.4%2C%203.5%2C%203.6-blue.svg
+.. |Python Versions| image:: https://img.shields.io/badge/python-3.6,%203.7-blue.svg
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,9 +1,5 @@
 environment:
   matrix:
-    - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7.x"
-      PYTHON_ARCH: "32"
-
     - PYTHON: "C:\\Python36-x64"
       PYTHON_VERSION: "3.6.x"
       PYTHON_ARCH: "64"
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools>=30.3.0", "wheel", "setuptools_scm"]
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
-pyclipper==1.0.5
-# fontTools.ufoLib is not imported directly by booleanOperations, but
-# the test suite needs defcon, which in turns requires fonttools installed
-# with [ufo] support
-fonttools[ufo]==3.32.0
+# fontTools.ufoLib is not imported directly by booleanOperations, but
+# the test suite needs defcon, which in turns requires fonttools installed
+# with [ufo] support
+fonttools[ufo]==4.0.2
+pyclipper==1.1.0.post1
diff --git a/setup.cfg b/setup.cfg
@@ -1,21 +1,49 @@
-[wheel]
-universal = 1
+[metadata]
+name = booleanOperations
+description = Boolean operations on paths.
+long_description = file: README.rst
+url = https://github.com/typemytype/booleanOperations
+author = Frederik Berlaen
+author_email = frederik@typemytype.com
+license = MIT
+license_file = LICENSE
+classifiers =
+    Development Status :: 4 - Beta
+    Intended Audience :: Developers
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Topic :: Multimedia :: Graphics :: Editors :: Vector-Based
+    Topic :: Software Development :: Libraries :: Python Modules
+
+[options]
+package_dir = =Lib
+packages = find:
+python_requires = >=3.6
+setup_requires =
+    setuptools_scm
+    wheel
+install_requires =
+    pyclipper >= 1.1.0.post1
+    fonttools >= 4.0.2
+
+[options.packages.find]
+where = Lib
+
+[bdist_wheel]
+universal = 0
 
 [sdist]
 formats = zip
 
-[aliases]
-test = pytest
-
 [tool:pytest]
-minversion = 3.0.2
-testpaths =
-    Lib/booleanOperations
-    tests
 addopts =
-    # run py.test in verbose mode
-    -v
     # show extra test summary info
     -r a
     # run doctests in all .py modules
     --doctest-modules
+filterwarnings =
+    ignore::DeprecationWarning:fontTools.misc.py23
diff --git a/setup.py b/setup.py
@@ -1,47 +1,3 @@
-from setuptools import setup, find_packages
-import sys
+from setuptools import setup
 
-needs_pytest = {'pytest', 'test'}.intersection(sys.argv)
-pytest_runner = ['pytest_runner'] if needs_pytest else []
-needs_wheel = {'bdist_wheel'}.intersection(sys.argv)
-wheel = ['wheel'] if needs_wheel else []
-
-with open('README.rst', 'r') as f:
-    long_description = f.read()
-
-setup_params = dict(
-    name="booleanOperations",
-    use_scm_version=True,
-    description="Boolean operations on paths.",
-    long_description=long_description,
-    author="Frederik Berlaen",
-    author_email="frederik@typemytype.com",
-    url="https://github.com/typemytype/booleanOperations",
-    license="MIT",
-    package_dir={"": "Lib"},
-    packages=find_packages("Lib"),
-    setup_requires=[
-        "setuptools_scm>=1.11.1,!=1.13.1,!=1.14.0",
-    ] + pytest_runner + wheel,
-    tests_require=[
-        'pytest>=3.0.2',
-    ],
-    install_requires=[
-        "pyclipper>=1.0.5",
-        "fonttools>=3.32.0",
-    ],
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 3',
-        'Topic :: Multimedia :: Graphics :: Editors :: Vector-Based',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-    ],
-)
-
-if __name__ == "__main__":
-    setup(**setup_params)
+setup(use_scm_version={"write_to": "Lib/booleanOperations/_version.py"})
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,36,37}
+envlist = py{36,37}
 
 [testenv]
 deps =

-Original file line number
+Diff line change
 .tox/
 .cache/
++
 +_version.py
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[build-system]`
	`2`	`+requires = ["setuptools>=30.3.0", "wheel", "setuptools_scm"]`