From e667f0a8af5717d82671c406fc55621f4010301e Mon Sep 17 00:00:00 2001 From: Jim Shaver Date: Sun, 3 May 2015 01:23:04 -0400 Subject: [PATCH 1/8] removed support for Python 3.2 --- .travis.yml | 6 ------ ChangeLog | 7 +++++++ setup.py | 1 - tox.ini | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index c244622f1..bb3fdb405 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,6 @@ matrix: env: TOXENV=py26 - python: "2.7" env: TOXENV=py27 - - python: "3.2" - env: TOXENV=py32 - python: "3.3" env: TOXENV=py33 - python: "3.4" @@ -25,9 +23,6 @@ matrix: - python: "2.7" env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py27 - - python: "3.2" - env: - CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py32 - python: "3.3" env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py33 @@ -59,7 +54,6 @@ matrix: env: TOXENV=py27 - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py26 - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py27 - - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py32 - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py33 - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py34 - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=pypy diff --git a/ChangeLog b/ChangeLog index 61bfa5db4..57446c9f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-05-02 Jim Shaver + + * .travis.yml, setup.py, tox.ini: Removed support for Python 3.2. + This version is rarely used and is now depricated by a major + dependency of pyOpenSSL(cryptography). Affected users should upgrade + to Python 3.3+. + 2015-04-15 Paul Kehrer * OpenSSL/crypto.py, OpenSSL/test/test_crypto.py: Switch to utf8string diff --git a/setup.py b/setup.py index c4fbbd58e..10e98e8d6 100755 --- a/setup.py +++ b/setup.py @@ -90,7 +90,6 @@ def run_tests(self): # of those languages the project supports. 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: Implementation :: CPython', diff --git a/tox.ini b/tox.ini index da5491606..457b324f1 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = pypy,py26,py27,py32,py33,py34 +envlist = pypy,py26,py27,py33,py34 [testenv] deps = From 23dee7e520ae1a0fcf1d3fab2626d36819d5c0ee Mon Sep 17 00:00:00 2001 From: Jim Shaver Date: Sun, 3 May 2015 01:23:04 -0400 Subject: [PATCH 2/8] removed support for Python 3.2 --- .travis.yml | 5 ----- ChangeLog | 7 +++++++ setup.py | 1 - tox.ini | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59c7f9026..0354895b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,6 @@ matrix: env: TOXENV=py26 - python: "2.7" env: TOXENV=py27 - - python: "3.2" - env: TOXENV=py32 - python: "3.3" env: TOXENV=py33 - python: "3.4" @@ -24,8 +22,6 @@ matrix: env: TOXENV=py26-cryptographyMaster - python: "2.7" env: TOXENV=py27-cryptographyMaster - - python: "3.2" - env: TOXENV=py32-cryptographyMaster - python: "3.3" env: TOXENV=py33-cryptographyMaster - python: "3.4" @@ -62,7 +58,6 @@ matrix: env: TOXENV=py27 - env: TOXENV=py26-cryptographyMaster - env: TOXENV=py27-cryptographyMaster - - env: TOXENV=py32-cryptographyMaster - env: TOXENV=py33-cryptographyMaster - env: TOXENV=py34-cryptographyMaster - env: TOXENV=pypy-cryptographyMaster diff --git a/ChangeLog b/ChangeLog index 61bfa5db4..57446c9f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-05-02 Jim Shaver + + * .travis.yml, setup.py, tox.ini: Removed support for Python 3.2. + This version is rarely used and is now depricated by a major + dependency of pyOpenSSL(cryptography). Affected users should upgrade + to Python 3.3+. + 2015-04-15 Paul Kehrer * OpenSSL/crypto.py, OpenSSL/test/test_crypto.py: Switch to utf8string diff --git a/setup.py b/setup.py index 2e2e39457..f742c1ed0 100755 --- a/setup.py +++ b/setup.py @@ -89,7 +89,6 @@ def run_tests(self): 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: Implementation :: CPython', diff --git a/tox.ini b/tox.ini index 1db296a0e..c87f16648 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {pypy,py26,py27,py32,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest +envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest [testenv] deps = From e8003f3c412a502c8dc33541a0a10181f567d8c9 Mon Sep 17 00:00:00 2001 From: Jim Shaver Date: Tue, 5 May 2015 22:14:01 -0400 Subject: [PATCH 3/8] fix final merge of .travis.yml --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf8875649..0354895b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,19 +56,11 @@ matrix: - language: generic os: osx env: TOXENV=py27 -<<<<<<< HEAD - env: TOXENV=py26-cryptographyMaster - env: TOXENV=py27-cryptographyMaster - env: TOXENV=py33-cryptographyMaster - env: TOXENV=py34-cryptographyMaster - env: TOXENV=pypy-cryptographyMaster -======= - - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py26 - - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py27 - - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py33 - - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py34 - - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=pypy ->>>>>>> e667f0a8af5717d82671c406fc55621f4010301e - env: OPENSSL=0.9.8 TOXENV=py27 install: From cc265b22ba7e3e89c945b24f87a3787f69e7ca8c Mon Sep 17 00:00:00 2001 From: Jim Shaver Date: Tue, 5 May 2015 22:26:46 -0400 Subject: [PATCH 4/8] Correct spelling of 'deprecate' --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 57446c9f0..6de6c008b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ 2015-05-02 Jim Shaver * .travis.yml, setup.py, tox.ini: Removed support for Python 3.2. - This version is rarely used and is now depricated by a major + This version is rarely used and is now deprecated by a major dependency of pyOpenSSL(cryptography). Affected users should upgrade to Python 3.3+. From ff6f4e50b96f0010110821c8ed6e5e338c18f570 Mon Sep 17 00:00:00 2001 From: Jim Shaver Date: Tue, 5 May 2015 22:27:27 -0400 Subject: [PATCH 5/8] add 2.7 back into tox --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 44ade80ce..c87f16648 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {pypy,py26,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest +envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest [testenv] deps = From 720b209de7ea1d78276b87dbd3c73f9cbcaaa93d Mon Sep 17 00:00:00 2001 From: Jim Shaver Date: Wed, 6 May 2015 09:10:16 -0400 Subject: [PATCH 6/8] Fix spacing in Changelog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6de6c008b..ae02ef3e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ * .travis.yml, setup.py, tox.ini: Removed support for Python 3.2. This version is rarely used and is now deprecated by a major - dependency of pyOpenSSL(cryptography). Affected users should upgrade + dependency of pyOpenSSL (cryptography). Affected users should upgrade to Python 3.3+. 2015-04-15 Paul Kehrer From b862d51f7a9a513b9d255307b6dffbebcb4a4b38 Mon Sep 17 00:00:00 2001 From: Jim Shaver Date: Wed, 6 May 2015 09:33:17 -0400 Subject: [PATCH 7/8] add keys and certs made by mk_simple_certs.py to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 288f2add3..7b183797f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ __pycache__ doc/_build/ .coverage .eggs +examples/simple/*.cert +examples/simple/*.pkey From 76c20d18134864afb4d8564d2f7145f3638cec18 Mon Sep 17 00:00:00 2001 From: Jim Shaver Date: Wed, 6 May 2015 09:36:51 -0400 Subject: [PATCH 8/8] revert change made in wrong branch --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7b183797f..288f2add3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,3 @@ __pycache__ doc/_build/ .coverage .eggs -examples/simple/*.cert -examples/simple/*.pkey