Merge pull request #156 from hawkowl/incremental

Port to using Incremental
twisted · Dec 14, 2016 · b436c6c · b436c6c
2 parents f6f07be + f148124
commit b436c6c
Show file tree

Hide file tree

Showing 27 changed files with 59 additions and 40 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,11 @@
+[run]
+source =
+       treq
+branch = True
+
+
+[paths]
+source =
+   src/
+   .tox/*/lib/python*/site-packages/
+   .tox/pypy*/site-packages/
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,6 @@ build
 dist
 MANIFEST
 .coverage
-.coveragerc
 coverage
 htmlcov
 _trial_temp

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
-include treq/_version README.rst LICENSE tox.ini tox2travis.py requirements-dev.txt
+include README.rst LICENSE tox.ini tox2travis.py requirements-dev.txt .coveragerc
 recursive-include docs *
 prune docs/_build
 exclude .travis.yml

diff --git a/setup.py b/setup.py
@@ -1,8 +1,4 @@
 from setuptools import find_packages, setup
-import os.path
-
-with open(os.path.join(os.path.dirname(__file__), "treq", "_version")) as ver:
-    __version__ = ver.readline().strip()
 
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -19,30 +15,35 @@
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
 
-with open('README.rst') as f:
-    readme = f.read()
+if __name__ == "__main__":
+
+    with open('README.rst') as f:
+        readme = f.read()
 
-setup(
-    name="treq",
-    version=__version__,
-    packages=find_packages(),
-    install_requires=[
-        "requests >= 2.1.0",
-        "six",
-        "Twisted[tls] >= 16.0.0",
-        # Twisted[tls] 16.0.0 doesn't specify a version.
-        "service_identity >= 14.0.0",
-        # Twisted[tls] 16.0.0 requires 0.13, which doesn't work on Python 3.
-        "pyOpenSSL >= 0.15.1",
-    ],
-    package_data={"treq": ["_version"]},
-    author="David Reid",
-    author_email="[email protected]",
-    maintainer="Amber Brown",
-    maintainer_email="[email protected]",
-    classifiers=classifiers,
-    description="A requests-like API built on top of twisted.web's Agent",
-    license="MIT/X",
-    url="http://github.com/twisted/treq",
-    long_description=readme
-)
+    setup(
+        name="treq",
+        packages=find_packages('src'),
+        package_dir={"": "src"},
+        setup_requires=["incremental"],
+        use_incremental=True,
+        install_requires=[
+            "incremental",
+            "requests >= 2.1.0",
+            "six",
+            "Twisted[tls] >= 16.0.0",
+            # Twisted[tls] 16.0.0 doesn't specify a version.
+            "service_identity >= 14.0.0",
+            # Twisted[tls] 16.0.0 requires 0.13, which doesn't work on Python 3.
+            "pyOpenSSL >= 0.15.1",
+        ],
+        package_data={"treq": ["_version"]},
+        author="David Reid",
+        author_email="[email protected]",
+        maintainer="Amber Brown",
+        maintainer_email="[email protected]",
+        classifiers=classifiers,
+        description="A requests-like API built on top of twisted.web's Agent",
+        license="MIT/X",
+        url="http://github.com/twisted/treq",
+        long_description=readme
+    )
diff --git a/treq/__init__.py → src/treq/__init__.py b/treq/__init__.py → src/treq/__init__.py
@@ -1,13 +1,11 @@
 from __future__ import absolute_import, division, print_function
 
-from twisted.python.modules import getModule as _getModule
+from ._version import __version__
 
 from treq.api import head, get, post, put, patch, delete, request
 from treq.content import collect, content, text_content, json_content
 
+__version__ = __version__.base()
+
 __all__ = ['head', 'get', 'post', 'put', 'patch', 'delete', 'request',
            'collect', 'content', 'text_content', 'json_content']
-
-__version__ = (
-    _getModule(__name__).filePath.sibling("_version").getContent().strip()
-)
diff --git a/treq/_utils.py → src/treq/_utils.py b/treq/_utils.py → src/treq/_utils.py
diff --git a/src/treq/_version.py b/src/treq/_version.py
@@ -0,0 +1,11 @@
+"""
+Provides Treq version information.
+"""
+
+# This file is auto-generated! Do not edit!
+# Use `python -m incremental.update Treq` to change this file.
+
+from incremental import Version
+
+__version__ = Version('Treq', 16, 12, 0)
+__all__ = ["__version__"]
diff --git a/treq/api.py → src/treq/api.py b/treq/api.py → src/treq/api.py
diff --git a/treq/auth.py → src/treq/auth.py b/treq/auth.py → src/treq/auth.py
diff --git a/treq/client.py → src/treq/client.py b/treq/client.py → src/treq/client.py
diff --git a/treq/content.py → src/treq/content.py b/treq/content.py → src/treq/content.py
diff --git a/treq/multipart.py → src/treq/multipart.py b/treq/multipart.py → src/treq/multipart.py
diff --git a/treq/response.py → src/treq/response.py b/treq/response.py → src/treq/response.py
diff --git a/treq/test/__init__.py → src/treq/test/__init__.py b/treq/test/__init__.py → src/treq/test/__init__.py
diff --git a/treq/test/test_api.py → src/treq/test/test_api.py b/treq/test/test_api.py → src/treq/test/test_api.py
diff --git a/treq/test/test_auth.py → src/treq/test/test_auth.py b/treq/test/test_auth.py → src/treq/test/test_auth.py
diff --git a/treq/test/test_client.py → src/treq/test/test_client.py b/treq/test/test_client.py → src/treq/test/test_client.py
diff --git a/treq/test/test_content.py → src/treq/test/test_content.py b/treq/test/test_content.py → src/treq/test/test_content.py
diff --git a/treq/test/test_multipart.py → src/treq/test/test_multipart.py b/treq/test/test_multipart.py → src/treq/test/test_multipart.py
diff --git a/treq/test/test_response.py → src/treq/test/test_response.py b/treq/test/test_response.py → src/treq/test/test_response.py
diff --git a/treq/test/test_testing.py → src/treq/test/test_testing.py b/treq/test/test_testing.py → src/treq/test/test_testing.py
diff --git a/treq/test/test_treq_integration.py → src/treq/test/test_treq_integration.py b/treq/test/test_treq_integration.py → src/treq/test/test_treq_integration.py
diff --git a/treq/test/test_utils.py → src/treq/test/test_utils.py b/treq/test/test_utils.py → src/treq/test/test_utils.py
diff --git a/treq/test/util.py → src/treq/test/util.py b/treq/test/util.py → src/treq/test/util.py
diff --git a/treq/testing.py → src/treq/testing.py b/treq/testing.py → src/treq/testing.py
diff --git a/tox.ini b/tox.ini
@@ -19,13 +19,13 @@ deps =
 passenv = TERM  # ensure colors
 commands =
     pip list
-    coverage run --branch --source=treq {envbindir}/trial {posargs:treq}
+    coverage run {envbindir}/trial {posargs:treq}
     coverage report -m
 
 [testenv:flake8]
 skip_install = True
 deps = flake8
-commands = flake8 treq/
+commands = flake8 src/treq/
 
 [testenv:pypi-readme]
 deps =

diff --git a/treq/_version b/treq/_version