From 33ed736b38abf945b97968a1ad6e3e1d8f31fbcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Guimar=C3=A3es?= Date: Thu, 4 Jan 2018 11:30:27 -0300 Subject: [PATCH] adds travis file, updates version to 3.13.0 and reorganizes building scripts --- .travis.yaml | 21 +++++++++++++++++++ Makefile | 4 ++-- .../manylinux1/build.sh | 0 .../manylinux1/build_wheels.sh | 2 +- .../osx/build_wheels.sh | 0 make/osx/install_python.sh | 15 +++++++++++++ src/wolfcrypt/__init__.py | 2 +- 7 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 .travis.yaml rename manylinux1/build_wheels.sh => make/manylinux1/build.sh (100%) rename build_linux_wheels.sh => make/manylinux1/build_wheels.sh (76%) rename build_mac_os_x_wheels.sh => make/osx/build_wheels.sh (100%) create mode 100755 make/osx/install_python.sh diff --git a/.travis.yaml b/.travis.yaml new file mode 100644 index 0000000..b19aa5d --- /dev/null +++ b/.travis.yaml @@ -0,0 +1,21 @@ +sudo: required + +branches: + only: + - master + +matrix: + include: + - dist: trusty + language: python + services: + - docker + script: + - ./make/manylinux1/build_wheels.sh + - os: osx + osx_image: xcode8.3 + script: + - ./make/osx/build_wheels.sh + +install: + - if [ "${TRAVIS_OS_NAME:-}" == "osx" ]; then ./make/osx/install_python.sh; fi diff --git a/Makefile b/Makefile index a6bf275..3abe20e 100644 --- a/Makefile +++ b/Makefile @@ -80,9 +80,9 @@ servedocs: docs ## compile the docs watching for changes dist: clean ## builds source and wheel package python setup.py sdist - ./build_mac_os_x_wheels.sh + ./make/osx/build_wheels.sh - ./build_linux_wheels.sh + ./make/manylinux1/build_wheels.sh ls -l dist diff --git a/manylinux1/build_wheels.sh b/make/manylinux1/build.sh similarity index 100% rename from manylinux1/build_wheels.sh rename to make/manylinux1/build.sh diff --git a/build_linux_wheels.sh b/make/manylinux1/build_wheels.sh similarity index 76% rename from build_linux_wheels.sh rename to make/manylinux1/build_wheels.sh index 7c2e42d..e836814 100755 --- a/build_linux_wheels.sh +++ b/make/manylinux1/build_wheels.sh @@ -7,4 +7,4 @@ docker run \ -v `pwd`:/wolfcrypt-py \ -w /wolfcrypt-py \ wolfssl/manylinux1-x86_64 \ - bash -c "manylinux1/build_wheels.sh" + bash -c "make/manylinux1/build.sh" diff --git a/build_mac_os_x_wheels.sh b/make/osx/build_wheels.sh similarity index 100% rename from build_mac_os_x_wheels.sh rename to make/osx/build_wheels.sh diff --git a/make/osx/install_python.sh b/make/osx/install_python.sh new file mode 100755 index 0000000..be15c65 --- /dev/null +++ b/make/osx/install_python.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -euo pipefail +set -x + +URLS=( + 'https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg' + 'https://www.python.org/ftp/python/3.4.4/python-3.4.4-macosx10.6.pkg' + 'https://www.python.org/ftp/python/3.5.3/python-3.5.4-macosx10.6.pkg' + 'https://www.python.org/ftp/python/3.6.0/python-3.6.4-macosx10.6.pkg' +) + +for url in "${URLS[@]}"; do + curl -Lo /tmp/python.pkg "$url" + sudo installer -pkg /tmp/python.pkg -target / +done diff --git a/src/wolfcrypt/__init__.py b/src/wolfcrypt/__init__.py index 94a0de4..0ffdf71 100644 --- a/src/wolfcrypt/__init__.py +++ b/src/wolfcrypt/__init__.py @@ -24,7 +24,7 @@ __uri__ = "https://github.com/wolfssl/wolfcrypt-py" # When bumping the C library version, reset the POST count to 0 -__wolfssl_version__ = "v3.12.2-stable" +__wolfssl_version__ = "v3.13.0-stable" # We're using implicit post releases [PEP 440] to bump package version # while maintaining the C library version intact for better reference.