Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.5.1 #31

Merged
merged 9 commits into from
Aug 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.5.0
current_version = 0.5.1
commit = True
tag = False

Expand Down
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 13 additions & 3 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
------------------

Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Latest Release: |Version| |Tag|

Documentation: |StableDocs| |DevelopmentDocs|
Documentation: |DevelopmentDocs|

Compatibility: |Implementation| |Python| |Django| |License|

Expand All @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
7 changes: 3 additions & 4 deletions docs/data_migrations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.'
),
Expand Down Expand Up @@ -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',
],
Expand Down
3 changes: 0 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ envlist =
[testenv:lint]
basepython=python3.6
deps =
Django
-r{toxinidir}/requirements.txt
setenv =
PYTHONDONTWRITEBYTECODE=1
Expand All @@ -21,7 +20,6 @@ commands =
[testenv:pylint]
basepython=python3.6
deps =
Django
-r{toxinidir}/requirements.txt
setenv =
PYTHONDONTWRITEBYTECODE=1
Expand All @@ -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
Expand Down