fix SODAR_API setting requirement in tests (#1495)

bihealth · Sep 30, 2024 · e809807 · e809807
1 parent e239917
commit e809807
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,16 @@ Changelog for the **SODAR Core** Django app package. Loosely follows the
 `Keep a Changelog <http://keepachangelog.com/en/1.0.0/>`_ guidelines.
 
 
+Unreleased
+==========
+
+Fixed
+-----
+
+- **Projectroles**
+    - Deprecated ``SODAR_API_*`` settings required in tests (#1495)
+
+
 v1.0.2 (2024-09-09)
 ===================
 

diff --git a/config/settings/base.py b/config/settings/base.py
@@ -559,9 +559,9 @@ def set_logging(level=None):
 
 # SODAR API settings
 # DEPRECATED: To be removed in SODAR Core v1.1 (see #1401)
-SODAR_API_DEFAULT_VERSION = '0.1'
-SODAR_API_ALLOWED_VERSIONS = [SODAR_API_DEFAULT_VERSION]
-SODAR_API_MEDIA_TYPE = 'application/your.application+json'
+# SODAR_API_DEFAULT_VERSION = '0.1'
+# SODAR_API_ALLOWED_VERSIONS = [SODAR_API_DEFAULT_VERSION]
+# SODAR_API_MEDIA_TYPE = 'application/your.application+json'
 # SODAR API host URL
 SODAR_API_DEFAULT_HOST = env.url(
     'SODAR_API_DEFAULT_HOST', 'http://0.0.0.0:8000'

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -29,7 +29,7 @@
 # The short X.Y version
 version = '1.0'
 # The full version, including alpha/beta/rc tags
-release = '1.0.2'
+release = '1.0.3-WIP'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/docs/source/major_changes.rst b/docs/source/major_changes.rst
@@ -10,6 +10,15 @@ older SODAR Core version. For a complete list of changes in current and previous
 releases, see the :ref:`full changelog<changelog>`.
 
 
+v1.0.3 (WIP)
+************
+
+Release Highlights
+==================
+
+- Fix requiring deprecated SODAR API settings in tests
+
+
 v1.0.2 (2024-09-09)
 *******************
 

diff --git a/projectroles/tests/test_views_api.py b/projectroles/tests/test_views_api.py
@@ -50,6 +50,10 @@
     REMOTE_SITE_SECRET,
 )
 from projectroles.utils import build_secret
+from projectroles.views_api import (
+    SODAR_API_MEDIA_TYPE,  # TODO: Remove in v1.1 (see #1401)
+    SODAR_API_DEFAULT_VERSION,  # TODO: Remove in v1.1 (see #1401)
+)
 
 
 app_settings = AppSettingAPI()
@@ -129,8 +133,8 @@ class SODARAPIViewTestMixin(SerializedObjectMixin):
     # Default API header parameters are for external SODAR site APIs
     # DEPRECATED: To be removed in SODAR Core v1.1 (see #1401)
     # Instead, provide a media type and version specific to your app
-    media_type = settings.SODAR_API_MEDIA_TYPE
-    api_version = settings.SODAR_API_DEFAULT_VERSION
+    media_type = SODAR_API_MEDIA_TYPE
+    api_version = SODAR_API_DEFAULT_VERSION
 
     # Copied from Knox tests
     @classmethod