Merge branch 'master' into add-parse-and-decodedurl-docs

Author: mahmoud

.gitignore

@@ -1,9 +1,6 @@
-docs/_build
+/docs/_build/
 tmp.py
-htmlcov/
-.coverage.*
 *.py[cod]
-.mypy_cache
 
 # emacs
 *~
@@ -32,11 +29,22 @@ lib64
 # Installer logs
 pip-log.txt
 
-# Unit test / coverage reports
-.coverage
-.tox/
+# Testing
+/.tox/
 nosetests.xml
 
+# Coverage
+/.coverage
+/.coverage.*
+/htmlcov/
+/.mypy_cache/
+
+# Documentation
+/htmldocs/
+
+# Documentation
+/htmldocs/
+
 # Translations
 *.mo
 

.travis.yml

@@ -22,7 +22,7 @@ matrix:
     - python: "3.8"
       env: TOXENV=test-py38,codecov
     - python: "pypy"
-      env: TOXENV=test-pypy,codecov
+      env: TOXENV=test-pypy2,codecov
     - python: "pypy3"
       env: TOXENV=test-pypy3,codecov
     - python: "2.7"

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## dev (not yet released)
 
+* CPython 3.7 and 3.8 and PyPy3 added to test matrix
+* Hyperlink now has type hints and they are now exported per
+  [PEP 561](https://www.python.org/dev/peps/pep-0561/).
+* Several bugs related to hidden state were fixed, making it so that all data
+  on a `URL` object (including `rooted` and `uses_netloc`) is reflected by and
+  consistent with its textual representation.
+  This does mean that sometimes these constructor arguments are ignored, if it
+  would create invalid or unparseable URL text.
+
 ## 19.0.0
 
 *(April 7, 2019)*
@@ -13,7 +22,8 @@ A query parameter-centric release, with two enhancements:
   [#39](https://github.com/python-hyper/hyperlink/pull/39))
 * `URL.remove()` now accepts *value* and *limit* parameters, allowing
   for removal of specific name-value pairs, as well as limiting the
-  number of removals. (see [#71](https://github.com/python-hyper/hyperlink/pull/71))
+  number of removals.
+  (See [#71](https://github.com/python-hyper/hyperlink/pull/71))
 
 ## 18.0.0
 

MANIFEST.in

@@ -1,4 +1,4 @@
-include README.md LICENSE CHANGELOG.md tox.ini requirements-test.txt .coveragerc Makefile pytest.ini .tox-coveragerc
+include README.md LICENSE CHANGELOG.md tox.ini pyproject.toml .coveragerc Makefile pytest.ini .tox-coveragerc
 exclude TODO.md .appveyor.yml
 
 graft docs

pyproject.toml

@@ -0,0 +1,10 @@
+[build-system]
+
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
+
+
+[tool.black]
+
+line-length = 80
+target-version = ["py27"]

setup.py

@@ -10,48 +10,47 @@
 from setuptools import find_packages, setup
 
 
-__author__ = 'Mahmoud Hashemi and Glyph Lefkowitz'
-__version__ = '19.0.1dev'
-__contact__ = 'mahmoud@hatnote.com'
-__url__ = 'https://github.com/python-hyper/hyperlink'
-__license__ = 'MIT'
+__author__ = "Mahmoud Hashemi and Glyph Lefkowitz"
+__version__ = "19.0.1dev"
+__contact__ = "mahmoud@hatnote.com"
+__url__ = "https://github.com/python-hyper/hyperlink"
+__license__ = "MIT"
 
 
-setup(name='hyperlink',
-      version=__version__,
-      description="A featureful, immutable, and correct URL for Python.",
-      long_description=__doc__,
-      author=__author__,
-      author_email=__contact__,
-      url=__url__,
-      packages=find_packages(where="src"),
-      package_dir={"": "src"},
-      include_package_data=True,
-      zip_safe=False,
-      license=__license__,
-      platforms='any',
-      install_requires=[
-          'idna>=2.5',
-          'typing ; python_version<"3.5"',
-      ],
-      python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
-      classifiers=[
-          'Topic :: Utilities',
-          'Intended Audience :: Developers',
-          'Topic :: Software Development :: Libraries',
-          'Development Status :: 5 - Production/Stable',
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.6',
-          'Programming Language :: Python :: 2.7',
-          'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.4',
-          'Programming Language :: Python :: 3.5',
-          'Programming Language :: Python :: 3.6',
-          'Programming Language :: Python :: 3.7',
-          'Programming Language :: Python :: 3.8',
-          'Programming Language :: Python :: Implementation :: PyPy',
-          'License :: OSI Approved :: MIT License', ]
-      )
+setup(
+    name="hyperlink",
+    version=__version__,
+    description="A featureful, immutable, and correct URL for Python.",
+    long_description=__doc__,
+    author=__author__,
+    author_email=__contact__,
+    url=__url__,
+    packages=find_packages(where="src"),
+    package_dir={"": "src"},
+    package_data=dict(hyperlink=["py.typed",],),
+    zip_safe=False,
+    license=__license__,
+    platforms="any",
+    install_requires=["idna>=2.5", 'typing ; python_version<"3.5"',],
+    python_requires=">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+    classifiers=[
+        "Topic :: Utilities",
+        "Intended Audience :: Developers",
+        "Topic :: Software Development :: Libraries",
+        "Development Status :: 5 - Production/Stable",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: Implementation :: PyPy",
+        "License :: OSI Approved :: MIT License",
+    ],
+)
 
 """
 A brief checklist for release:

src/hyperlink/_socket.py

@@ -2,6 +2,7 @@
     from socket import inet_pton
 except ImportError:
     from typing import TYPE_CHECKING
+
     if TYPE_CHECKING:  # pragma: no cover
         pass
     else:
@@ -25,7 +26,7 @@ class SockAddr(ctypes.Structure):
         def inet_pton(address_family, ip_string):
             # type: (int, str) -> bytes
             addr = SockAddr()
-            ip_string_bytes = ip_string.encode('ascii')
+            ip_string_bytes = ip_string.encode("ascii")
             addr.sa_family = address_family
             addr_size = ctypes.c_int(ctypes.sizeof(addr))
 
@@ -37,10 +38,16 @@ def inet_pton(address_family, ip_string):
             except KeyError:
                 raise socket.error("unknown address family")
 
-            if WSAStringToAddressA(
-                ip_string_bytes, address_family, None,
-                ctypes.byref(addr), ctypes.byref(addr_size)
-            ) != 0:
+            if (
+                WSAStringToAddressA(
+                    ip_string_bytes,
+                    address_family,
+                    None,
+                    ctypes.byref(addr),
+                    ctypes.byref(addr_size),
+                )
+                != 0
+            ):
                 raise socket.error(ctypes.FormatError())
 
             return ctypes.string_at(getattr(addr, attribute), size)