From 994211cd8e8f233f9d665f420ab3e032f24e5c95 Mon Sep 17 00:00:00 2001 From: mhadam Date: Mon, 1 Oct 2018 09:46:14 -0400 Subject: [PATCH 1/5] Update PyPI deployment to use Twine (close #207) --- .travis.yml | 1 + .travis/deploy.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7424bc4e..ee02e065 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ python: - '3.4' - '3.5' install: +- pip install -U pip setuptools virtualenv twine - pip install -r requirements-test.txt - pip install release-manager - pip install -e . diff --git a/.travis/deploy.py b/.travis/deploy.py index 7efde113..75c54e79 100755 --- a/.travis/deploy.py +++ b/.travis/deploy.py @@ -13,7 +13,7 @@ HOME = expanduser("~") -DEFAULT_SERVER = 'https://pypi.python.org/pypi' +DEFAULT_SERVER = 'https://upload.pypi.org/legacy/' DEFAULT_REPO = 'pypi' PYPIRC_FILE = '%s/.pypirc' % HOME @@ -71,8 +71,8 @@ def deploy_to_pypi(): """Deploys the release to PyPi""" logger.log_start("Deploying to PyPi") os.chdir(TRAVIS_BUILD_DIR) - utils.execute("python setup.py register -r pypi", shell=True) - utils.execute("python setup.py sdist upload -r pypi", shell=True) + utils.execute("python setup.py sdist bdist_wheel", shell=True) + utils.execute("twine upload dist/*", shell=True) logger.log_info("Module deployed to PyPi!") logger.log_done() From 29875d1a57d6fc73e800649e6d9effc3babdf280 Mon Sep 17 00:00:00 2001 From: mhadam Date: Mon, 1 Oct 2018 09:48:40 -0400 Subject: [PATCH 2/5] Remove Python 3.3 from tests (close #206) --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ee02e065..42d762c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ services: - redis-server python: - '2.7' -- '3.3' - '3.4' - '3.5' install: From 3e5fdaaaf20ed6b4ca4b6b9fdf20f859842dcb0a Mon Sep 17 00:00:00 2001 From: mhadam Date: Mon, 1 Oct 2018 09:52:30 -0400 Subject: [PATCH 3/5] Add version bounds for all dependencies (close #208) --- setup.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 88392f47..1259946c 100644 --- a/setup.py +++ b/setup.py @@ -75,12 +75,12 @@ ], install_requires=[ - "greenlet==0.4.10", - "requests==2.2.1", - "pycontracts==1.7.6", - "celery==3.1.11", - "gevent==1.0.2", - "redis==2.9.1", - "six==1.9.0" + "greenlet>=0.4.10,<1.0.0", + "requests>=2.2.1,<3.0.0", + "pycontracts>=1.7.6,<2.0.0", + "celery>=3.1.11,<4.0.0", + "gevent>=1.0.2,<2.0.0", + "redis>=2.9.1,<3.0.0", + "six>=1.9.0,<2.0.0" ], ) From 1ad98f49c0fa426909e2d5d29dd8eacf733c1d7b Mon Sep 17 00:00:00 2001 From: mhadam Date: Mon, 1 Oct 2018 10:03:28 -0400 Subject: [PATCH 4/5] Fix date for 0.8.0 release in CHANGELOG (close #183) --- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index fe6d5d23..4f54a382 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -Version 0.8.0 (2016-09-xx) +Version 0.8.0 (2016-10-13) -------------------------- Add byte_limit to Emitter (#170) Add support for dvce_sent_tstamp (#159) From 93e43aad96b2f78b4478e89868c18d11419b0580 Mon Sep 17 00:00:00 2001 From: mhadam Date: Mon, 1 Oct 2018 10:01:23 -0400 Subject: [PATCH 5/5] Prepared for release --- CHANGES.txt | 7 +++++++ snowplow_tracker/_version.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 4f54a382..61b4e60d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,10 @@ +Version 0.8.1 (2018-10-02) +-------------------------- +Fix date for 0.8.0 release in CHANGELOG (#183) +Remove Python 3.3 from tests (#206) +Update PyPI deployment to use Twine (#207) +Add version bounds for all dependencies (#208) + Version 0.8.0 (2016-10-13) -------------------------- Add byte_limit to Emitter (#170) diff --git a/snowplow_tracker/_version.py b/snowplow_tracker/_version.py index 02e250a1..c9739747 100644 --- a/snowplow_tracker/_version.py +++ b/snowplow_tracker/_version.py @@ -20,6 +20,6 @@ """ -__version_info__ = (0, 8, 0) +__version_info__ = (0, 8, 1) __version__ = ".".join(str(x) for x in __version_info__) __build_version__ = __version__ + ''