diff --git a/.bumpversion.cfg b/.bumpversion.cfg index e20602f..5945178 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.0 +current_version = 0.5.1 commit = True tag = False diff --git a/.travis.yml b/.travis.yml index deb5409..1358625 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,8 @@ script: - coverage run runtests.py - cd example_project - ./manage.py test +- cd ../docs +- if [[ `python -V | grep -c -e 3.6` -eq 1 && "$DJANGO" == 'django>=1.11,<1.12' ]]; then sphinx-build -W -b html -d _build/doctrees . _build/html ; fi - cd .. # for coverage reports after_success: # coverage is run in parallel, so it is necessary to combine the reports diff --git a/HISTORY.rst b/HISTORY.rst index d6acb3b..55b75b4 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -7,6 +7,16 @@ Next Release - Nothing yet! +0.5.1 (2017-08-27) +------------------ + +- Docfix: Remove links to ReadTheDocs Stable version from ReadMe, as we + are unable to build that version until v1.0.0 release. See + `rtfd/readthedocs.org#2032`_ for more information. (`#31`_) + +.. _rtfd/readthedocs.org#2032: https://github.com/rtfd/readthedocs.org/issues/2032 +.. _#31: https://github.com/jambonsw/django-improved-user/pull/31 + 0.5.0 (2017-08-26) ------------------ @@ -18,9 +28,9 @@ Next Release an example project demonstrating integration of django-improved-user with Django as well as django-registration. (`#28`_) This content is used to create some of the documentation (`#29`_). -- The ``UserManager`` was setting the ``last_login`` attribute of new users at - creation time. Reported in `#25`_, fixed in `#27`_ (``last_login`` is left - blank until the user actually logs in). +- Bugfix: The ``UserManager`` was setting the ``last_login`` attribute + of new users at creation time. Reported in `#25`_, fixed in `#27`_ + (``last_login`` is ``None`` until the user actually logs in). .. _#25: https://github.com/jambonsw/django-improved-user/issues/25 .. _#26: https://github.com/jambonsw/django-improved-user/pull/26 diff --git a/README.rst b/README.rst index 0a129eb..b2e0085 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,6 @@ Latest Release: |Version| |Tag| -Documentation: |StableDocs| |DevelopmentDocs| +Documentation: |DevelopmentDocs| Compatibility: |Implementation| |Python| |Django| |License| @@ -14,9 +14,9 @@ Tests: |Travis| |AppVeyor| |Coverage| |PyUp| :target: https://github.com/jambonsw/django-improved-user/releases :alt: Github Tag -.. |StableDocs| image:: https://readthedocs.org/projects/django-improved-user/badge/?version=stable - :target: http://django-improved-user.readthedocs.io/en/stable/?badge=stable - :alt: Stable Documentation Status +.. .. |StableDocs| image:: https://readthedocs.org/projects/django-improved-user/badge/?version=stable +.. :target: http://django-improved-user.readthedocs.io/en/stable/?badge=stable +.. :alt: Stable Documentation Status .. |DevelopmentDocs| image:: https://readthedocs.org/projects/django-improved-user/badge/?version=latest :target: http://django-improved-user.readthedocs.io/en/latest/?badge=latest @@ -71,4 +71,4 @@ documentation`_. For information about how to help with the project, please see the `contributing documentation`_. .. _contributing documentation: https://django-improved-user.readthedocs.io/en/latest/contributing.html -.. _quickstart documentation: https://django-improved-user.readthedocs.io/en/stable/quickstart.html +.. _quickstart documentation: https://django-improved-user.readthedocs.io/en/latest/quickstart.html diff --git a/appveyor.yml b/appveyor.yml index a74a7da..2e16bb9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ # https://www.appveyor.com/docs/appveyor-yml/ -version: '{branch}-v0.5.0-{build}' +version: '{branch}-v0.5.1-{build}' branches: only: - development diff --git a/docs/conf.py b/docs/conf.py index 147e051..01342f5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -163,9 +163,9 @@ def setup(app): # built documents. # # The short X.Y version. -version = '0.5.0' +version = '0.5.1' # The full version, including alpha/beta/rc tags. -release = '0.5.0' +release = '0.5.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -203,7 +203,7 @@ def setup(app): # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the built-in static files, # so a file named "default.css" will overwrite the built-in "default.css". -html_static_path = ['_static'] +# html_static_path = ['_static'] # Custom sidebar templates, must be a dictionary that maps document names # to template names. diff --git a/docs/data_migrations.rst b/docs/data_migrations.rst index 321b648..7d2d764 100644 --- a/docs/data_migrations.rst +++ b/docs/data_migrations.rst @@ -61,10 +61,9 @@ first, and deletes the user we created. Finally, we use our migration functions via :py:class:`~django.db.migrations.operations.RunPython` in a -:py:class:`django:django.db.migrations.Migration` subclass. Please note -the *addition* of the dependency below. If your file already had a -dependency, please add the tuple below, but do not remove the existing -tuple(s). +``django.db.migrations.Migration`` subclass. Please note the *addition* +of the dependency below. If your file already had a dependency, please +add the tuple below, but do not remove the existing tuple(s). .. literalinclude:: ../example_project/user_integration/migrations/0001_add_user.py :pyobject: Migration diff --git a/setup.py b/setup.py index d880009..9b3657c 100755 --- a/setup.py +++ b/setup.py @@ -139,7 +139,7 @@ def run_tests(self): setup( name='django-improved-user', - version='0.5.0', + version='0.5.1', description=( 'A custom Django user model for best practices email-based login.' ), @@ -183,7 +183,6 @@ def run_tests(self): 'Programming Language :: Python :: 3 :: Only', 'Framework :: Django', 'Framework :: Django :: 1.8', - 'Framework :: Django :: 1.9', 'Framework :: Django :: 1.10', 'Framework :: Django :: 1.11', ], diff --git a/tox.ini b/tox.ini index 44e2236..df6702b 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,6 @@ envlist = [testenv:lint] basepython=python3.6 deps = - Django -r{toxinidir}/requirements.txt setenv = PYTHONDONTWRITEBYTECODE=1 @@ -21,7 +20,6 @@ commands = [testenv:pylint] basepython=python3.6 deps = - Django -r{toxinidir}/requirements.txt setenv = PYTHONDONTWRITEBYTECODE=1 @@ -44,7 +42,6 @@ commands = basepython=python3.6 changedir=docs deps = - Django -r{toxinidir}/requirements.txt commands= sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html