Skip to content

Commit

Permalink
Merge pull request #99 from descarteslabs/release/v0.3.2
Browse files Browse the repository at this point in the history
v0.3.2 release
  • Loading branch information
samskillman authored May 31, 2017
2 parents 6a7971d + 67260b0 commit 5837cd7
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion descarteslabs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

# flake8: noqa

__version__ = "0.3.1"
__version__ = "0.3.2"
from .auth import Auth
descartes_auth = Auth()

Expand Down
14 changes: 10 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +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():
Expand All @@ -35,7 +41,7 @@ def do_setup():
kwargs['author'] = 'Descartes Labs'
kwargs['author_email'] = '[email protected]'
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",
Expand All @@ -47,7 +53,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'] = [
Expand Down

0 comments on commit 5837cd7

Please sign in to comment.