From 3f7f82249b82271fd729128bbebb6dde5f259268 Mon Sep 17 00:00:00 2001 From: Sam Skillman Date: Sat, 27 May 2017 10:17:58 -0600 Subject: [PATCH 1/3] v0.3.2 release * Better version parsing in setup.py * Update changelog in README.md --- README.md | 10 ++++++++-- descarteslabs/__init__.py | 2 +- setup.py | 13 +++++++++---- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index aa2006ec..fadd14f8 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,11 @@ Changelog ## [Unreleased] +## [0.3.2] - 2017-05-27 +### Fixes +- Strict "requests" versions needed due to upstream instability. + + ## [0.3.1] - 2017-05-17 ### Fixes - Fix python 3 command line compatibility @@ -76,8 +81,9 @@ Changelog ### Added - Initial release of client library -[Unreleased]: https://github.com/descarteslabs/descarteslabs-python/compare/v0.3.1...HEAD -[0.3.1]: https://github.com/descarteslabs/descarteslabs-python/compare/v0.3.2...v0.3.1 +[Unreleased]: https://github.com/descarteslabs/descarteslabs-python/compare/v0.3.2...HEAD +[0.3.2]: https://github.com/descarteslabs/descarteslabs-python/compare/v0.3.1...v0.3.2 +[0.3.1]: https://github.com/descarteslabs/descarteslabs-python/compare/v0.3.0...v0.3.1 [0.3.0]: https://github.com/descarteslabs/descarteslabs-python/compare/v0.2.2...v0.3.0 [0.2.2]: https://github.com/descarteslabs/descarteslabs-python/compare/v0.2.1...v0.2.2 [0.2.1]: https://github.com/descarteslabs/descarteslabs-python/compare/v0.2.0...v0.2.1 diff --git a/descarteslabs/__init__.py b/descarteslabs/__init__.py index 01e50c64..46b1a6b8 100644 --- a/descarteslabs/__init__.py +++ b/descarteslabs/__init__.py @@ -14,7 +14,7 @@ # flake8: noqa -__version__ = "0.3.1" +__version__ = "0.3.2" from .auth import Auth descartes_auth = Auth() diff --git a/setup.py b/setup.py index eb14543b..6ad39ee4 100644 --- a/setup.py +++ b/setup.py @@ -14,13 +14,18 @@ # See the License for the specific language governing permissions and # limitations under the License. +import ast import sys import os +import re from setuptools import setup, find_packages - -__version__ = "0.3.1" - +# Parse version out of descarteslabs/__init__.py +_version_re = re.compile(r'__version__\s+=\s+(.*)') +with open('descarteslabs/__init__.py', 'rb') as f: + version = str(ast.literal_eval(_version_re.search( + f.read().decode('utf-8')).group(1)) + ) def do_setup(): src_path = os.path.dirname(os.path.abspath(sys.argv[0])) @@ -47,7 +52,7 @@ def do_setup(): "Programming Language :: Python :: 3.6", ] kwargs['classifiers'] = clssfrs - kwargs['version'] = __version__ + kwargs['version'] = version kwargs['packages'] = find_packages('.') kwargs['package_data'] = {'descarteslabs.services': ['gd_bundle-g2-g1.crt']} kwargs['scripts'] = [ From e1459e774b2e4eaa7cb4caea8df7961c2409e7d5 Mon Sep 17 00:00:00 2001 From: Sam Skillman Date: Sat, 27 May 2017 10:25:09 -0600 Subject: [PATCH 2/3] __version__ to version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6ad39ee4..91850aeb 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ def do_setup(): kwargs['author'] = 'Descartes Labs' kwargs['author_email'] = 'hello@descarteslabs.com' kwargs['url'] = 'https://github.com/descarteslabs/descarteslabs-python' - kwargs['download_url'] = "https://github.com/descarteslabs/descarteslabs-python/archive/v%s.tar.gz" % __version__ + kwargs['download_url'] = "https://github.com/descarteslabs/descarteslabs-python/archive/v%s.tar.gz" % version clssfrs = [ "Programming Language :: Python", From 1cdc0f61dc305b8e381f4b5ea076a2553227407f Mon Sep 17 00:00:00 2001 From: Sam Skillman Date: Sat, 27 May 2017 10:27:34 -0600 Subject: [PATCH 3/3] flake8 --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 91850aeb..7c156845 100644 --- a/setup.py +++ b/setup.py @@ -27,6 +27,7 @@ f.read().decode('utf-8')).group(1)) ) + def do_setup(): src_path = os.path.dirname(os.path.abspath(sys.argv[0])) old_path = os.getcwd()