From 0f03ef54e22282d2f6dd7c3e0c31114b4c944eb4 Mon Sep 17 00:00:00 2001 From: Tristan Seligmann Date: Sun, 14 Feb 2016 22:38:49 +0200 Subject: [PATCH 01/10] Switch from Coveralls to Codecov. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94cd86a..1c4fc86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,8 @@ env: install: # Upgrade pip/setuptools - pip install -U pip setuptools - # Tools for checking coverage and uploading to coveralls - - pip install coveralls coverage + # Tools for checking coverage and uploading to Codecov + - pip install coverage codecov - | python setup.py --version if [ "${MODE}" == "inplace" ]; then @@ -40,7 +40,7 @@ script: - cd /tmp && coverage report -m after_success: - - cd "${TRAVIS_BUILD_DIR}" && mv /tmp/.coverage . && coveralls + - cd "${TRAVIS_BUILD_DIR}" && mv /tmp/.coverage . && codecov notifications: email: false From 4eea1100718fda86dda5c1a306a33abc6726de05 Mon Sep 17 00:00:00 2001 From: Tristan Seligmann Date: Sun, 14 Feb 2016 22:42:38 +0200 Subject: [PATCH 02/10] Add badges to README. --- README.txt => README.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename README.txt => README.rst (75%) diff --git a/README.txt b/README.rst similarity index 75% rename from README.txt rename to README.rst index 0d09d2b..99c3be1 100644 --- a/README.txt +++ b/README.rst @@ -1,6 +1,8 @@ +.. image:: https://travis-ci.org/twisted/mantissa.svg?branch=master + :target: https://travis-ci.org/twisted/mantissa -Divmod Mantissa -=============== +.. image:: https://codecov.io/github/twisted/mantissa/coverage.svg?branch=master + :target: https://codecov.io/github/twisted/mantissa?branch=master Divmod Mantissa is an application server with a web interface built using Axiom and Nevow. From 97c24ec8d944d5a85cac5222900872493ae6e784 Mon Sep 17 00:00:00 2001 From: Tristan Seligmann Date: Sun, 14 Feb 2016 22:47:18 +0200 Subject: [PATCH 03/10] Actually, no information is available at this URL due to it no longer existing. --- README.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.rst b/README.rst index 99c3be1..2f51a10 100644 --- a/README.rst +++ b/README.rst @@ -18,8 +18,3 @@ administrative tools, a web server, and a system for different plugins which provide facets of functionality to advertise themselves to the administrator, install themselves on the site database, and be installed and removed from users' accounts. - -More information is available at: - - http://www.divmod.org/trac/wiki/DivmodMantissa - From cae2316f0eeebccfbbd56d87389a1239546a032d Mon Sep 17 00:00:00 2001 From: Tristan Seligmann Date: Mon, 15 Feb 2016 00:03:03 +0200 Subject: [PATCH 04/10] Run tests using tox. --- .travis.yml | 38 ++++++++++++-------------------------- tox.ini | 19 +++++++++++++++++++ 2 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 tox.ini diff --git a/.travis.yml b/.travis.yml index 1c4fc86..36ecef3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,39 +8,25 @@ branches: only: - master -python: - - "2.7" - #- "pypy" - env: - - MODE=inplace - - MODE=sdist - - MODE=wheel + - TOXENV=py27-twlatest + - TOXENV=py27-twtrunk + - TOXENV=py27-tw14 + - TOXENV=pypy-twlatest + - TOXENV=pypy-twtrunk + - TOXENV=pypy-tw14 + # Test inplace on one variant + - TOXENV=py27-twlatest DEVELOP=--develop install: - # Upgrade pip/setuptools - - pip install -U pip setuptools - # Tools for checking coverage and uploading to Codecov - - pip install coverage codecov - - | - python setup.py --version - if [ "${MODE}" == "inplace" ]; then - pip install --editable . - elif [ "${MODE}" == "sdist" ]; then - python setup.py sdist - pip install dist/Mantissa-"$(python setup.py --version)".tar.gz - elif [ "${MODE}" == "wheel" ]; then - pip install wheel - python setup.py bdist_wheel - pip install dist/Mantissa-"$(python setup.py --version)"-py2-none-any.whl - fi + - pip install -U pip setuptools wheel + - pip install tox codecov script: - - cd /tmp && coverage run --branch --source=xmantissa $(type -p trial) xmantissa - - cd /tmp && coverage report -m + - tox ${DEVELOP} after_success: - - cd "${TRAVIS_BUILD_DIR}" && mv /tmp/.coverage . && codecov + - mv .tox/.coverage . && codecov notifications: email: false diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..2f482ce --- /dev/null +++ b/tox.ini @@ -0,0 +1,19 @@ +[tox] +envlist={py27}-{twtrunk,twlatest,tw14} + +[testenv] +# Remove this once the PyPy branch lands: +setenv = + PYTHONHASHSEED = 0 +changedir={toxworkdir} +deps= + twlatest: Twisted + twtrunk: https://github.com/twisted/twisted/archive/trunk.zip + tw14: Twisted==14.0.0 + coverage +commands= + pip list + coverage run {envdir}/bin/trial \ + --temp-directory={envdir}/_trial_temp {posargs:xmantissa} + coverage report --rcfile={toxinidir}/.coveragerc + coverage html --rcfile={toxinidir}/.coveragerc --directory {envdir}/_coverage From 3d7cea5955152126d9014c2bb094d7c11fc33cfd Mon Sep 17 00:00:00 2001 From: Tristan Seligmann Date: Mon, 15 Feb 2016 00:07:00 +0200 Subject: [PATCH 05/10] Remove accidentally-included pypy variants. --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 36ecef3..e8b2874 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,6 @@ env: - TOXENV=py27-twlatest - TOXENV=py27-twtrunk - TOXENV=py27-tw14 - - TOXENV=pypy-twlatest - - TOXENV=pypy-twtrunk - - TOXENV=pypy-tw14 # Test inplace on one variant - TOXENV=py27-twlatest DEVELOP=--develop From 8992ae7583029f239bb23fe7a20da4d172f252f6 Mon Sep 17 00:00:00 2001 From: Tristan Seligmann Date: Mon, 15 Feb 2016 00:55:47 +0200 Subject: [PATCH 06/10] Allow Twisted trunk to fail since it isn't necessarily our fault. --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index e8b2874..c62ab8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,10 @@ env: # Test inplace on one variant - TOXENV=py27-twlatest DEVELOP=--develop +matrix: + allow_failures: + - env: TOXENV=py27-twtrunk + install: - pip install -U pip setuptools wheel - pip install tox codecov From 3b52a130e7107786983e3de4601f5b2292d82aa4 Mon Sep 17 00:00:00 2001 From: Tristan Seligmann Date: Tue, 16 Feb 2016 23:28:47 +0200 Subject: [PATCH 07/10] Remove unused nevow.livepage support code. --- doc/listings/interstore/cal.py | 2 +- xmantissa/test/test_theme.py | 2 +- xmantissa/webapp.py | 25 +------------------------ 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/doc/listings/interstore/cal.py b/doc/listings/interstore/cal.py index 663e47d..842eab3 100644 --- a/doc/listings/interstore/cal.py +++ b/doc/listings/interstore/cal.py @@ -32,7 +32,7 @@ class Busy(Exception): class MakeAppointment(Command): arguments = [("whom", SenderArgument()), ("when", String())] response = [("appointmentID", Unicode())] - errors = {"busy": Busy} + errors = {Busy: "busy"} class Appointment(Item, AMPReceiver): diff --git a/xmantissa/test/test_theme.py b/xmantissa/test/test_theme.py index 6abc7e7..c71e359 100644 --- a/xmantissa/test/test_theme.py +++ b/xmantissa/test/test_theme.py @@ -241,7 +241,7 @@ def test_publicPage(self): def test_navPage(self): """ - Test that L{webapp.GenericNavigationLivePage} supports theming of + Test that L{webapp.GenericNavigationAthenaPage} supports theming of Athena's unsupported-browser page based on an L{ITemplateNameResolver} installed on the viewing user's store. """ diff --git a/xmantissa/webapp.py b/xmantissa/webapp.py index 018088e..ef2a45f 100644 --- a/xmantissa/webapp.py +++ b/xmantissa/webapp.py @@ -21,7 +21,7 @@ from axiom.userbase import getAccountNames from nevow.rend import Page -from nevow import livepage, athena +from nevow import athena from nevow.inevow import IRequest from nevow import tags as t from nevow import url @@ -331,29 +331,6 @@ def __init__(self, webapp, fragment, pageComponents, username): _FragmentWrapperMixin.__init__(self, fragment, pageComponents) -class GenericNavigationLivePage(_FragmentWrapperMixin, livepage.LivePage, _ShellRenderingMixin): - def __init__(self, webapp, fragment, pageComponents, username): - livepage.LivePage.__init__(self, docFactory=webapp.getDocFactory('shell')) - _ShellRenderingMixin.__init__(self, webapp, pageComponents, username) - _FragmentWrapperMixin.__init__(self, fragment, pageComponents) - - # XXX TODO: support live nav, live fragments somehow - def render_head(self, ctx, data): - ctx.tag[t.invisible(render=t.directive("liveglue"))] - return _FragmentWrapperMixin.render_head(self, ctx, data) - - def goingLive(self, ctx, client): - getattr(self.fragment, 'goingLive', lambda x, y: None)(ctx, client) - - def locateHandler(self, ctx, path, name): - handler = getattr(self.fragment, 'locateHandler', None) - - if handler is None: - return getattr(self.fragment, 'handle_' + name) - else: - return handler(ctx, path, name) - - class GenericNavigationAthenaPage(_FragmentWrapperMixin, MantissaLivePage, From ad54c5cf1308ff4f3bcc0f1351b08050da656390 Mon Sep 17 00:00:00 2001 From: Tristan Seligmann Date: Wed, 17 Feb 2016 15:46:47 +0200 Subject: [PATCH 08/10] Update changelog for 0.8.4. --- NEWS.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/NEWS.txt b/NEWS.txt index 2a1c1a4..47ea1fd 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,3 +1,11 @@ +0.8.4 (2016-02-17): + - Remove unused `nevow.livepage` support code; fixes compatibility with Nevow + 0.13.0. + - StringEndpointPort ports are now deletable from the commandline (with + the `axiomatic port delete` command). + - Mantissa's CI now tests against Twisted trunk, for early warnings of + breakage. + 0.8.3 (2015-10-23): - StringEndpointPort was still broken, somehow. It really works now, promise! From a2b3408be6a99c78145cc24a9513539737fee704 Mon Sep 17 00:00:00 2001 From: Tristan Seligmann Date: Wed, 17 Feb 2016 16:26:54 +0200 Subject: [PATCH 09/10] Add some more backquotes. --- NEWS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.txt b/NEWS.txt index 47ea1fd..377d5f9 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,7 +1,7 @@ 0.8.4 (2016-02-17): - Remove unused `nevow.livepage` support code; fixes compatibility with Nevow 0.13.0. - - StringEndpointPort ports are now deletable from the commandline (with + - `StringEndpointPort` ports are now deletable from the commandline (with the `axiomatic port delete` command). - Mantissa's CI now tests against Twisted trunk, for early warnings of breakage. From 0618153b32d2c20970d96e798674ee7810995764 Mon Sep 17 00:00:00 2001 From: Tristan Seligmann Date: Wed, 17 Feb 2016 16:31:04 +0200 Subject: [PATCH 10/10] NEWS.txt is actually ReStructured Text, kinda. --- NEWS.txt => NEWS.rst | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename NEWS.txt => NEWS.rst (100%) diff --git a/NEWS.txt b/NEWS.rst similarity index 100% rename from NEWS.txt rename to NEWS.rst