From 6cac03e941fd18f2622e4eac90326507ba3c29cc Mon Sep 17 00:00:00 2001 From: SimLeek Date: Tue, 19 Feb 2019 23:25:13 -0700 Subject: [PATCH 1/9] wheel_testing: added .whl file testing to travis. Added auto-deployment. Version fixed requirements.txt. Removed requirements.txt from setup.py. --- .travis.yml | 20 ++++++++++++++++++++ requirements.txt | 6 +++--- setup.py | 7 +++++-- 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..238fe2c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,20 @@ +language: python +cache: pip + +python: +- '2.7' +- '3.5' +- '3.6' +- '3.7' + +install: +- pip install -r requirements.txt -q +script: +- pip install cibuildwheel==0.10.1 +- cibuildwheel --output-dir wheelhouse + +deploy: + provider: pypi + user: "SimLeek" + password: + secure: crD6W+uBJu+d/T4A8K+ZVAhyVQil5GXk1m/N0c5P7qX1DdMrcL1KXGzD5URtuvqTfUop1ah9npmT57yTP39WCRRqTRsra+WGFDZl+dH89xSnApFhWULhD1Z2JXu/54BKYlPU5xILUkqm+4BNwW4ZULXLTPZAA1dHSuSHqhQUsjfx/P7J0veNRgEdHoL2V9k8tvO8JJiGhGNDgyprv0PutzPOtTihd+aSM1f0sA4/vHF7Hbo7Surr7nfEXQeC9husBqYomG4bBS/F1P709y5hQRZVMdqzjQ8eQyQYmkWhW7Wmfq4uTkGTQf7TMzqB8GkxtU82ktSdRsDk6yhejNtG6TwM4O3XFw0saZMHViaKrSq2/rqdrmdrEQVogSaf7Z7CPa7FA3IGMm2G9mVt2xa94DP4gfElrGgG0R1vJZCV9L4ZMM2bg7OsU9XMU++tsOyKm/o+I/AMOxlgy/2m5KSganPswEGSiFWBE7foxLZT6+amXWHjopE43qWstOLGVsyfsQawBfcXOiqPYsOqEXgnvl8uqGfvE/UfocHuZGeQ/y8w0Q5rLfO3bMGaOFHzqBWeYK92pt8VAmDV3TvXHwPuIkG85qThUa4mw2s3Am/U9wdHWj1Ou6ZiFn6iHR9ASB1AFPR/qOLPWYIboSxlZTnKCs5/z+zuFZDTB9YO5hhmAr4= \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index fd8e2aa..cff9e7e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -numpy -opencv_python -localpubsub==0.0.1 \ No newline at end of file +opencv_python==3.4.2.17 +localpubsub==0.0.1 +numpy==1.16.1 \ No newline at end of file diff --git a/setup.py b/setup.py index 187773c..e56929c 100644 --- a/setup.py +++ b/setup.py @@ -13,8 +13,11 @@ with open('cvpubsubs/__init__.py', 'r') as f: with open('README.md', 'r', encoding='utf-8') as f: readme = f.read() -with open('requirements.txt', 'r', encoding='utf-8') as f: - REQUIRES = f.readlines() +REQUIRES = [ + "opencv_python==3.4.2.17" + "localpubsub==0.0.1", + "numpy==1.16.1" +] setup( name='CVPubSubs', From 42d0d60bfe9c609cfcf888fe42519d4477f0efc1 Mon Sep 17 00:00:00 2001 From: SimLeek Date: Tue, 19 Feb 2019 23:35:16 -0700 Subject: [PATCH 2/9] wheel_testing: Made travis pip installs verbose. Updated opencv version. --- .travis.yml | 3 +-- requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 238fe2c..50f2b11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,9 @@ python: - '2.7' - '3.5' - '3.6' -- '3.7' install: -- pip install -r requirements.txt -q +- pip install -r requirements.txt script: - pip install cibuildwheel==0.10.1 - cibuildwheel --output-dir wheelhouse diff --git a/requirements.txt b/requirements.txt index cff9e7e..4bb8453 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -opencv_python==3.4.2.17 +opencv_python==4.0.0.21 localpubsub==0.0.1 numpy==1.16.1 \ No newline at end of file diff --git a/setup.py b/setup.py index e56929c..7a7e94f 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ with open('README.md', 'r', encoding='utf-8') as f: readme = f.read() REQUIRES = [ - "opencv_python==3.4.2.17" + "opencv_python==4.0.0.21" "localpubsub==0.0.1", "numpy==1.16.1" ] From be04806d27ea296723d732bd5fe7af5de8844ea2 Mon Sep 17 00:00:00 2001 From: SimLeek Date: Wed, 20 Feb 2019 00:21:41 -0700 Subject: [PATCH 3/9] wheel_testing: bumped fix version. Fixed pypi uploading. fixed localpubsub requirement. --- .travis.yml | 1 + cvpubsubs/__init__.py | 2 +- requirements.txt | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 50f2b11..9a33b7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,5 +15,6 @@ script: deploy: provider: pypi user: "SimLeek" + skip_existing: true password: secure: crD6W+uBJu+d/T4A8K+ZVAhyVQil5GXk1m/N0c5P7qX1DdMrcL1KXGzD5URtuvqTfUop1ah9npmT57yTP39WCRRqTRsra+WGFDZl+dH89xSnApFhWULhD1Z2JXu/54BKYlPU5xILUkqm+4BNwW4ZULXLTPZAA1dHSuSHqhQUsjfx/P7J0veNRgEdHoL2V9k8tvO8JJiGhGNDgyprv0PutzPOtTihd+aSM1f0sA4/vHF7Hbo7Surr7nfEXQeC9husBqYomG4bBS/F1P709y5hQRZVMdqzjQ8eQyQYmkWhW7Wmfq4uTkGTQf7TMzqB8GkxtU82ktSdRsDk6yhejNtG6TwM4O3XFw0saZMHViaKrSq2/rqdrmdrEQVogSaf7Z7CPa7FA3IGMm2G9mVt2xa94DP4gfElrGgG0R1vJZCV9L4ZMM2bg7OsU9XMU++tsOyKm/o+I/AMOxlgy/2m5KSganPswEGSiFWBE7foxLZT6+amXWHjopE43qWstOLGVsyfsQawBfcXOiqPYsOqEXgnvl8uqGfvE/UfocHuZGeQ/y8w0Q5rLfO3bMGaOFHzqBWeYK92pt8VAmDV3TvXHwPuIkG85qThUa4mw2s3Am/U9wdHWj1Ou6ZiFn6iHR9ASB1AFPR/qOLPWYIboSxlZTnKCs5/z+zuFZDTB9YO5hhmAr4= \ No newline at end of file diff --git a/cvpubsubs/__init__.py b/cvpubsubs/__init__.py index 80eb7f9..bfeb9e7 100644 --- a/cvpubsubs/__init__.py +++ b/cvpubsubs/__init__.py @@ -1 +1 @@ -__version__ = '0.3.3' +__version__ = '0.3.4' diff --git a/requirements.txt b/requirements.txt index 4bb8453..d892d0b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ opencv_python==4.0.0.21 -localpubsub==0.0.1 +localpubsub==0.0.3 numpy==1.16.1 \ No newline at end of file diff --git a/setup.py b/setup.py index 7a7e94f..9196310 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ with open('README.md', 'r', encoding='utf-8') as f: REQUIRES = [ "opencv_python==4.0.0.21" - "localpubsub==0.0.1", + "localpubsub==0.0.3", "numpy==1.16.1" ] From 28034b764bcc672afa8940a9a96b3eb3147b3d11 Mon Sep 17 00:00:00 2001 From: SimLeek Date: Wed, 20 Feb 2019 00:22:22 -0700 Subject: [PATCH 4/9] wheel_testing: Removed quotes from username just in case. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9a33b7c..47f8588 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ script: deploy: provider: pypi - user: "SimLeek" + user: SimLeek skip_existing: true password: secure: crD6W+uBJu+d/T4A8K+ZVAhyVQil5GXk1m/N0c5P7qX1DdMrcL1KXGzD5URtuvqTfUop1ah9npmT57yTP39WCRRqTRsra+WGFDZl+dH89xSnApFhWULhD1Z2JXu/54BKYlPU5xILUkqm+4BNwW4ZULXLTPZAA1dHSuSHqhQUsjfx/P7J0veNRgEdHoL2V9k8tvO8JJiGhGNDgyprv0PutzPOtTihd+aSM1f0sA4/vHF7Hbo7Surr7nfEXQeC9husBqYomG4bBS/F1P709y5hQRZVMdqzjQ8eQyQYmkWhW7Wmfq4uTkGTQf7TMzqB8GkxtU82ktSdRsDk6yhejNtG6TwM4O3XFw0saZMHViaKrSq2/rqdrmdrEQVogSaf7Z7CPa7FA3IGMm2G9mVt2xa94DP4gfElrGgG0R1vJZCV9L4ZMM2bg7OsU9XMU++tsOyKm/o+I/AMOxlgy/2m5KSganPswEGSiFWBE7foxLZT6+amXWHjopE43qWstOLGVsyfsQawBfcXOiqPYsOqEXgnvl8uqGfvE/UfocHuZGeQ/y8w0Q5rLfO3bMGaOFHzqBWeYK92pt8VAmDV3TvXHwPuIkG85qThUa4mw2s3Am/U9wdHWj1Ou6ZiFn6iHR9ASB1AFPR/qOLPWYIboSxlZTnKCs5/z+zuFZDTB9YO5hhmAr4= \ No newline at end of file From fb23de5d504815bb2de2bfc54d51f48df68eee64 Mon Sep 17 00:00:00 2001 From: SimLeek Date: Wed, 20 Feb 2019 00:30:23 -0700 Subject: [PATCH 5/9] wheel_testing: Added spaces after requires as a hack to fix cibuildwheel --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 9196310..d9eb6ca 100644 --- a/setup.py +++ b/setup.py @@ -14,9 +14,9 @@ with open('README.md', 'r', encoding='utf-8') as f: readme = f.read() REQUIRES = [ - "opencv_python==4.0.0.21" - "localpubsub==0.0.3", - "numpy==1.16.1" + "opencv_python==4.0.0.21 " + "localpubsub==0.0.3 ", + "numpy==1.16.1 " ] setup( From 8d3e3140d175afc01c4676927573d7ff269e9bb9 Mon Sep 17 00:00:00 2001 From: SimLeek Date: Wed, 20 Feb 2019 00:41:09 -0700 Subject: [PATCH 6/9] wheel_testing: Added spaces between requires operators as a hack to fix cibuildwheel --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index d9eb6ca..55ba4f6 100644 --- a/setup.py +++ b/setup.py @@ -14,9 +14,9 @@ with open('README.md', 'r', encoding='utf-8') as f: readme = f.read() REQUIRES = [ - "opencv_python==4.0.0.21 " - "localpubsub==0.0.3 ", - "numpy==1.16.1 " + 'opencv_python == 4.0.0.21' + 'localpubsub == 0.0.3', + 'numpy == 1.16.1' ] setup( From 17ef8146709b7029e0fff151569ee1c3048fcbb0 Mon Sep 17 00:00:00 2001 From: SimLeek Date: Wed, 20 Feb 2019 00:41:34 -0700 Subject: [PATCH 7/9] wheel_testing: Added comma to fix requires --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 55ba4f6..f28b1fb 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ with open('README.md', 'r', encoding='utf-8') as f: readme = f.read() REQUIRES = [ - 'opencv_python == 4.0.0.21' + 'opencv_python == 4.0.0.21', 'localpubsub == 0.0.3', 'numpy == 1.16.1' ] From 6fd75c513156c63a14d92919c61506ec0849e9ae Mon Sep 17 00:00:00 2001 From: SimLeek Date: Wed, 20 Feb 2019 00:57:17 -0700 Subject: [PATCH 8/9] wheel_testing: restricting wheel tests to current testing python version. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 47f8588..5fcd0e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,9 @@ python: install: - pip install -r requirements.txt script: +- if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then export CIBW_BUILD=cp27; fi +- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then export CIBW_BUILD=cp35; fi +- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then export CIBW_BUILD=cp36; fi - pip install cibuildwheel==0.10.1 - cibuildwheel --output-dir wheelhouse From fe5cfefd40604716743cdb7a5b319dec78fc6617 Mon Sep 17 00:00:00 2001 From: SimLeek Date: Wed, 20 Feb 2019 01:01:56 -0700 Subject: [PATCH 9/9] wheel_testing: fixed wheel testing build selector. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5fcd0e6..94c250f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,9 @@ python: install: - pip install -r requirements.txt script: -- if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then export CIBW_BUILD=cp27; fi -- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then export CIBW_BUILD=cp35; fi -- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then export CIBW_BUILD=cp36; fi +- if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then export CIBW_BUILD='cp27*'; fi +- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then export CIBW_BUILD='cp35*'; fi +- if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then export CIBW_BUILD='cp36*'; fi - pip install cibuildwheel==0.10.1 - cibuildwheel --output-dir wheelhouse