Skip to content

Commit f9e9210

Browse files
Merge pull request #522 from hotosm/enhance/django-3.0
Enhance/django 3.0
2 parents b7ef04a + 1c6b026 commit f9e9210

File tree

175 files changed

+1227
-3950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+1227
-3950
lines changed

.circleci/config.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/test.yaml renamed to .github/workflows/ci.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ on:
99

1010
jobs:
1111
deploy:
12-
runs-on:
13-
ubuntu-latest
12+
runs-on: ubuntu-latest
1413
steps:
1514
- uses: actions/checkout@v2
1615
- name: Set up Python 3
@@ -31,4 +30,4 @@ jobs:
3130
pip install -r requirements-dev.txt
3231
- name: Run Tests
3332
run: |
34-
make test
33+
make test

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ on:
1212

1313
jobs:
1414
publish_docs:
15-
uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@1.0.1
15+
uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@main

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ django_test:
22
python manage.py test api.tests jobs.tests tasks.tests
33

44
test:
5-
nosetests hdx_exports/tests/test_hdx_export_set.py
5+
pytest hdx_exports/tests/test_hdx_export_set.py
66

77
worker:
88
PYTHONPATH=../osm-export-tool-python/ DJANGO_SETTINGS_MODULE=core.settings.project dramatiq tasks.task_runners --processes 1 --threads 1

api/migrations/0001_create_application.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)