--- a/components/python/cryptography/Makefile Fri Oct 07 15:08:18 2016 -0700
+++ b/components/python/cryptography/Makefile Tue Oct 11 11:55:12 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= cryptography
-COMPONENT_VERSION= 0.8.2
+COMPONENT_VERSION= 1.2.3
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:1c9a022ab3decaf152093e2ef2d5ee4258c72c7d429446c86bd68ff8c0929db6
+ sha256:8eb11c77dd8e73f48df6b2f7a7e16173fe0fe8fdfe266232832e88477e08454e
COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_PROJECT_URL= https://cryptography.io/
COMPONENT_BUGDB= python-mod/cryptography
-TPNO= 22524
+TPNO= 27254
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
@@ -43,26 +43,12 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-#
-# Until enum is available in the build environment, it needs to be built
-# in order for setuptools to work here.
-#
-ENUM= $(WS_COMPONENTS)/python/enum/build/prototype/$(MACH)/$(PYTHON_LIB)
-
-$(ENUM):
- (cd ../enum ; $(MAKE) install)
+# Use the CFFI version in the gate because if the CFFI version changes
+# everything using CFFI will break.
+CFFI = $(WS_COMPONENTS)/python/cffi/build/prototype/$(MACH)/$(PYTHON_LIB)
-COMPONENT_BUILD_ENV += PYTHONPATH=$(ENUM)
-
-COMPONENT_INSTALL_ENV += PYTHONPATH=$(ENUM)
-
-$(BUILD_32_and_64): $(ENUM)
-
-clean::
- (cd ../enum ; $(MAKE) clean)
-
-clobber::
- (cd ../enum ; $(MAKE) clobber)
+COMPONENT_BUILD_ENV += PYTHONPATH=$(CFFI)
+COMPONENT_INSTALL_ENV += PYTHONPATH=$(CFFI)
# common targets
build: $(BUILD_32_and_64)
@@ -70,11 +56,17 @@
install: $(INSTALL_32_and_64)
#
-# tests require cryptography_vectors, iso8601, pretend, pytest, and six,
-# some of which have not yet integrated.
+# tests require cryptography_vectors, iso8601, pretend, pytest>= 2.8.7,
+# hypothesis>=1.11.4 and pyasn1_modules, some of which have not yet integrated.
+# On a i386 kernel zone with the test dependencies installed, test results are:
+# Python2.7: 74000 passed, 6136 skipped
+# Python3.4: 74000 passed, 6136 skipped
+# Python3.5: 74000 passed, 6136 skipped
#
test: $(NO_TESTS)
+system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+REQUIRED_PACKAGES += library/python/cffi
REQUIRED_PACKAGES += library/security/openssl
REQUIRED_PACKAGES += system/library