From e07f6cd061e0533ec29909721b107899c387ff61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Tr=C3=B6ndle?= Date: Thu, 1 Jun 2023 10:23:10 +0200 Subject: [PATCH] Update pytest and remove obsolte pytest-pythonpath --- CONTRIBUTING.md | 2 +- envs/test.yaml | 4 ++-- pytest.ini | 2 +- test-requirements.yaml | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c47ad604..fdfa19ea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -71,7 +71,7 @@ Here's how. First, create a test environment using mamba or conda: ```bash -mamba env create -f test-requirements.yaml # or replace mamba with conda +mamba env create -f test-requirements.yaml --no-default-packages # or replace mamba with conda conda activate test-eurocalliope ``` diff --git a/envs/test.yaml b/envs/test.yaml index c0f23dbc..d380397a 100644 --- a/envs/test.yaml +++ b/envs/test.yaml @@ -8,7 +8,7 @@ dependencies: - pandas=1.5 - xarray=2022.3 - gurobi=9.5.1 - - pytest=6.2.4 - - pytest-html=3.1.1 + - pytest=7.3.1 + - pytest-html=3.2.0 - calliope=0.6.10 - pyomo=6.4.1 diff --git a/pytest.ini b/pytest.ini index c2b8e2d9..64f548e0 100644 --- a/pytest.ini +++ b/pytest.ini @@ -6,4 +6,4 @@ norecursedirs = testpaths = tests/lib tests/scripts -python_paths = scripts +pythonpath = . ./scripts diff --git a/test-requirements.yaml b/test-requirements.yaml index 51911a1f..a7b8064a 100644 --- a/test-requirements.yaml +++ b/test-requirements.yaml @@ -17,9 +17,8 @@ dependencies: - netcdf4=1.5.6 - xarray=0.17.0 - pycountry=18.12.8 - - pytest=6.2.3 - - pytest-html=1.20.0 + - pytest=7.3.1 + - pytest-html=3.2.0 - pip=21.0.1 - pip: - - pytest-pythonpath - -e ./lib[geo]