From 301646105d0ddfaaca75a9eb2ae9fede37f39a10 Mon Sep 17 00:00:00 2001 From: Sean Narenthiran Date: Wed, 2 Sep 2020 21:47:13 +0100 Subject: [PATCH 1/8] Swap to building a wheel using manylinux --- .travis.yml | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b22b2d6..db1eb448 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,30 +1,26 @@ -dist: bionic language: python -python: - - '3.5' - - '3.6' - - '3.7' - - '3.8' + +jobs: + include: + # perform a linux build + - services: docker + +env: + global: + - TWINE_USERNAME=__token__ + - secure: WiCn/Ao0aOyHqoTv0LIcuqcMLTS+CokHvQig1wlx0D7u1eSzjQzGA8ubXKG+1dZs5KN11SfBOE/2hwlAtQGZes7C3Jray3HF9DJnX/PnPlzwHxitsOXc+rT4WWz+6wJDoiBua1eSI10duD5sb4XfPfdD5uGdoZzR17Nm9gN9xl5VLKYNNqYSVky+RKeHnLI9dhsQZJ5gMDZY0C2eAcL+U4COSQh3Ah50wVdiwW8UXyd1jy3+qs+jCEq7nitSNftqkklrWKIBHDVfkZztc/9PTrhihVspaUjm4z6YAlP6ovA2p648YI99kKjv2/Hff8VTlBNVSf4pDZUTzlVsdeM/J+Q5FBHRVkXPPIkWWdFcWM1iR5UDBohtbyicgC/77ugcMV9ztBJVU5+Ib1Xi2pf8GCDPrO3tXg+1Kan3HeNtIDICY5VHZjnOOub0faE08U7pzU64OmXEJMGvrYr6AtwD+P0unqcdtmWnX4EKNzcgbs23OTN8jV2VfB6yGmidjj4z8s8Yo4gJUiWjw4VKUGlYPxrhj/7lRyT5E+bQeO461XbXyMvPtqTYYB4AQ84z6cNwP/DhR06OZ0dnjaJrLIfDuRPRtHTO3uYgsL6Olxkna29Di/KpyMMq7MzhdB00WbRIooL2t979dbL8Sa+tw48kPN27ASOY2DDj97JsqDI5nUk= + install: + - pip install --upgrade cibuildwheel - pip install -r requirements.txt - pip install . script: - pytest tests/ + - python -m cibuildwheel --output-dir wheelhouse -jobs: - include: - - stage: deploy - python: 3.8 - install: - - pip install -r requirements.txt - - pip install . - script: - - pytest tests/ - deploy: - provider: pypi - username: __token__ - password: - secure: vUbqVM3nP1587JuwCcp4MPutC5qaSQ6tJcMw9d9oahQM/S/tMXOOcZEGAhc8Toh2FesrupxJ4uInJhK1++ydQw832MaUnNG9OsjdSM8fdMTsziLOvIgifFe8vsS2NsGJTE9ty5JIiJYFXBrx187YECu1AttyrzB4Y/QsIIZuUmMHZtRE0tJt4ZPp8KWY91wuq5TcgyXjbRYODlcHscMYoJqZBOIwXcb/rRFciIIrm9hhwJvVfZ1tI3wZ5Lnl3rj9dmBangc+wHa1gFI88A+kewgM3e76Z+07S0va8pXte6oD/X9SYKCPsisctEE0nIqV4pvr7sYyeS1yerNBC+LlmbR0xfU9nA/WcXQszX2Chz9Cz/3jIVV/Z7Jx8ddg78nqvIxb38AduUIB8t68CRpx6MR66QujLyNnARQjOuVA8thOFOmw8fVxBVhIcOpW7AAb9pZKW/m15IqvOgTBLp6x2lPPUi6eSYLR/C/qbPGNNiI3tgxXRBSs/kK+/dMun4pMFJ2oNmMvz1ZgSnMKJnkzjBN7PmzkZuurrgSuzmq61mrCyeaLHDJ/xjj00pV7Nn4mNbywzjNeiouYtgZDontZ/e2m5NU/fsr1YKNbZ0PtQT+ZT7qdiA2R3Hf3hLEVl+kADipvx0VTBg5ZjBOESpIXpa/JMj/JHApMCzQD6bZcU78= - on: - tags: true - distributions: "sdist bdist_wheel" \ No newline at end of file +after_success: + - | + if [[ $TRAVIS_TAG ]]; then + python -m pip install twine + python -m twine upload wheelhouse/*.whl + fi \ No newline at end of file From d5e0850ec5f988953dc224282afef1e6c7759163 Mon Sep 17 00:00:00 2001 From: Sean Narenthiran Date: Wed, 2 Sep 2020 21:54:59 +0100 Subject: [PATCH 2/8] Explicit python3 calls --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index db1eb448..c6ad1d38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,16 +11,16 @@ env: - secure: WiCn/Ao0aOyHqoTv0LIcuqcMLTS+CokHvQig1wlx0D7u1eSzjQzGA8ubXKG+1dZs5KN11SfBOE/2hwlAtQGZes7C3Jray3HF9DJnX/PnPlzwHxitsOXc+rT4WWz+6wJDoiBua1eSI10duD5sb4XfPfdD5uGdoZzR17Nm9gN9xl5VLKYNNqYSVky+RKeHnLI9dhsQZJ5gMDZY0C2eAcL+U4COSQh3Ah50wVdiwW8UXyd1jy3+qs+jCEq7nitSNftqkklrWKIBHDVfkZztc/9PTrhihVspaUjm4z6YAlP6ovA2p648YI99kKjv2/Hff8VTlBNVSf4pDZUTzlVsdeM/J+Q5FBHRVkXPPIkWWdFcWM1iR5UDBohtbyicgC/77ugcMV9ztBJVU5+Ib1Xi2pf8GCDPrO3tXg+1Kan3HeNtIDICY5VHZjnOOub0faE08U7pzU64OmXEJMGvrYr6AtwD+P0unqcdtmWnX4EKNzcgbs23OTN8jV2VfB6yGmidjj4z8s8Yo4gJUiWjw4VKUGlYPxrhj/7lRyT5E+bQeO461XbXyMvPtqTYYB4AQ84z6cNwP/DhR06OZ0dnjaJrLIfDuRPRtHTO3uYgsL6Olxkna29Di/KpyMMq7MzhdB00WbRIooL2t979dbL8Sa+tw48kPN27ASOY2DDj97JsqDI5nUk= install: - - pip install --upgrade cibuildwheel - - pip install -r requirements.txt - - pip install . + - python3 -m pip install --upgrade cibuildwheel + - python3 -m pip install -r requirements.txt + - python3 -m pip install . script: - - pytest tests/ - - python -m cibuildwheel --output-dir wheelhouse + - python3 -m pytest tests/ + - python3 -m cibuildwheel --output-dir wheelhouse after_success: - | if [[ $TRAVIS_TAG ]]; then - python -m pip install twine - python -m twine upload wheelhouse/*.whl + python3 -m pip install twine + python3 -m twine upload wheelhouse/*.whl fi \ No newline at end of file From a2d97450ce123ad567e4835674fcfc4d7d5656f4 Mon Sep 17 00:00:00 2001 From: Sean Narenthiran Date: Wed, 2 Sep 2020 22:05:40 +0100 Subject: [PATCH 3/8] Updated to use matrix --- .travis.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c6ad1d38..ce2b8234 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,20 @@ language: python -jobs: +matrix: include: - # perform a linux build - - services: docker - + - language: python + dist: xenial + sudo: required + python: "3.7" + services: + - docker + - language: python + dist: xenial + sudo: required + python: "3.7" + arch: arm64 + services: + - docker env: global: - TWINE_USERNAME=__token__ From cb54f51c430b28224642331ade6ae41f9985715a Mon Sep 17 00:00:00 2001 From: Sean Narenthiran Date: Wed, 2 Sep 2020 22:12:56 +0100 Subject: [PATCH 4/8] removed 3 --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce2b8234..ce00d4ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,16 +21,16 @@ env: - secure: WiCn/Ao0aOyHqoTv0LIcuqcMLTS+CokHvQig1wlx0D7u1eSzjQzGA8ubXKG+1dZs5KN11SfBOE/2hwlAtQGZes7C3Jray3HF9DJnX/PnPlzwHxitsOXc+rT4WWz+6wJDoiBua1eSI10duD5sb4XfPfdD5uGdoZzR17Nm9gN9xl5VLKYNNqYSVky+RKeHnLI9dhsQZJ5gMDZY0C2eAcL+U4COSQh3Ah50wVdiwW8UXyd1jy3+qs+jCEq7nitSNftqkklrWKIBHDVfkZztc/9PTrhihVspaUjm4z6YAlP6ovA2p648YI99kKjv2/Hff8VTlBNVSf4pDZUTzlVsdeM/J+Q5FBHRVkXPPIkWWdFcWM1iR5UDBohtbyicgC/77ugcMV9ztBJVU5+Ib1Xi2pf8GCDPrO3tXg+1Kan3HeNtIDICY5VHZjnOOub0faE08U7pzU64OmXEJMGvrYr6AtwD+P0unqcdtmWnX4EKNzcgbs23OTN8jV2VfB6yGmidjj4z8s8Yo4gJUiWjw4VKUGlYPxrhj/7lRyT5E+bQeO461XbXyMvPtqTYYB4AQ84z6cNwP/DhR06OZ0dnjaJrLIfDuRPRtHTO3uYgsL6Olxkna29Di/KpyMMq7MzhdB00WbRIooL2t979dbL8Sa+tw48kPN27ASOY2DDj97JsqDI5nUk= install: - - python3 -m pip install --upgrade cibuildwheel - - python3 -m pip install -r requirements.txt - - python3 -m pip install . + - python -m pip install --upgrade cibuildwheel + - python -m pip install -r requirements.txt + - python -m pip install . script: - - python3 -m pytest tests/ - - python3 -m cibuildwheel --output-dir wheelhouse + - python -m pytest tests/ + - python -m cibuildwheel --output-dir wheelhouse after_success: - | if [[ $TRAVIS_TAG ]]; then - python3 -m pip install twine - python3 -m twine upload wheelhouse/*.whl + python -m pip install twine + python -m twine upload wheelhouse/*.whl fi \ No newline at end of file From 8873bef2ac18346b917fa978bf5bb0b97aa29fec Mon Sep 17 00:00:00 2001 From: Sean Narenthiran Date: Wed, 2 Sep 2020 22:14:04 +0100 Subject: [PATCH 5/8] Removed python3 --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce00d4ee..24dfc8e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,16 +21,16 @@ env: - secure: WiCn/Ao0aOyHqoTv0LIcuqcMLTS+CokHvQig1wlx0D7u1eSzjQzGA8ubXKG+1dZs5KN11SfBOE/2hwlAtQGZes7C3Jray3HF9DJnX/PnPlzwHxitsOXc+rT4WWz+6wJDoiBua1eSI10duD5sb4XfPfdD5uGdoZzR17Nm9gN9xl5VLKYNNqYSVky+RKeHnLI9dhsQZJ5gMDZY0C2eAcL+U4COSQh3Ah50wVdiwW8UXyd1jy3+qs+jCEq7nitSNftqkklrWKIBHDVfkZztc/9PTrhihVspaUjm4z6YAlP6ovA2p648YI99kKjv2/Hff8VTlBNVSf4pDZUTzlVsdeM/J+Q5FBHRVkXPPIkWWdFcWM1iR5UDBohtbyicgC/77ugcMV9ztBJVU5+Ib1Xi2pf8GCDPrO3tXg+1Kan3HeNtIDICY5VHZjnOOub0faE08U7pzU64OmXEJMGvrYr6AtwD+P0unqcdtmWnX4EKNzcgbs23OTN8jV2VfB6yGmidjj4z8s8Yo4gJUiWjw4VKUGlYPxrhj/7lRyT5E+bQeO461XbXyMvPtqTYYB4AQ84z6cNwP/DhR06OZ0dnjaJrLIfDuRPRtHTO3uYgsL6Olxkna29Di/KpyMMq7MzhdB00WbRIooL2t979dbL8Sa+tw48kPN27ASOY2DDj97JsqDI5nUk= install: - - python -m pip install --upgrade cibuildwheel - - python -m pip install -r requirements.txt - - python -m pip install . + - pip install --upgrade cibuildwheel + - pip install -r requirements.txt + - pip install . script: - - python -m pytest tests/ + - pytest tests/ - python -m cibuildwheel --output-dir wheelhouse after_success: - | if [[ $TRAVIS_TAG ]]; then - python -m pip install twine + pip install twine python -m twine upload wheelhouse/*.whl fi \ No newline at end of file From 34be7306becac335d5914579398061f144f5b8c6 Mon Sep 17 00:00:00 2001 From: Sean Narenthiran Date: Wed, 2 Sep 2020 22:25:49 +0100 Subject: [PATCH 6/8] Added build specifics --- .travis.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24dfc8e8..391c62c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,15 +8,9 @@ matrix: python: "3.7" services: - docker - - language: python - dist: xenial - sudo: required - python: "3.7" - arch: arm64 - services: - - docker env: global: + - CIBW_BUILD="cp36-* cp37-* cp38-*" - TWINE_USERNAME=__token__ - secure: WiCn/Ao0aOyHqoTv0LIcuqcMLTS+CokHvQig1wlx0D7u1eSzjQzGA8ubXKG+1dZs5KN11SfBOE/2hwlAtQGZes7C3Jray3HF9DJnX/PnPlzwHxitsOXc+rT4WWz+6wJDoiBua1eSI10duD5sb4XfPfdD5uGdoZzR17Nm9gN9xl5VLKYNNqYSVky+RKeHnLI9dhsQZJ5gMDZY0C2eAcL+U4COSQh3Ah50wVdiwW8UXyd1jy3+qs+jCEq7nitSNftqkklrWKIBHDVfkZztc/9PTrhihVspaUjm4z6YAlP6ovA2p648YI99kKjv2/Hff8VTlBNVSf4pDZUTzlVsdeM/J+Q5FBHRVkXPPIkWWdFcWM1iR5UDBohtbyicgC/77ugcMV9ztBJVU5+Ib1Xi2pf8GCDPrO3tXg+1Kan3HeNtIDICY5VHZjnOOub0faE08U7pzU64OmXEJMGvrYr6AtwD+P0unqcdtmWnX4EKNzcgbs23OTN8jV2VfB6yGmidjj4z8s8Yo4gJUiWjw4VKUGlYPxrhj/7lRyT5E+bQeO461XbXyMvPtqTYYB4AQ84z6cNwP/DhR06OZ0dnjaJrLIfDuRPRtHTO3uYgsL6Olxkna29Di/KpyMMq7MzhdB00WbRIooL2t979dbL8Sa+tw48kPN27ASOY2DDj97JsqDI5nUk= From b33f45ec8b675b3bc5a2b6b5f75831d16a177964 Mon Sep 17 00:00:00 2001 From: Sean Narenthiran Date: Wed, 2 Sep 2020 22:34:27 +0100 Subject: [PATCH 7/8] Added pre-requisites --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 391c62c5..77283de0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ matrix: env: global: - CIBW_BUILD="cp36-* cp37-* cp38-*" + - CIBW_BEFORE_BUILD="pip install torch" - TWINE_USERNAME=__token__ - secure: WiCn/Ao0aOyHqoTv0LIcuqcMLTS+CokHvQig1wlx0D7u1eSzjQzGA8ubXKG+1dZs5KN11SfBOE/2hwlAtQGZes7C3Jray3HF9DJnX/PnPlzwHxitsOXc+rT4WWz+6wJDoiBua1eSI10duD5sb4XfPfdD5uGdoZzR17Nm9gN9xl5VLKYNNqYSVky+RKeHnLI9dhsQZJ5gMDZY0C2eAcL+U4COSQh3Ah50wVdiwW8UXyd1jy3+qs+jCEq7nitSNftqkklrWKIBHDVfkZztc/9PTrhihVspaUjm4z6YAlP6ovA2p648YI99kKjv2/Hff8VTlBNVSf4pDZUTzlVsdeM/J+Q5FBHRVkXPPIkWWdFcWM1iR5UDBohtbyicgC/77ugcMV9ztBJVU5+Ib1Xi2pf8GCDPrO3tXg+1Kan3HeNtIDICY5VHZjnOOub0faE08U7pzU64OmXEJMGvrYr6AtwD+P0unqcdtmWnX4EKNzcgbs23OTN8jV2VfB6yGmidjj4z8s8Yo4gJUiWjw4VKUGlYPxrhj/7lRyT5E+bQeO461XbXyMvPtqTYYB4AQ84z6cNwP/DhR06OZ0dnjaJrLIfDuRPRtHTO3uYgsL6Olxkna29Di/KpyMMq7MzhdB00WbRIooL2t979dbL8Sa+tw48kPN27ASOY2DDj97JsqDI5nUk= From 5ecc5a69b6d56c752b894bad4bf207ad37f56d7b Mon Sep 17 00:00:00 2001 From: Sean Narenthiran Date: Wed, 2 Sep 2020 22:44:19 +0100 Subject: [PATCH 8/8] Ubuntu 18 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 77283de0..db520cb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: python matrix: include: - language: python - dist: xenial + dist: bionic sudo: required python: "3.7" services: