diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 19e1875c..475c365e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -3,8 +3,7 @@ name: Bug report about: Open a bug report title: "[bug] " labels: bug -assignees: '' - +assignees: "" --- **Describe the bug** @@ -12,6 +11,7 @@ A clear and concise description of the bug or unexpected behavior. **Steps To Reproduce** Steps to reproduce the behavior: + 1. Go to '...' 2. Click on '....' 3. Scroll down to '....' @@ -24,7 +24,8 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **System Informatioon:** - - OS: [e.g. Ubuntu 24.04 LTS] - - Python Version: [e.g. Python 3.11.2] - - Django Version: [e.g. Django 4.2.5] - - Browser and Browser Version (if applicable): [e.g. Chromium v126.0.6478.126] + +- OS: [e.g. Ubuntu 24.04 LTS] +- Python Version: [e.g. Python 3.11.2] +- Django Version: [e.g. Django 4.2.5] +- Browser and Browser Version (if applicable): [e.g. Chromium v126.0.6478.126] diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 523386b9..9940eaf3 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -3,8 +3,7 @@ name: Feature request about: Suggest an idea for this project title: "[feature] " labels: enhancement -assignees: '' - +assignees: "" --- **Is your feature request related to a problem? Please describe.** diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index d7f10536..ea2ce240 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -3,8 +3,7 @@ name: Question about: Please use the Discussion Forum to ask questions title: "[question] " labels: question -assignees: '' - +assignees: "" --- Please use the [Discussion Forum](https://github.com/openwisp/django-rest-framework-gis/discussions) to ask questions. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31a1215f..c62e8a14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,45 +30,45 @@ jobs: matrix: env: # DRF 3.14 - - python: '3.9' + - python: "3.9" TOXENV: py39-django42-djangorestframework314 - - python: '3.10' + - python: "3.10" TOXENV: py310-django42-djangorestframework314 - - python: '3.11' + - python: "3.11" TOXENV: py311-django42-djangorestframework314 # DRF 3.15 - - python: '3.10' + - python: "3.10" TOXENV: py310-django50-djangorestframework315 - - python: '3.11' + - python: "3.11" TOXENV: py311-django50-djangorestframework315 - - python: '3.12' + - python: "3.12" TOXENV: py312-django50-djangorestframework315 - - python: '3.13' + - python: "3.13" TOXENV: py313-django50-djangorestframework315 - - python: '3.10' + - python: "3.10" TOXENV: py310-django51-djangorestframework315 - - python: '3.11' + - python: "3.11" TOXENV: py311-django51-djangorestframework315 - - python: '3.12' + - python: "3.12" TOXENV: py312-django51-djangorestframework315 # DRF 3.16 - - python: '3.11' + - python: "3.11" TOXENV: py311-django50-djangorestframework316 - - python: '3.12' + - python: "3.12" TOXENV: py312-django50-djangorestframework316 - - python: '3.11' + - python: "3.11" TOXENV: py311-django51-djangorestframework316 - - python: '3.12' + - python: "3.12" TOXENV: py312-django51-djangorestframework316 - - python: '3.13' + - python: "3.13" TOXENV: py313-django51-djangorestframework315 - - python: '3.10' + - python: "3.10" TOXENV: py310-django52-djangorestframework315 - - python: '3.11' + - python: "3.11" TOXENV: py311-django52-djangorestframework315 - - python: '3.12' + - python: "3.12" TOXENV: py312-django52-djangorestframework315 - - python: '3.13' + - python: "3.13" TOXENV: py313-django52-djangorestframework315 steps: - uses: actions/checkout@v4 @@ -79,7 +79,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.env.python }} - cache: 'pip' + cache: "pip" cache-dependency-path: | **/requirements*.txt diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 4e47f504..5bb59df0 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -17,16 +17,16 @@ jobs: permissions: id-token: write steps: - - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.10' - - name: Install dependencies - run: | - pip install -U pip - pip install build - - name: Build package - run: python -m build - - name: Publish package distributions to PyPI - uses: pypa/gh-action-pypi-publish@v1.13.0 + - uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: "3.x" + - name: Install dependencies + run: | + pip install -U pip + pip install build + - name: Build package + run: python -m build + - name: Publish package distributions to PyPI + uses: pypa/gh-action-pypi-publish@v1.13.0 diff --git a/docker-compose.yml b/docker-compose.yml index 9248ad4d..e7589bae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,36 +1,33 @@ version: "3.7" - services: + test: + build: + context: . + dockerfile: Dockerfile + depends_on: + - postgres + environment: + - DJANGO_SETTINGS_MODULE=settings + volumes: + - root_dir:/root + - ./rest_framework_gis:/project/rest_framework_gis + - ./tests:/project/tests + - ./README.rst:/project/README.rst + - ./setup.py:/project/setup.py + command: sh -c "pip install -e . && python ./tests/manage.py test tests/django_restframework_gis_tests && ./run-qa-checks" - test: - build: - context: . - dockerfile: Dockerfile - depends_on: - - postgres - environment: - - DJANGO_SETTINGS_MODULE=settings - volumes: - - root_dir:/root - - ./rest_framework_gis:/project/rest_framework_gis - - ./tests:/project/tests - - ./README.rst:/project/README.rst - - ./setup.py:/project/setup.py - command: sh -c "pip install -e . && python ./tests/manage.py test tests/django_restframework_gis_tests && ./run-qa-checks" - - postgres: - image: postgis/postgis:15-3.4-alpine - environment: - POSTGRES_PASSWORD: postgres - POSTGRES_USER: postgres - POSTGRES_DB: django_restframework_gis - ports: - - 5432:5432 - volumes: - - postgres_data:/var/lib/postgresql/data - + postgres: + image: postgis/postgis:15-3.4-alpine + environment: + POSTGRES_PASSWORD: postgres + POSTGRES_USER: postgres + POSTGRES_DB: django_restframework_gis + ports: + - 5432:5432 + volumes: + - postgres_data:/var/lib/postgresql/data volumes: - postgres_data: - root_dir: + postgres_data: + root_dir: