Merge pull request #58 from maxmind/greg/py3

Drop Python 2 support

Author: horgh

.travis.yml

@@ -3,32 +3,25 @@ sudo: false
 language: python
 matrix:
   include:
-    - python: 2.7
-      dist: trusty
-    - python: 3.5
-      dist: trusty
     - python: 3.6
-      dist: trusty
     - python: 3.7
-      dist: xenial
     - python: 3.8
-      dist: xenial
       env:
         - RUN_LINTER=1
         - RUN_SNYK=1
     - python: nightly
       dist: xenial
-    - python: pypy
-      dist: trusty
   allow_failures:
     - python: nightly
 
 before_install:
   - "if [[ $RUN_SNYK && $SNYK_TOKEN ]]; then sudo apt-get install -y nodejs; npm install -g snyk; fi"
 install:
-  - "if [[ $RUN_LINTER ]]; then pip install --upgrade pylint black; fi"
+  - pip install -e git+https://github.com/maxmind/GeoIP2-python#egg=geoip2
+  - "if [[ $RUN_LINTER ]]; then pip install --upgrade pylint black mypy voluptuous-stubs; fi"
 script:
   - python setup.py test
+  - "if [[ $RUN_LINTER ]]; then mypy minfraud tests; fi"
   - "if [[ $RUN_LINTER ]]; then ./.travis-pylint.sh; fi"
   - "if [[ $RUN_LINTER ]]; then ./.travis-black.sh; fi"
   - "if [[ $RUN_SNYK && $SNYK_TOKEN ]]; then snyk test --org=maxmind --file=requirements.txt; fi"

HISTORY.rst

@@ -3,6 +3,16 @@
 History
 -------
 
+2.0.0
+
+* IMPORTANT: Python 2.7 and 3.5 support has been dropped. Python 3.6 or greater
+  is required.
+* Type hints have been added.
+* Email validation is now done with ``email_validator`` rather than
+  ``validate_email``.
+* URL validation is now done with ``urllib.parse`` rather than ``rfc3987``.
+* RFC 3339 timestamp validation is now done via a regular expression.
+
 1.13.0 (2020-07-14)
 +++++++++++++++++++
 

README.rst

@@ -5,7 +5,7 @@ minFraud Score, Insights, Factors and Report Transaction Python API
 Description
 -----------
 
-This package provides an API for the `MaxMind minFraud Score, Insights, and 
+This package provides an API for the `MaxMind minFraud Score, Insights, and
 Factors web services <https://dev.maxmind.com/minfraud/>`_ as well as the
 `Report Transaction web service
 <https://dev.maxmind.com/minfraud/report_transaction>`_.
@@ -252,8 +252,7 @@ Report Transactions Example
 Requirements
 ------------
 
-This code requires Python 2.7+ or 3.5+. Older versions are not supported.
-This library has been tested with CPython and PyPy.
+Python 3.6 or greater is required. Older versions are not supported.
 
 Versioning
 ----------

dev-bin/release.sh

@@ -35,7 +35,7 @@ if [ -n "$(git status --porcelain)" ]; then
 fi
 
 # Make sure release deps are installed with the current python
-pip install -U sphinx wheel voluptuous strict_rfc3339 validate_email rfc3987
+pip install -U sphinx wheel voluptuous email_validator twine
 
 perl -pi -e "s/(?<=__version__ = \").+?(?=\")/$version/g" minfraud/version.py
 

minfraud/errors.py

@@ -6,6 +6,8 @@
 
 """
 
+from typing import Optional
+
 
 class MinFraudError(RuntimeError):
     """There was a non-specific error in minFraud.
@@ -39,7 +41,9 @@ class HTTPError(MinFraudError):
 
     """
 
-    def __init__(self, message, http_status=None, uri=None):
+    def __init__(
+        self, message: str, http_status: Optional[int] = None, uri: Optional[str] = None
+    ) -> None:
         super(HTTPError, self).__init__(message)
         self.http_status = http_status
         self.uri = uri