feature/drf_yasg_to_spectacular

.github/workflows/build-schema.yml

@@ -44,7 +44,7 @@ jobs:
       with:
         python-version: '3.12'
 
-    - name: Install requirments
+    - name: Install requirements
       run: pip install -r requirements-server.txt
 
     - name: Download package
@@ -64,21 +64,21 @@ jobs:
       run: |
         test -d $(dirname ${{ env.SCHEMA_ALL }}) || mkdir -p $(dirname ${{ env.SCHEMA_ALL }})
         python ./manage.py migrate
-        python ./manage.py generate_swagger ${{ env.SCHEMA_ALL }}
+        python ./manage.py spectacular --format openapi-json --file ${{ env.SCHEMA_ALL }}
 
     - name: Generate OpenAPI (only v1)
       run: |
         test -d $(dirname ${{ env.SCHEMA_V1 }}) || mkdir -p $(dirname ${{ env.SCHEMA_V1 }})
         python ./manage.py migrate
-        python ./manage.py generate_swagger ${{ env.SCHEMA_V1 }}
+        python ./manage.py spectacular --format openapi-json --file ${{ env.SCHEMA_V1 }}
       env:
         OASIS_GEN_SWAGGER_V1: 1
 
     - name: Generate OpenAPI (only v2)
       run: |
         test -d $(dirname ${{ env.SCHEMA_V2 }}) || mkdir -p $(dirname ${{ env.SCHEMA_V2 }})
         python ./manage.py migrate
-        python ./manage.py generate_swagger ${{ env.SCHEMA_V2 }}
+        python ./manage.py spectacular --format openapi-json --file ${{ env.SCHEMA_V2 }}
       env:
         OASIS_GEN_SWAGGER_V2: 1
 

docker/entrypoint_unittest.sh

@@ -35,7 +35,7 @@ BUILD_OUTPUT_DIR='/tmp/output/'
     source $(find .tox/ -name "*activate" | head -n 1)
     rm -rf $LOG_DIR'openapi-schema.json'
     python ./manage.py migrate
-    python ./manage.py generate_swagger $LOG_DIR'openapi-schema.json'
+    python ./manage.py spectacular $LOG_DIR'openapi-schema.json'
 
 # clean up test run 
 #    find /home/ -name __pycache__ | xargs -r rm -rfv

requirements-server.in

@@ -16,7 +16,7 @@ django_celery_results
 djangorestframework>=3.0,<3.15.0
 djangorestframework_simplejwt
 drf-nested-routers>=0.0,<1.0
-drf-yasg<=1.21.5
+drf-spectacular<=0.28.0
 gunicorn>=23.0,<24.0
 joblib>=1.2.0
 jsonpickle>=3.0,<4.0

requirements-server.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile requirements-server.in
+#    pip-compile --output-file=requirements-server.txt requirements-server.in
 #
 amqp==5.3.1
     # via kombu
@@ -74,13 +74,9 @@ click-repl==0.3.0
 constantly==23.10.4
     # via twisted
 coreapi==2.3.3
-    # via
-    #   -r requirements-server.in
-    #   drf-yasg
+    # via -r requirements-server.in
 coreschema==0.0.4
-    # via
-    #   coreapi
-    #   drf-yasg
+    # via coreapi
 cramjam==2.11.0
     # via fastparquet
 cryptography==45.0.6
@@ -109,7 +105,7 @@ django==5.2.5
     #   djangorestframework
     #   djangorestframework-simplejwt
     #   drf-nested-routers
-    #   drf-yasg
+    #   drf-spectacular
     #   mozilla-django-oidc
 django-celery-results==2.6.0
     # via -r requirements-server.in
@@ -130,12 +126,12 @@ djangorestframework==3.14.0
     #   -r requirements-server.in
     #   djangorestframework-simplejwt
     #   drf-nested-routers
-    #   drf-yasg
+    #   drf-spectacular
 djangorestframework-simplejwt==5.5.1
     # via -r requirements-server.in
 drf-nested-routers==0.94.1
     # via -r requirements-server.in
-drf-yasg==1.21.5
+drf-spectacular==0.28.0
     # via -r requirements-server.in
 fastparquet==2024.11.0
     # via oasis-data-manager
@@ -161,7 +157,7 @@ idna==3.10
 incremental==24.7.2
     # via twisted
 inflection==0.5.1
-    # via drf-yasg
+    # via drf-spectacular
 isodate==0.7.2
     # via azure-storage-blob
 itypes==1.2.0
@@ -183,6 +179,7 @@ jsonref==1.1.0
 jsonschema==4.25.1
     # via
     #   -r requirements-server.in
