Merge pull request #1218 from ageitgey/ag-bump-drop-python-2

Drop Python 2 support and bump to 1.4.0

.github/workflows/main.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        python-version: [3.5, 3.6, 3.7, 3.8]
     steps:
     - name: Checkout
       uses: actions/checkout@v2

HISTORY.rst

@@ -1,6 +1,19 @@
 History
 =======
 
+1.4.0 (2020-09-26)
+------------------
+
+* Dropping support for Python 2.x
+* --upsample a parameter for command line face_recognition
+
+1.3.0 (2020-02-20)
+------------------
+
+* Drop support for Python 3.4 and add 3.8
+* Blink detection example
+
+
 1.2.3 (2018-08-21)
 ------------------
 

Makefile

@@ -75,8 +75,9 @@ servedocs: docs ## compile the docs watching for changes
 	watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
 
 release: clean ## package and upload a release
-	python3 setup.py sdist upload
-	python3 setup.py bdist_wheel upload
+	python3 setup.py sdist
+	python3 setup.py bdist_wheel
+	twine upload dist/*
 
 dist: clean ## builds source and wheel package
 	python3 setup.py sdist

face_recognition/__init__.py

@@ -2,6 +2,6 @@
 
 __author__ = """Adam Geitgey"""
 __email__ = 'ageitgey@gmail.com'
-__version__ = '1.2.3'
+__version__ = '1.4.0'
 
 from .api import load_image_file, face_locations, batch_face_locations, face_landmarks, face_encodings, compare_faces, face_distance

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.0
+current_version = 1.4.0
 commit = True
 tag = True
 

setup.py

@@ -24,7 +24,7 @@
 
 setup(
     name='face_recognition',
-    version='1.3.0',
+    version='1.4.0',
     description="Recognize faces from Python or from the command line",
     long_description=readme + '\n\n' + history,
     author="Adam Geitgey",
@@ -52,8 +52,6 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
-        "Programming Language :: Python :: 2",
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',

tox.ini

@@ -10,7 +10,6 @@ envlist =
 
 [gh-actions]
 python =
-    2.7: py27, flake8
     3.5: py35, flake8
     3.6: py36, flake8
     3.7: py37, flake8
@@ -19,7 +18,7 @@ python =
 
 [testenv]
 commands =
-    python setup.py test
+    python -m unittest discover
 
 
 [testenv:flake8]