[Python-modules-commits] [python-cryptography] 01/05: Import python-cryptography_1.2.3.orig.tar.gz

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository python-cryptography.

commit b64d1e2164939b61713ec45c406c57429ce381d3
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Mar 5 05:23:16 2016 +0200

    Import python-cryptography_1.2.3.orig.tar.gz
---
 CHANGELOG.rst                          |  5 +++++
 PKG-INFO                               |  2 +-
 setup.py                               | 21 +++++++++++++++++++--
 src/_cffi_src/openssl/bio.py           |  3 ++-
 src/cryptography.egg-info/PKG-INFO     |  2 +-
 src/cryptography.egg-info/requires.txt | 20 ++++++++++++++++++++
 src/cryptography/__about__.py          |  2 +-
 tests/hypothesis/__init__.py           |  4 ++++
 8 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fec0a02..5393b30 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.2.3 - 2016-03-01
+~~~~~~~~~~~~~~~~~~
+
+* Updated Windows and OS X wheels to be compiled against OpenSSL 1.0.2g.
+
 1.2.2 - 2016-01-29
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/PKG-INFO b/PKG-INFO
index a195be3..57a01cf 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: cryptography
-Version: 1.2.2
+Version: 1.2.3
 Summary: cryptography is a package which provides cryptographic recipes and primitives to Python developers.
 Home-page: https://github.com/pyca/cryptography
 Author: The cryptography developers
diff --git a/setup.py b/setup.py
index f79b0e2..b0a4807 100644
--- a/setup.py
+++ b/setup.py
@@ -57,14 +57,15 @@ else:
     requirements.append("cffi>=1.4.1")
     setup_requirements.append("cffi>=1.4.1")
 
-# If you add a new dep here you probably need to add it in the tox.ini as well
 test_requirements = [
     "pytest",
     "pretend",
     "iso8601",
-    "hypothesis",
     "pyasn1_modules",
 ]
+if sys.version_info[:2] > (2, 6):
+    test_requirements.append("hypothesis>=1.11.4")
+
 
 # If there's no vectors locally that probably means we are in a tarball and
 # need to go and get the matching vectors package from PyPi
@@ -308,6 +309,22 @@ setup(
 
     install_requires=requirements,
     tests_require=test_requirements,
+    extras_require={
+        "test": test_requirements,
+        "docs-test": [
+            "doc8",
+            "pyenchant",
+            "readme_renderer",
+            "sphinx",
+            "sphinx_rtd_theme",
+            "sphinxcontrib-spelling",
+        ],
+        "pep8-test": [
+            "flake8",
+            "flake8-import-order",
+            "pep8-naming",
+        ],
+    },
 
     # for cffi
     zip_safe=False,
diff --git a/src/_cffi_src/openssl/bio.py b/src/_cffi_src/openssl/bio.py
index ac86683..6439e63 100644
--- a/src/_cffi_src/openssl/bio.py
+++ b/src/_cffi_src/openssl/bio.py
@@ -99,7 +99,6 @@ BIO *BIO_pop(BIO *);
 BIO *BIO_next(BIO *);
 BIO *BIO_find_type(BIO *, int);
 BIO_METHOD *BIO_s_mem(void);
-BIO *BIO_new_mem_buf(void *, int);
 BIO_METHOD *BIO_s_file(void);
 BIO *BIO_new_file(const char *, const char *);
 BIO *BIO_new_fp(FILE *, int);
@@ -127,6 +126,8 @@ BIO_METHOD *BIO_f_buffer(void);
 """
 
 MACROS = """
+/* BIO_new_mem_buf became const void * in 1.0.2g */
+BIO *BIO_new_mem_buf(void *, int);
 long BIO_set_fd(BIO *, long, int);
 long BIO_get_fd(BIO *, char *);
 long BIO_set_mem_eof_return(BIO *, int);
diff --git a/src/cryptography.egg-info/PKG-INFO b/src/cryptography.egg-info/PKG-INFO
index a195be3..57a01cf 100644
--- a/src/cryptography.egg-info/PKG-INFO
+++ b/src/cryptography.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: cryptography
-Version: 1.2.2
+Version: 1.2.3
 Summary: cryptography is a package which provides cryptographic recipes and primitives to Python developers.
 Home-page: https://github.com/pyca/cryptography
 Author: The cryptography developers
diff --git a/src/cryptography.egg-info/requires.txt b/src/cryptography.egg-info/requires.txt
index fb9cb5f..a49ceb6 100644
--- a/src/cryptography.egg-info/requires.txt
+++ b/src/cryptography.egg-info/requires.txt
@@ -5,3 +5,23 @@ setuptools>=1.0
 enum34
 ipaddress
 cffi>=1.4.1
+
+[docs-test]
+doc8
+pyenchant
+readme_renderer
+sphinx
+sphinx_rtd_theme
+sphinxcontrib-spelling
+
+[pep8-test]
+flake8
+flake8-import-order
+pep8-naming
+
+[test]
+pytest
+pretend
+iso8601
+pyasn1_modules
+hypothesis>=1.11.4
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 198ab49..e8642f9 100644
--- a/src/cryptography/__about__.py
+++ b/src/cryptography/__about__.py
@@ -14,7 +14,7 @@ __summary__ = ("cryptography is a package which provides cryptographic recipes"
                " and primitives to Python developers.")
 __uri__ = "https://github.com/pyca/cryptography"
 
-__version__ = "1.2.2"
+__version__ = "1.2.3"
 
 __author__ = "The cryptography developers"
 __email__ = "cryptography-dev at python.org"
diff --git a/tests/hypothesis/__init__.py b/tests/hypothesis/__init__.py
index 4b54088..0b34406 100644
--- a/tests/hypothesis/__init__.py
+++ b/tests/hypothesis/__init__.py
@@ -3,3 +3,7 @@
 # for complete details.
 
 from __future__ import absolute_import, division, print_function
+
+import pytest
+# hypothesis no longer supports Python 2.6 so we simply skip it there
+pytest.importorskip("hypothesis")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-cryptography.git