Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
LincolnPuzey committed Nov 28, 2020
2 parents 38f0c02 + bbc41d8 commit 02cd02c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,14 @@ after_success:
- if test "$TOXENV" = "py36-django111-coverage"; then coveralls; fi

deploy:
skip_cleanup: true
provider: pypi
user: smn
password:
secure: "sXlDQNG8p+F4y8TKbRVw44uBCzECecgWQLNYcJBObMPoPbp64Ux488kM5RhbYhof0H1W850CKZzW66GQAjay0HS8tp9nPXg35xInPongLFuPzapoOdHtJZa5ub9QnpIs6LifJ/zXP5YDqh8ZUyoD+oFMvMFKjBkVB/NIYMYkyEM="
# We use the __token__ special key to indicate that we use Pypi API token, instead of the
# username/password combinaison
user: "__token__"
# No need to provide the password anymore. It has been set as an PYPI_PASSWORD environment variable
# on travis-ci.org web interface, and is picked automatically in this deploy stage for pypi.
password: $PYPI_PASSWORD
on:
tags: true
all_branches: true
8 changes: 8 additions & 0 deletions ChangeLog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ ChangeLog
master
------

No changes yet

.. _v1.4.1:

1.4.1 (28/11/2020)
------------------

*Bugfix:*
- Fixes an issue when :code:`refresh_from_db` was called with the :code:`fields` argument, the dirty state for all
fields would be reset, even though only the fields specified are reloaded from the database. Now only the reloaded
Expand Down Expand Up @@ -38,6 +45,7 @@ master
------------------

*New:*

- Updates python classifier in setup file (#116). Thanks amureki.
- Adds PEP8 validation in travisCI run (#123). Thanks hsmett.

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def listify(filename):

setup(
name="django-dirtyfields",
version="1.4",
version="1.4.1",
url='http://github.com/romgar/django-dirtyfields',
license='BSD',
description=("Tracking dirty fields on a Django model instance "
Expand Down

0 comments on commit 02cd02c

Please sign in to comment.