diff options
| -rw-r--r-- | README.rst | 7 | ||||
| -rw-r--r-- | RELEASING.txt | 3 | ||||
| -rw-r--r-- | pyramid/tests/test_integration.py | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/README.rst b/README.rst index a3458028b..adf7eea5e 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,13 @@ Pyramid ======= +.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=master + :target: https://travis-ci.org/Pylons/pyramid + +.. image:: https://readthedocs.org/projects/pyramid/badge/?version=master + :target: http://docs.pylonsproject.org/projects/pyramid/en/master/ + :alt: Documentation Status + Pyramid is a small, fast, down-to-earth, open source Python web framework. It makes real-world web application development and deployment more fun, more predictable, and more productive. diff --git a/RELEASING.txt b/RELEASING.txt index 553d2dcf2..0adef552c 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -26,6 +26,9 @@ Releasing Pyramid - Copy relevant changes (delta bug fixes) from CHANGES.txt to docs/whatsnew-X.X (if it's a major release). +- update README.rst to use correct versions of badges and URLs according to + each branch and context, i.e., RTD "latest" == GitHub/Travis "1.x-branch". + - Make sure docs render OK:: $ cd docs diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py index 35648ed38..c2786c391 100644 --- a/pyramid/tests/test_integration.py +++ b/pyramid/tests/test_integration.py @@ -81,7 +81,7 @@ class StaticAppBase(IntegrationBase): res = self.testapp.get('/static/.hiddenfile', status=200) _assertBody(res.body, os.path.join(here, 'fixtures/static/.hiddenfile')) - if defaultlocale is not None: + if defaultlocale is not None: # pragma: no cover # These tests are expected to fail on LANG=C systems due to decode # errors and on non-Linux systems due to git highchar handling # vagaries |