Skip to content

Commit

Permalink
Remove rst-lint from travis as no longer works with 2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
zimeon committed Mar 20, 2017
1 parent 7088218 commit 28e0592
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 12 additions & 11 deletions pypi_upload.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://localhost:8000>
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 <http://localhost:8000>
10. If all checks out OK, tag and push the new version to github with something like:

```
git tag -n1
Expand All @@ -29,6 +30,6 @@ Putting up a new version
python setup.py sdist upload
```

10. Then check on PyPI at <https://pypi.python.org/pypi/iiif>
11. Finally, back on working branch start new version number by editing `iiif/_version.py` and `CHANGES.md`
11. Then check on PyPI at <https://pypi.python.org/pypi/iiif>
12. Finally, back on working branch start new version number by editing `iiif/_version.py` and `CHANGES.md`

1 change: 0 additions & 1 deletion run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 28e0592

Please sign in to comment.