From 28e0592a61e9fc920c7f48f09b1bd5c124f986c5 Mon Sep 17 00:00:00 2001 From: Simeon Warner Date: Mon, 20 Mar 2017 17:30:46 -0400 Subject: [PATCH] Remove rst-lint from travis as no longer works with 2.6 --- .travis.yml | 2 +- pypi_upload.md | 23 ++++++++++++----------- run_tests.sh | 1 - 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 744be43..241ac6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ python: install: - sudo apt-get update - sudo apt-get install libmagic-dev libwebp-dev - - pip install iiif_validator coveralls pep8 pep257 restructuredtext_lint testfixtures + - pip install iiif_validator coveralls pep8 pep257 testfixtures - python setup.py install script: # use -n with run_validate.sh because I can't get the netpbm tests going on Travis yet diff --git a/pypi_upload.md b/pypi_upload.md index 08426b8..19a15b3 100644 --- a/pypi_upload.md +++ b/pypi_upload.md @@ -10,15 +10,16 @@ Putting up a new version ------------------------ 0. Bump version number working branch in iiif/_version.py and check CHANGES.md is up to date - 1. Check all tests good (python setup.py test; py.test) - 2. Check code is up-to-date with github version - 3. Check out master and merge in working branch - 4. Check all tests good (python setup.py test; py.test) - 5. Make sure master README has correct travis-ci and coveralls icon links for master branch (?branch=master) - 6. Check branches are as expected (git branch -a) - 7. Check local build and version reported OK (python setup.py build; sudo python setup.py install) - 8. Check iiif_testserver.py correctly starts server and is accessible from - 9. If all checks out OK, tag and push the new version to github with something like: + 1. Check format of README: `rst-lint README` + 2. Check all tests good (python setup.py test; py.test) + 3. Check code is up-to-date with github version + 4. Check out master and merge in working branch + 5. Check all tests good (python setup.py test; py.test) + 6. Make sure master README has correct travis-ci and coveralls icon links for master branch (?branch=master) + 7. Check branches are as expected (git branch -a) + 8. Check local build and version reported OK (python setup.py build; sudo python setup.py install) + 9. Check iiif_testserver.py correctly starts server and is accessible from + 10. If all checks out OK, tag and push the new version to github with something like: ``` git tag -n1 @@ -29,6 +30,6 @@ Putting up a new version python setup.py sdist upload ``` - 10. Then check on PyPI at - 11. Finally, back on working branch start new version number by editing `iiif/_version.py` and `CHANGES.md` + 11. Then check on PyPI at + 12. Finally, back on working branch start new version number by editing `iiif/_version.py` and `CHANGES.md` diff --git a/run_tests.sh b/run_tests.sh index cb283ab..2721b81 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -5,4 +5,3 @@ python setup.py test pep8 --ignore=E501 *.py iiif/*.py iiif/generators/*.py tests/*.py tests/testlib/*.py pep257 *.py iiif/*.py iiif/generators/*.py tests/*.py tests/testlib/*.py -rst-lint README