Skip to content

Commit

Permalink
Integrate with Github CI
Browse files Browse the repository at this point in the history
  • Loading branch information
almet committed Nov 22, 2023
1 parent 0db7f37 commit 3ae1b17
Show file tree
Hide file tree
Showing 5 changed files with 111 additions and 15 deletions.
59 changes: 59 additions & 0 deletions .github/workflows/test-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Test & Docs

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

services:
postgres:
image: postgis/postgis:11-2.5
ports:
- 5432:5432
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: postgres
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

strategy:
fail-fast: false
matrix:
python-version: ["3.11"] # ["3.8", "3.9", "3.10", "3.11", "3.12"]
dependencies: [normal] # [normal, minimal]
database: [postgresql] # maybe check different versions of postgres ?

steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: '**/pyproject.toml'
- name: Change dependencies to minimal supported versions
run: sed -i -e 's/>=/==/g; s/~=.*==\(.*\)/==\1/g; s/~=/==/g;' pyproject.toml
if: matrix.dependencies == 'minimal'
- name: Install dependencies
run: |
sudo apt update
sudo apt install libgdal-dev
python -m pip install --upgrade pip
python -m pip install -e ".[dev,test]"
- name: run tests
run: pytest .
env:
DJANGO_SETTINGS_MODULE: 'umap.tests.settings'
UMAP_SETTINGS: 'umap/tests/settings.py'
- name: Run Lint
run: make lint
if: matrix.python-version == '3.12'
- name: Run Docs
run: make docs
if: matrix.python-version == '3.12'
26 changes: 17 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,21 @@ develop: ## Install the test and dev dependencies
python3 -m pip install -e .[test,dev]
playwright install

.PHONY: pretty-templates
pretty-templates: ## Prettify template files
djlint umap/templates --reformat

.PHONY: lint-templates
lint-templates: ## Lint template files
djlint umap/templates --lint
.PHONY: format
format: ## Format the code and templates files
djlint umap/templates --reformat &&\
isort --profile black . &&\
ruff format --target-version=py38 .

.PHONY: lint
lint: ## Lint the code and template files
djlint umap/templates --lint &&\
isort --check --profile black . &&\
ruff format --check --target-version=py38 . &&\
vermin --no-tips --violations -t=3.8- .

docs: ## Compile the docs
mkdocs build

.PHONY: version
version: ## Display the current version
Expand Down Expand Up @@ -47,10 +55,10 @@ publish: ## Publish the Python package to Pypi
make clean

test:
py.test -xv umap/tests/
pytest -xv umap/tests/

test-integration:
py.test -xv umap/tests/integration/
pytest -xv umap/tests/integration/

clean:
rm -f dist/*
Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@ dependencies = [
[project.optional-dependencies]
dev = [
"hatch==1.7.0",
"black==23.3.0",
"ruff==0.1.6",
"djlint==1.31.0",
"mkdocs==1.5.2",
"vermin==1.5.2",
"pymdown-extensions==10.4",
]
test = [
"factory-boy==3.2.1",
Expand Down
26 changes: 26 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[tox]
envlist = py311,lint_docs
skip_missing_interpreters = True

[testenv]
allowlist_externals = make
setenv =
DJANGO_SETTINGS_MODULE = umap.tests.settings
UMAP_SETTINGS = umap/tests/settings.py
commands =
python --version
pytest --pyargs umap.tests {posargs} --no-migrations
deps =
-e.[dev,test]
passenv = GITHUB_ACTIONS

[testenv:lint_docs]
commands =
make lint
make docs
deps =
-e.[dev]
changedir = {toxinidir}

DJANGO_SETTINGS_MODULE=umap.tests.settings

11 changes: 6 additions & 5 deletions umap/tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@
SECRET_KEY = "justfortests"
COMPRESS_ENABLED = False
FROM_EMAIL = "[email protected]"
EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend'
EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend"

if "TRAVIS" in os.environ:
if os.environ.get("GITHUB_ACTIONS", False) == "true":
DATABASES = {
"default": {
"ENGINE": "django.contrib.gis.db.backends.postgis",
"NAME": "umap",
"PORT": 5433,
"USER": "travis",
"NAME": "postgres",
"USER": "postgres",
"PORT": 5432,
"PASSWORD": "postgres",
}
}

Expand Down

0 comments on commit 3ae1b17

Please sign in to comment.