From b5b18e6b452111c6d619c1d1f6fc4c18b6bce987 Mon Sep 17 00:00:00 2001 From: Michael Warkentin Date: Tue, 27 Feb 2018 21:09:22 -0500 Subject: [PATCH 1/9] Travis updates * Replace python 3.4 with 3.6 * Drop django 1.7, add 1.11 and 2.0 * Configure travis to deploy to pypi --- .travis.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8cf21bc..a83e87d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,20 +3,16 @@ language: python python: - "2.7" - - "3.4" - "3.5" + - "3.6" env: matrix: - - DJANGO_VERSION=1.7 - DJANGO_VERSION=1.8 - DJANGO_VERSION=1.9 - DJANGO_VERSION=1.10 - -matrix: - exclude: - - python: "3.5" - env: DJANGO_VERSION=1.7 + - DJANGO_VERSION=1.11 + - DJANGO_VERSION=2.0 install: - pip install tox coveralls @@ -30,3 +26,12 @@ after_success: coveralls notifications: slack: tobalabs:XPt5OlsKuFGgIQZp0DpNXBUl + +deploy: + provider: pypi + user: mwarkentin + password: + secure: "nCd8+TIoZjsBw6b7w2T/EQduRL63f6aKdzdg2xR0tw2hdoByCmBVElbZlyuIbYkvg8FTVqnV4YnOoad4+Kg1pcqRbIa5YfpZTPv6IELXgvmCOZDlIoU1opV6By8RpIqu5NGXfoOcFbTmj8AfFAKkga1fwtUUDWBpl3VgTLAfcVI=" + distributions: "sdist bdist_wheel" + on: + tags: true From 987db9d69ec177fb6fd4e6e8cd879b1c8f0f238d Mon Sep 17 00:00:00 2001 From: Michael Warkentin Date: Tue, 27 Feb 2018 21:11:38 -0500 Subject: [PATCH 2/9] Bump version for deploy test --- watchman/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/__init__.py b/watchman/__init__.py index a842d05..0fcbc51 100644 --- a/watchman/__init__.py +++ b/watchman/__init__.py @@ -1 +1 @@ -__version__ = '0.15.0' +__version__ = '1.0.0-test' From c3d63e05a411d82c3021b22da68807132ae7b622 Mon Sep 17 00:00:00 2001 From: Michael Warkentin Date: Tue, 27 Feb 2018 21:22:28 -0500 Subject: [PATCH 3/9] Update tox config --- .travis.yml | 5 +++++ tox.ini | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a83e87d..4e358d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,11 @@ env: - DJANGO_VERSION=1.11 - DJANGO_VERSION=2.0 +matrix: + exclude: + - python: "2.7" + env: DJANGO_VERSION=2.0 + install: - pip install tox coveralls diff --git a/tox.ini b/tox.ini index 3652df0..26017dd 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = covclean, - py{27,34}-dj{17,18,19,110}, - py35-dj{18,19,110}, + py27-dj{18,19,110,111}, + py{35,36}-dj{18,19,110,111,20}, coverage [testenv] @@ -10,10 +10,11 @@ setenv = PYTHONPATH = {toxinidir}:{toxinidir}/watchman commands = coverage run --parallel --source watchman runtests.py {posargs} deps = - dj17: Django>=1.7,<1.8 dj18: Django>=1.8,<1.9 dj19: Django>=1.9,<1.10 - dj110: Django==1.10rc1 + dj110: Django>=1.10,<1.11 + dj111: Django>=1.11,<2.0 + dj20: Django>=2.0,<2.1 -r{toxinidir}/requirements-test.txt [testenv:covclean] From b051843f1f2eaf8f6cd5fdce3fd866262b1e62a2 Mon Sep 17 00:00:00 2001 From: Michael Warkentin Date: Tue, 27 Feb 2018 21:43:50 -0500 Subject: [PATCH 4/9] Update pypi password --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4e358d1..260f45f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ deploy: provider: pypi user: mwarkentin password: - secure: "nCd8+TIoZjsBw6b7w2T/EQduRL63f6aKdzdg2xR0tw2hdoByCmBVElbZlyuIbYkvg8FTVqnV4YnOoad4+Kg1pcqRbIa5YfpZTPv6IELXgvmCOZDlIoU1opV6By8RpIqu5NGXfoOcFbTmj8AfFAKkga1fwtUUDWBpl3VgTLAfcVI=" + secure: "cQtAP8fMu+KzfBKG3ibTTXmDGZuz/FBp8RrLI8ddMGV4Jj5ElZLsvbqU43fiHbtVPV/uALDPF76WNGlpRH1P4w9m4XrFNCvkrnjtwIk7NZWi7uubWZcqQk9VE7MTP+i2IYrtNlGmlq1dbdJZcwS0mdzJcAAhAaP830Ekmqws9xE=" distributions: "sdist bdist_wheel" on: tags: true From 57ecc4025dd6166dec2d9a11811a2380116e520a Mon Sep 17 00:00:00 2001 From: Michael Warkentin Date: Tue, 27 Feb 2018 21:52:59 -0500 Subject: [PATCH 5/9] Create deploy job --- .travis.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 260f45f..ddc764f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,11 +32,13 @@ after_success: coveralls notifications: slack: tobalabs:XPt5OlsKuFGgIQZp0DpNXBUl -deploy: - provider: pypi - user: mwarkentin - password: - secure: "cQtAP8fMu+KzfBKG3ibTTXmDGZuz/FBp8RrLI8ddMGV4Jj5ElZLsvbqU43fiHbtVPV/uALDPF76WNGlpRH1P4w9m4XrFNCvkrnjtwIk7NZWi7uubWZcqQk9VE7MTP+i2IYrtNlGmlq1dbdJZcwS0mdzJcAAhAaP830Ekmqws9xE=" - distributions: "sdist bdist_wheel" - on: - tags: true +jobs: + include: + deploy: + provider: pypi + user: mwarkentin + password: + secure: "cQtAP8fMu+KzfBKG3ibTTXmDGZuz/FBp8RrLI8ddMGV4Jj5ElZLsvbqU43fiHbtVPV/uALDPF76WNGlpRH1P4w9m4XrFNCvkrnjtwIk7NZWi7uubWZcqQk9VE7MTP+i2IYrtNlGmlq1dbdJZcwS0mdzJcAAhAaP830Ekmqws9xE=" + distributions: "sdist bdist_wheel" + on: + tags: true From ad5ce5138bc05cba081b6569b5d1f3db0ccd24f3 Mon Sep 17 00:00:00 2001 From: Michael Warkentin Date: Tue, 27 Feb 2018 22:00:40 -0500 Subject: [PATCH 6/9] Switch to deploy stage? --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index ddc764f..0da647e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,17 +2,17 @@ sudo: false language: python python: - - "2.7" - - "3.5" - "3.6" + - "3.5" + - "2.7" env: matrix: - - DJANGO_VERSION=1.8 - - DJANGO_VERSION=1.9 - - DJANGO_VERSION=1.10 - - DJANGO_VERSION=1.11 - DJANGO_VERSION=2.0 + - DJANGO_VERSION=1.11 + - DJANGO_VERSION=1.10 + - DJANGO_VERSION=1.9 + - DJANGO_VERSION=1.8 matrix: exclude: @@ -34,7 +34,7 @@ notifications: jobs: include: - deploy: + - stage: deploy provider: pypi user: mwarkentin password: From a675cb6c3b06c5f54fb53bbeaa75b2aae93ead07 Mon Sep 17 00:00:00 2001 From: Michael Warkentin Date: Tue, 27 Feb 2018 22:25:31 -0500 Subject: [PATCH 7/9] Try try try again --- .travis.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0da647e..6df0d83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,11 +34,14 @@ notifications: jobs: include: - - stage: deploy - provider: pypi - user: mwarkentin - password: - secure: "cQtAP8fMu+KzfBKG3ibTTXmDGZuz/FBp8RrLI8ddMGV4Jj5ElZLsvbqU43fiHbtVPV/uALDPF76WNGlpRH1P4w9m4XrFNCvkrnjtwIk7NZWi7uubWZcqQk9VE7MTP+i2IYrtNlGmlq1dbdJZcwS0mdzJcAAhAaP830Ekmqws9xE=" - distributions: "sdist bdist_wheel" - on: - tags: true + - stage: pypi release + python: "3.6" + script: echo "Deploying to pypi ..." + deploy: + provider: pypi + user: mwarkentin + password: + secure: "cQtAP8fMu+KzfBKG3ibTTXmDGZuz/FBp8RrLI8ddMGV4Jj5ElZLsvbqU43fiHbtVPV/uALDPF76WNGlpRH1P4w9m4XrFNCvkrnjtwIk7NZWi7uubWZcqQk9VE7MTP+i2IYrtNlGmlq1dbdJZcwS0mdzJcAAhAaP830Ekmqws9xE=" + distributions: "sdist bdist_wheel" + on: + tags: true From 0bdb91d1cbcd11af7ab54fccf46c5fc2e3e08f3f Mon Sep 17 00:00:00 2001 From: Michael Warkentin Date: Tue, 27 Feb 2018 22:45:02 -0500 Subject: [PATCH 8/9] Add docs for releasing to pypi --- RELEASING.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 RELEASING.rst diff --git a/RELEASING.rst b/RELEASING.rst new file mode 100644 index 0000000..ae08f71 --- /dev/null +++ b/RELEASING.rst @@ -0,0 +1,23 @@ +========= +Releasing +========= + +Releases are created via Travis or uploaded locally using `twine `_. + +When the release is ready to go: + +* Make sure ``HISTORY.rst`` and other documentation is up to date +* Bump version in ``watchman/__init__.py`` +* Tag code: ``git tag 1.0.0`` +* Push tag: ``git push origin 1.0.0`` + +Travis will run the full test suite and deploy to pypi in a separate stage if everything passes. + +Local fallback +~~~~~~~~~~~~~~ + +If Travis isn't available or working for releases for some reason, you can use `twine `_ to upload the release. + +* Install and configure `twine `_ +* Check dist locally: ``make dist`` +* Deploy release: ``make release`` From 9b1b9bf4278d587fb22df5e52a176f3e060fe0c6 Mon Sep 17 00:00:00 2001 From: Michael Warkentin Date: Sun, 4 Mar 2018 20:41:17 -0500 Subject: [PATCH 9/9] Revert version --- watchman/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/__init__.py b/watchman/__init__.py index 0fcbc51..a842d05 100644 --- a/watchman/__init__.py +++ b/watchman/__init__.py @@ -1 +1 @@ -__version__ = '1.0.0-test' +__version__ = '0.15.0'