Merge pull request #140 from elliottmurray/python2_deprecate

Python2 deprecate

.travis.yml

@@ -3,7 +3,6 @@ language:
   - ruby
 
 python:
-  - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"
@@ -20,7 +19,7 @@ script:
   - flake8
   - pydocstyle pact
   - tox
-  - if [[ $TRAVIS_PYTHON_VERSION == "3.6" ]]; then make package && pip install ./dist/pact-python-*.tar.gz && make e2e; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == "3.4" ]]; then make package && pip install ./dist/pact-python-*.tar.gz && make e2e; fi
 
 before_deploy:
   - export RELEASE_PACKAGE=$(ls dist/pact-python-*.tar.gz)
@@ -33,6 +32,6 @@ deploy:
     secure: W8osmmZ2F+XACUrh0gLedBhvN9zjo9FrUKgQQ/bdgeol+Qo9gyn0cu9RJd/jzlOyHHL4GyBxkgPen6J3KKTJE1J8loZF/u0rgl7H8mSq3SAv4zRk2aFBypfqJrUhiTPHcXyn2L3xWC0PfS5F+ANTDuGAIcxS9sUZEu2Snw8H1avTgFhXbEiR+xfg8Qwh9qOVO2TY9YDkTFkpST/wqFLKxstx8z9ek/wSxcAaF6EO55v6oQmtK8vn+AX7VlvwYgbGrTK/D4bdwZpc/YXEnG/zviSBnZKzOpOyg2vIi/yejFsMQVeAlG84xFsax61KrvmZfaNN+NF175hFLBCKNjUMVNaY80bRX9n4inHIBqRYWBsdurlogdfPsDEOBGfPMf2Sy0vWoRFFzRAQk4m6V/g67YdgVjN4Fi+u8CuqD59EoISH8BdwGnFsz22C3KldIZjz2eleMTsvTkq1hX1Y3hlRfIiETpl8YEL9sDMY5nVcnNTCT2ysyHOdEUigzSubzqB5O5WIkBSyDXdkjBW7BiaIAc7jvb3wrnce+M19Y2Aour4C6KEhp05u3ePSGjOBsJtI8U3/kLjrv5wZA40IIarPUDqvKK9tS+LfpEoCqPCEypTJ069lOQRBGsLy+573qsJhcYwwaYx66FcQ7CXVYR2sTQ7m8w5PXBZj60UhOvd1URU=
   on:
     repo: pact-foundation/pact-python
-    python: "2.7"
+    python: "3.4"
     tags: true
   skip_cleanup: true

CHANGELOG.md

@@ -1,3 +1,4 @@
+
 ### 0.22.0
   * d112a4a - Merge pull request #134 from elliottmurray/multiple-custom-provider-header (Elliott Murray, Mon May 11 16:32:49 2020 +0100)
   * 58f8e6b - Fix some style issues (Elliott Murray, Wed Apr 29 12:35:00 2020 +0100)

README.md

@@ -12,6 +12,8 @@ Currently supports version 2 of the [Pact specification].
 For more information about what Pact is, and how it can help you
 test your code more efficiently, check out the [Pact documentation].
 
+Note: As of Version 1.0 deprecates support for python 2.7 to allow us to incorporate python 3.x features more readily. If you want to still use Python 2.7 use the 0.x.y versions. Only bug fixes will now be added to that release.
+
 # How to use pact-python
 
 ## Installation

release_prep.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+VERSION=$1
+
+if [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]*$ ]]; then
+  echo "Updating version $VERSION."
+else
+  echo "Invalid version number $VERSION"
+  exit 1;
+fi
+
+TAG_NAME="v$VERSION"
+
+echo "Releasing $TAG_NAME"
+
+echo -e "`git log --pretty=format:'  * %h - %s (%an, %ad)' $TAG_NAME..HEAD`\n$(cat CHANGELOG.md)" > CHANGELOG.md
+
+echo "Appended Changelog to $VERSION"
+
+git add CHANGELOG.md pact/__version__.py
+git commit -m "Releasing version $VERSION"
+
+git tag -a "$TAG_NAME" -m "Releasing version $VERSION"
+
+# && git push origin master --tags`
+
+

requirements_dev.txt

@@ -3,7 +3,6 @@ Flask==1.0
 configparser==3.5.0
 codecov==2.0.5
 coverage==4.3.4
-enum34==1.1.6
 flake8==3.2.1
 mccabe==0.5.2
 mock==2.0.0

setup.py

@@ -115,10 +115,6 @@ def read(filename):
     'six>=1.9.0',
 ]
 
-if sys.version_info.major == 2:
-    dependencies.append('subprocess32')
-    dependencies.append('enum34')
-
 if __name__ == '__main__':
     setup(
         cmdclass={

tox.ini

@@ -1,9 +1,8 @@
 [tox]
-envlist=py{27,34,35,36,37,38}-{test,install}
+envlist=py{34,35,36,37,38}-{test,install}
 [testenv]
 deps=
     test: -rrequirements_dev.txt
-    py27-test: subprocess32
-commands=
+ommands=
 	test: nosetests
 	install: python -c "import pact"