From 1f5a66c355d5b43dfa8bbb4c7f78cbf106e0f98b Mon Sep 17 00:00:00 2001
From: jab <jab@users.noreply.github.com>
Date: Mon, 17 Sep 2018 23:23:46 +0000
Subject: [PATCH] improvements to pyproject.toml changes

---
 .travis.yml    | 2 +-
 CHANGELOG.rst  | 3 ++-
 pyproject.toml | 8 ++++----
 setup.py       | 8 ++++++--
 tox.ini        | 2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f477beb..1d8df74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ install:  # Install our test dependencies.
 
 script:  # Run our test suite.
   - if [[ -n $COVERAGE ]]; then export PYTEST_ADDOPTS="--cov=bidict --cov-config=.coveragerc"; fi
-  - pytest tests
+  - pytest
 
 
 after_script:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 0007dc7..df0b8e9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -25,7 +25,8 @@ on libraries.io to be notified when new versions of bidict are released.
 0.17.3 (not yet released)
 -------------------------
 
-- Include some additional supporting files in the source distribution.
+- Improve packaging by adding a pyproject.toml
+  and including more supporting files in the distribution.
 
 
 0.17.2 (2018-04-30)
diff --git a/pyproject.toml b/pyproject.toml
index 565303e..4dd7e66 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [build-system]
 requires = [
-    "setuptools >= 35.0.2",
-    "wheel >= 0.29.0",
-    "setuptools_scm"
+    "setuptools",
+    "wheel",
+    "setuptools_scm",
 ]
-build-backend = 'setuptools.build_meta'
+build-backend = "setuptools.build_meta"
diff --git a/setup.py b/setup.py
index 08b873e..6b22c3f 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,10 @@ else:
 with c_open(join(CWD, 'README.rst'), encoding='utf-8') as f:
     LONG_DESCRIPTION = f.read()
 
-SETUP_REQS = ['setuptools_scm']
+SETUP_REQS = [
+    'setuptools_scm',
+]
+
 TEST_REQS = [
     'hypothesis<4',
     'hypothesis-pytest<1',
@@ -51,6 +54,7 @@ TEST_REQS = [
     'sortedcontainers<2',
 ]
 
+# Split out coverage from test requirements since it slows down the tests.
 COVERAGE_REQS = [
     'coverage<5',
     'pytest-cov<3',
@@ -103,7 +107,7 @@ setup(
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
-    setup_requires=SETUP_REQS,  # required so pip < 10 install works (no PEP-517/8 support)
+    setup_requires=SETUP_REQS,  # required so pip < 10 install works (no PEP-517/518 support)
     # for more details see https://www.python.org/dev/peps/pep-0518/#rationale
     tests_require=TEST_REQS,
     extras_require=dict(
diff --git a/tox.ini b/tox.ini
index 6319bf6..89badb1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,4 +4,4 @@ envlist = py27, py34, py35, py36, py37, pypy, pypy3
 [testenv]
 commands =
     pip install -e .[test]
-    py.test
+    pytest