+    #   drf-spectacular
     #   ods-tools
 jsonschema-specifications==2025.4.1
     # via jsonschema
@@ -222,7 +219,6 @@ ods-tools==4.0.2
     # via -r requirements-server.in
 packaging==25.0
     # via
-    #   drf-yasg
     #   fastparquet
     #   gunicorn
     #   kombu
@@ -276,8 +272,9 @@ python-dateutil==2.9.0.post0
 pytz==2025.2
     # via
     #   djangorestframework
-    #   drf-yasg
     #   pandas
+pyyaml==6.0.2
+    # via drf-spectacular
 redis==5.3.1
     # via
     #   -r requirements-server.in
@@ -296,10 +293,6 @@ rpds-py==0.27.0
     # via
     #   jsonschema
     #   referencing
-ruamel-yaml==0.18.15
-    # via drf-yasg
-ruamel-yaml-clib==0.2.12
-    # via ruamel-yaml
 s3transfer==0.13.1
     # via boto3
 service-identity==24.2.0
@@ -338,7 +331,7 @@ tzdata==2025.2
 uritemplate==4.2.0
     # via
     #   coreapi
-    #   drf-yasg
+    #   drf-spectacular
 urllib3==2.5.0
     # via
     #   botocore

requirements-worker.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile requirements-worker.in
+#    pip-compile --output-file=requirements-worker.txt requirements-worker.in
 #
 adlfs==2024.12.0
     # via -r requirements-worker.in

requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile requirements.in
+#    pip-compile
 #
 adlfs==2024.12.0
     # via -r requirements-worker.in
@@ -137,13 +137,9 @@ configparser==7.2.0
 constantly==23.10.4
     # via twisted
 coreapi==2.3.3
-    # via
-    #   -r requirements-server.in
-    #   drf-yasg
+    # via -r requirements-server.in
 coreschema==0.0.4
-    # via
-    #   coreapi
-    #   drf-yasg
+    # via coreapi
 coverage[toml]==7.10.4
     # via
     #   -r requirements.in
@@ -182,7 +178,7 @@ django==5.2.5
     #   djangorestframework
     #   djangorestframework-simplejwt
     #   drf-nested-routers
-    #   drf-yasg
+    #   drf-spectacular
     #   model-mommy
     #   mozilla-django-oidc
 django-celery-results==2.6.0
@@ -208,12 +204,12 @@ djangorestframework==3.14.0
     #   -r requirements-server.in
     #   djangorestframework-simplejwt
     #   drf-nested-routers
-    #   drf-yasg
+    #   drf-spectacular
 djangorestframework-simplejwt==5.5.1
     # via -r requirements-server.in
 drf-nested-routers==0.94.1
     # via -r requirements-server.in
-drf-yasg==1.21.5
+drf-spectacular==0.28.0
     # via -r requirements-server.in
 executing==2.2.0
     # via stack-data
@@ -269,7 +265,7 @@ idna==3.10
 incremental==24.7.2
     # via twisted
 inflection==0.5.1
-    # via drf-yasg
+    # via drf-spectacular
 iniconfig==2.1.0
     # via pytest
 ipdb==0.13.13
@@ -305,6 +301,7 @@ jsonref==1.1.0
 jsonschema==4.25.1
     # via
     #   -r requirements-server.in
+    #   drf-spectacular
     #   ods-tools
 jsonschema-specifications==2025.4.1
     # via jsonschema
@@ -384,7 +381,6 @@ ods-tools==4.0.2
 packaging==25.0
     # via
     #   build
-    #   drf-yasg
     #   fastparquet
     #   geopandas
     #   gunicorn
@@ -514,11 +510,12 @@ python-dateutil==2.9.0.post0
 pytz==2025.2
     # via
     #   djangorestframework
-    #   drf-yasg
     #   oasislmf
     #   pandas
 pyyaml==6.0.2
-    # via -r requirements-worker.in
+    # via
+    #   -r requirements-worker.in
+    #   drf-spectacular
 redis==5.3.1
     # via
     #   -r requirements-server.in
@@ -547,10 +544,6 @@ rpds-py==0.27.0
     #   referencing
 rtree==1.4.1
     # via oasislmf
-ruamel-yaml==0.18.15
-    # via drf-yasg
-ruamel-yaml-clib==0.2.12
-    # via ruamel-yaml
 s3fs==2024.12.0
     # via -r requirements-worker.in
 s3transfer==0.13.1
@@ -631,7 +624,7 @@ tzdata==2025.2
 uritemplate==4.2.0
     # via
     #   coreapi
-    #   drf-yasg
+    #   drf-spectacular
 urllib3==2.5.0
     # via
     #   botocore