diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index f9795c7..95c2309 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -49,4 +49,5 @@ jobs: - name: Test with pytest run: | + make conda-install-geo make test-pysus diff --git a/Makefile b/Makefile index 5eb5506..2239954 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,6 @@ test-jupyter-pysus: ## run pytest for notebooks inside jupyter container test-pysus: ## run tests quickly with the default Python cp docs/source/**/*.ipynb pysus/Notebooks poetry run pytest -vv pysus/tests/ - poetry run pytest --nbmake --nbmake-timeout=800 pysus/Notebooks/*.ipynb coverage: ## check code coverage quickly with the default Python coverage run --source pysus/tests/ -m pytest diff --git a/poetry.lock b/poetry.lock index 9b45cf1..cb21195 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3925,4 +3925,4 @@ preprocessing = [] [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "0882f6f03b6b87c1137a4353cf9cab22b575f9018807b0fa4be573027ad202f5" +content-hash = "e3fc42b7a0ee686f35e781158828f9eb9f964e89bcdc14e550253020bcc8db32" diff --git a/pyproject.toml b/pyproject.toml index b5b2a08..250d006 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,6 @@ flake8 = "^5.0.4" isort = "^5.10.1" pre-commit = "^2.20.0" pytest-timeout = "^2.1.0" -nbsphinx = "^0.9.3" [tool.poetry.group.docs.dependencies] sphinx = "^5.1.1" @@ -49,7 +48,7 @@ ipykernel = "^6.25.1" seaborn = "^0.12.2" tomli = "^2.0.1" sphinx-rtd-theme = "^1.3.0" - +nbsphinx = "^0.9.3" [tool.poetry.group.geo.dependencies] geobr = { version = "^0.2.0", extras=["preprocessing"] } @@ -59,8 +58,8 @@ descartes = "^1.1.0" folium = "^0.14.0" [build-system] -requires = ["setuptools", "wheel"] -build-backend = "setuptools.build_meta" +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" [tool.isort] profile = "black"