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.

Sign up for GitHub

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

Removing admin site from urls.py - second attempt (requires #677) #679

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Removing admin site from urls.py - second attempt (requires #677) #679

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6712c8e
Bumping all requirements to be up-to-date
adamcharnock Jan 9, 2021
9135e99
Removing all python 2 compat imports, which are largely gone from dja…
adamcharnock Jan 9, 2021
56ec7a9
Fixing RemovedInDjango40Warning: Simple replace of force_text() -> fo…
adamcharnock Jan 9, 2021
a931702
Fixing DRF MigrationNotice. filter_class -> filterset_class
adamcharnock Jan 9, 2021
c85cba8
Fixing RemovedInDjango40Warning. url -> re_path
adamcharnock Jan 9, 2021
b79e967
Fixing RemovedInDjango40Warning. ugettext_lazy -> gettext_lazy
adamcharnock Jan 9, 2021
2f48782
Fixing RemovedInDjango40Warning. url -> re_path (second round of …
adamcharnock Jan 9, 2021
e5a7f75
The staticfiles template tag library has been renamed to static. Upda…
adamcharnock Jan 9, 2021
b873771
Specifying `algorithms` param to jwt.decode()
adamcharnock Jan 9, 2021
cd0289c
fail_code was too short for its choices, which is a fatal error in dj…
adamcharnock Jan 9, 2021
5045e38
Removing third-party use of json field as it is now bundled with django
adamcharnock Jan 9, 2021
56cb974
Fixing mutable default values for JSONField
adamcharnock Jan 9, 2021
0974aa7
Fixing deprecation warning: NullBooleanField -> BooleanField
adamcharnock Jan 9, 2021
e006d1a
Fixing warning regarding missing template context processor:
adamcharnock Jan 9, 2021
818649d
Adding the BooleanField and JSONField migration which I missed in an …
adamcharnock Jan 9, 2021
f6fadb8
Fixing comparison error in tests. This could probably be done better
adamcharnock Jan 9, 2021
19c3b92
Proforma resource now returning JSON objects rather than stringified …
adamcharnock Jan 9, 2021
3bcb5ca
DeprecationWarning fix: assertEquals -> assertEqual
adamcharnock Jan 9, 2021
792e0f9
Fixing malformatted requirements files
adamcharnock Jan 10, 2021
af0104d
Fixing pep8 issues
adamcharnock Jan 10, 2021
e77477b
Creating separate urls py to be used when running silver as a standal…
adamcharnock Jan 10, 2021
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
Prev Previous commit
Next Next commit
DeprecationWarning fix: assertEquals -> assertEqual
  • Loading branch information
@adamcharnock
adamcharnock committed Jan 9, 2021
commit 3bcb5ca3335afe28d7c3a786fd0ea92afedf84da
4 changes: 2 additions & 2 deletions silver/tests/unit/test_payments_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def test_get_transaction_from_token(self):
mocked_view = MagicMock()
token = _get_jwt_token(transaction)

self.assertEquals(get_transaction_from_token(mocked_view)(None, token),
self.assertEqual(get_transaction_from_token(mocked_view)(None, token),
mocked_view())
mocked_view.has_calls([call(None, transaction, False), call()])

Expand All @@ -73,6 +73,6 @@ def test_get_transaction_from_expired_token(self):
mocked_datetime.utcnow.return_value = datetime.utcnow() - timedelta(days=2 * 365)
token = _get_jwt_token(transaction)

self.assertEquals(get_transaction_from_token(mocked_view)(None, token),
self.assertEqual(get_transaction_from_token(mocked_view)(None, token),
mocked_view())
mocked_view.has_calls([call(None, transaction, True), call()])