This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch AIRAVATA-3698--Add-support-for-Python-3.11 in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 5432028312d2c9130d1bfb99788dec87004213b7 Author: Marcus Christie <[email protected]> AuthorDate: Thu Jun 22 11:13:53 2023 -0400 AIRAVATA-3698 Fixing deprecation warnings --- django_airavata/apps/api/apps.py | 4 ++-- django_airavata/apps/api/tests/test_views.py | 20 ++++++++++---------- requirements-dev.txt | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/django_airavata/apps/api/apps.py b/django_airavata/apps/api/apps.py index b95d88e4..f2d46aad 100644 --- a/django_airavata/apps/api/apps.py +++ b/django_airavata/apps/api/apps.py @@ -1,5 +1,5 @@ from django.apps import AppConfig -from pkg_resources import iter_entry_points +from importlib_metadata import entry_points class ApiConfig(AppConfig): @@ -11,5 +11,5 @@ class ApiConfig(AppConfig): from . import output_views # Load and create instances of each output view provider - for entry_point in iter_entry_points(group='airavata.output_view_providers'): + for entry_point in entry_points(group='airavata.output_view_providers'): output_views.OUTPUT_VIEW_PROVIDERS[entry_point.name] = entry_point.load()() diff --git a/django_airavata/apps/api/tests/test_views.py b/django_airavata/apps/api/tests/test_views.py index 201538dc..d75dc98a 100644 --- a/django_airavata/apps/api/tests/test_views.py +++ b/django_airavata/apps/api/tests/test_views.py @@ -73,11 +73,11 @@ class GroupViewSetTests(TestCase): sender=views.GroupViewSet) group_create = views.GroupViewSet.as_view({'post': 'create'}) response = group_create(request) - self.assertEquals(201, response.status_code) - self.assertEquals("abc123", response.data['id']) + self.assertEqual(201, response.status_code) + self.assertEqual("abc123", response.data['id']) user_added_to_group_handler.assert_called_once() args, kwargs = user_added_to_group_handler.call_args - self.assertEquals("abc123", kwargs["groups"][0].id) + self.assertEqual("abc123", kwargs["groups"][0].id) self.assertIs(user_profile, kwargs["user"]) def test_update_group_sends_user_added_to_group_signal(self): @@ -142,8 +142,8 @@ class GroupViewSetTests(TestCase): sender=views.GroupViewSet) group_update = views.GroupViewSet.as_view({'put': 'update'}) response = group_update(request, group_id="abc123") - self.assertEquals(200, response.status_code) - self.assertEquals("abc123", response.data['id']) + self.assertEqual(200, response.status_code) + self.assertEqual("abc123", response.data['id']) # verify addUsersToGroup group_manager_mock.addUsersToGroup.assert_called_once() @@ -160,7 +160,7 @@ class GroupViewSetTests(TestCase): user_added_to_group_handler.assert_called_once() args, kwargs = user_added_to_group_handler.call_args - self.assertEquals("abc123", kwargs["groups"][0].id) + self.assertEqual("abc123", kwargs["groups"][0].id) self.assertIs(user_profile, kwargs["user"]) @@ -249,7 +249,7 @@ class IAMUserViewSetTests(TestCase): sender=views.IAMUserViewSet) iam_user_update = views.IAMUserViewSet.as_view({'put': 'update'}) response = iam_user_update(request, user_id=username) - self.assertEquals(200, response.status_code) + self.assertEqual(200, response.status_code) user_profile_mock.doesUserExist.assert_called_once() group_manager_mock.getAllGroupsUserBelongs.assert_called_once() @@ -357,7 +357,7 @@ class IAMUserViewSetTests(TestCase): sender=views.IAMUserViewSet) iam_user_update = views.IAMUserViewSet.as_view({'put': 'update'}) response = iam_user_update(request, user_id=username) - self.assertEquals(200, response.status_code) + self.assertEqual(200, response.status_code) user_profile_mock.doesUserExist.assert_called_once() group_manager_mock.getAllGroupsUserBelongs.assert_called_once() @@ -457,7 +457,7 @@ class IAMUserViewSetTests(TestCase): sender=views.IAMUserViewSet) iam_user_update = views.IAMUserViewSet.as_view({'put': 'update'}) response = iam_user_update(request, user_id=username) - self.assertEquals(200, response.status_code) + self.assertEqual(200, response.status_code) user_profile_mock.doesUserExist.assert_called_once() group_manager_mock.getAllGroupsUserBelongs.assert_called_once() @@ -488,6 +488,6 @@ class ExceptionHandlingTest(TestCase): # Deliberately not authenticating user for request group_create = views.GroupViewSet.as_view({'post': 'create'}) response = group_create(request) - self.assertEquals(403, response.status_code) + self.assertEqual(403, response.status_code) self.assertIn('is_authenticated', response.data) self.assertFalse(response.data['is_authenticated']) diff --git a/requirements-dev.txt b/requirements-dev.txt index 9ee22a39..d56aadad 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,7 +6,7 @@ importlib-metadata==4.2.0 isort==5.2.2 Jinja2==3.0.3 mkdocs==1.2.4 -Markdown==3.2.1 +Markdown==3.4.3 pymdown-extensions==8.2 pycodestyle==2.8.0 pyflakes==2.4.0
