diff --git a/.gitignore b/.gitignore index 09c4f57..16cdbb7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,12 @@ +.cache *.egg-info build _build dist *.pyc __pycache__ +.cache/ +.coverage +htmlcov/ +pytest.ini +*.ini diff --git a/.travis.yml b/.travis.yml index 2001f25..ebd8108 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,35 @@ language: python python: - - '2.7' -install: - - pip install -r requirements.txt - - python setup.py develop +- '2.7' +- '3.3' +- '3.4' +- '3.5' +- '3.6' +install: pip install -e .[test] script: - - test -z "$STORMPATH_API_KEY_SECRET" || python setup.py test - - cd docs && make html +- test -z "$STORMPATH_API_KEY_SECRET" || python setup.py test +- test -z "$BUILD_DOCS" cd docs && make html && cd .. +- test -z "$BUILD_DOCS" || CURRENT_HASH=`git rev-parse HEAD` +- test -z "$BUILD_DOCS" || RELEASE_VERSION=`git tag | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort | awk '{print $4}' | tail -n 1` +- test -z "$BUILD_DOCS" || RELEASE_HASH=`git rev-list $RELEASE_VERSION -n 1` +- test -z "$BUILD_DOCS" || if [ "$CURRENT_HASH" = "$RELEASE_HASH" ]; then DEPLOY_DOCS=true; fi +- test -z "$DEPLOY_DOCS" || git config --global user.email "evangelists@stormpath.com" +- test -z "$DEPLOY_DOCS" || git config --global user.name "flask-stormpath Auto Doc Build" +- test -z "$DEPLOY_DOCS" || git clone git@github.com:stormpath/stormpath.github.io.git +- test -z "$DEPLOY_DOCS" || cd stormpath.github.io +- test -z "$DEPLOY_DOCS" || git fetch origin source:source +- test -z "$DEPLOY_DOCS" || git checkout source +- test -z "$DEPLOY_DOCS" || rm -rf source/python/flask/latest +- test -z "$DEPLOY_DOCS" || cp -r ../docs/_build/html source/python/flask/latest +- test -z "$DEPLOY_DOCS" || cp -r ../docs/_build/html source/python/flask/$RELEASE_VERSION +- test -z "$DEPLOY_DOCS" || git add --all +- test -z "$DEPLOY_DOCS" || git commit -m "flask-stormpath release $RELEASE_VERSION" +- test -z "$DEPLOY_DOCS" || git push origin source env: global: - - secure: hAO+zuFzu6JSBMbZv6I0lMxRiD1NPxIFoKTFzWZ6R9v7CMzt6Gyisp9u8TVdLMyluGgcu1OMXfauOy57q2N85aQBPosgyrDb9PW4NI9bpEOP3B2sjGMfpYLK94RylfjbiginkuhQElgqOJ0V0gGiJ1+pQ53AdY0TB5EMmI4YmSs= - - secure: c7r7HLIBk+jbfrJtJCDbVW4n6izcPx69pn32HltNYV+bd6YZIpIFvR4D7dsvS3dO18ITel2oqATuaxdG0U1UAEssyDiwoCcUPN8R822i5pGAgXV/CLVbxPRNUkVGRJslDzNvjYqSXVULaCl1g5yMHcdlaylBGAKwhXCF8xCAFcY= + - secure: Q7sQSmMxZs0mfqgccUWr16rn38e+uFUbdIRaU0igYvIV24q80lXCWA5vvCwoSpa3AAVTEF4+XDaBdZl+HzD8PKjmAldljWIOi22fjoiyPtaA/+n5F9w8QbwmZ9T/pPfmHqr0yzYg89bsuGKJ7Irem1NdtOAozc2tVdfhhXI6NYM= + - secure: CZOy1BN3piid5RgqjZRCQmYI6eZAQI+ojVb/pWA1APFFVNuQtKgAvsjI1zaQRx5xmiGFco1/BhSLBokwknh7MJcwxckpC5D7Y9Ccev4jbWG/2Gif3wjKlezBra2w6LheimcLvbkC+QKJ2n2oNI2xJxr95sBAMaQORJFXXD6Y2wg= +matrix: + include: + - env: BUILD_DOCS=true + python: '3.6' diff --git a/README.md b/README.md index 1fa6c04..81d2c46 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ Build simple, secure web applications with Stormpath and Flask! -[](https://pypi.python.org/pypi/Flask-Stormpath/) -[](https://pypi.python.org/pypi/Flask-Stormpath/) -[](https://travis-ci.org/stormpath/stormpath-flask) +[](https://pypi.python.org/pypi/Flask-Stormpath/) +[](https://pypi.python.org/pypi/Flask-Stormpath/) +[](https://travis-ci.org/stormpath/stormpath-flask) ## Documentation diff --git a/docs/_templates/page.html b/docs/_templates/page.html index df39077..9982606 100644 --- a/docs/_templates/page.html +++ b/docs/_templates/page.html @@ -1,5 +1,33 @@ {% extends "!page.html" %} +{% block extrahead %} + {{ super() }} + + + +{% endblock %} + +{% block header %} + {{ super() }} + + +{% endblock %} + {% block footer %} {{ super() }} diff --git a/flask_stormpath/templates/flask_stormpath/login.html b/flask_stormpath/templates/flask_stormpath/login.html index b4f924e..dd5ff2b 100644 --- a/flask_stormpath/templates/flask_stormpath/login.html +++ b/flask_stormpath/templates/flask_stormpath/login.html @@ -1,4 +1,4 @@ -{% extends config['STORMPATH_BASE_TEMPLATE'] %} +{% extends config['stormpath']['base_template'] %} {% block title %}Log In{% endblock %} {% block description %}Log into your account!{% endblock %} @@ -9,10 +9,10 @@
+ This verification link is no longer valid. + Please request a new link from the form below. +
+