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

Issue/update latest versions #137

Merged
merged 2 commits into from
Dec 17, 2024
Merged

Issue/update latest versions #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1acb272
Update requirements
danielmursa-dev Dec 17, 2024
a8bba49
Update settings and fix tests
danielmursa-dev Dec 17, 2024
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 requirements/base.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ furl
# Framework libraries
django-jsonsuit
sharing-configs
django-setup-configuration>=0.4.0
django-setup-configuration>=0.5.0
mozilla-django-oidc-db[django-setup-configuration]

# API libraries
Expand Down
4 changes: 2 additions & 2 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ django-sendfile2==0.7.0
# via django-privates
django-sessionprofile==3.0.0
# via open-api-framework
django-setup-configuration==0.4.0
django-setup-configuration==0.5.0
# via
# -r requirements/base.in
# open-api-framework
Expand Down Expand Up @@ -252,7 +252,7 @@ mozilla-django-oidc-db[django-setup-configuration]==0.21.1
# open-api-framework
notifications-api-common==0.3.1
# via commonground-api-common
open-api-framework==0.9.0
open-api-framework==0.9.1
# via -r requirements/base.in
orderedmultidict==1.0.1
# via furl
Expand Down
4 changes: 2 additions & 2 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ django-sessionprofile==3.0.0
# via
# -r requirements/base.txt
# open-api-framework
django-setup-configuration==0.4.0
django-setup-configuration==0.5.0
# via
# -r requirements/base.txt
# open-api-framework
Expand Down Expand Up @@ -412,7 +412,7 @@ notifications-api-common==0.3.1
# via
# -r requirements/base.txt
# commonground-api-common
open-api-framework==0.9.0
open-api-framework==0.9.1
# via -r requirements/base.txt
orderedmultidict==1.0.1
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ django-sessionprofile==3.0.0
# via
# -r requirements/base.txt
# open-api-framework
django-setup-configuration==0.4.0
django-setup-configuration==0.5.0
# via
# -r requirements/base.txt
# open-api-framework
Expand Down Expand Up @@ -430,7 +430,7 @@ notifications-api-common==0.3.1
# via
# -r requirements/base.txt
# commonground-api-common
open-api-framework==0.9.0
open-api-framework==0.9.1
# via -r requirements/base.txt
orderedmultidict==1.0.1
# via
Expand Down
1 change: 1 addition & 0 deletions src/objecttypes/conf/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,6 @@
#
SETUP_CONFIGURATION_STEPS = [
"objecttypes.setup_configuration.steps.token_auth.TokenAuthConfigurationStep",
"django_setup_configuration.contrib.sites.steps.SitesConfigurationStep",
"mozilla_django_oidc_db.setup_configuration.steps.AdminOIDCConfigurationStep",
]
7 changes: 2 additions & 5 deletions src/objecttypes/setup_configuration/tests/test_token_auth_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,10 +351,7 @@ def test_invalid_setup_identifier(self):
],
},
}
with self.assertRaises(ConfigurationRunFailed) as command_error:
with self.assertRaises(PrerequisiteFailed) as command_error:
execute_single_step(TokenAuthConfigurationStep, object_source=object_source)
self.assertTrue(
"Validation error(s) occured for invalid identifier"
in str(command_error.exception)
)
self.assertTrue("String should match pattern" in str(command_error.exception))
self.assertEqual(TokenAuth.objects.count(), 0)
Loading