Merge pull request #522 from hotosm/enhance/django-3.0

Enhance/django 3.0
hotosm · Jan 4, 2024 · f9e9210 · f9e9210
2 parents b7ef04a + 1c6b026
commit f9e9210
Show file tree

Hide file tree

Showing 175 changed files with 1,227 additions and 3,950 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/test.yaml → .github/workflows/ci.yaml b/.github/workflows/test.yaml → .github/workflows/ci.yaml
@@ -9,8 +9,7 @@ on:
 
 jobs:
   deploy:
-    runs-on:
-      ubuntu-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3
@@ -31,4 +30,4 @@ jobs:
           pip install -r requirements-dev.txt
       - name: Run Tests
         run: |
-          make test
+          make test
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -12,4 +12,4 @@ on:
 
 jobs:
   publish_docs:
-    uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@1.0.1
+    uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@main
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ django_test:
 	python manage.py test api.tests jobs.tests tasks.tests
 
 test:
-	nosetests hdx_exports/tests/test_hdx_export_set.py
+	pytest hdx_exports/tests/test_hdx_export_set.py
 
 worker:
 	PYTHONPATH=../osm-export-tool-python/ DJANGO_SETTINGS_MODULE=core.settings.project dramatiq tasks.task_runners --processes 1 --threads 1
diff --git a/api/migrations/0001_create_application.py b/api/migrations/0001_create_application.py