Skip to content

Commit

Permalink
Update pytest and remove obsolte pytest-pythonpath
Browse files Browse the repository at this point in the history
  • Loading branch information
timtroendle committed Jun 1, 2023
1 parent ebad64d commit e07f6cd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
4 changes: 2 additions & 2 deletions envs/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ norecursedirs =
testpaths =
tests/lib
tests/scripts
python_paths = scripts
pythonpath = . ./scripts
5 changes: 2 additions & 3 deletions test-requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]

0 comments on commit e07f6cd

Please sign in to comment.