diff --git a/.travis.yml b/.travis.yml index 9ae6bf08..282a766b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ before_install: script: - cp ./test/config.test1.yaml ./config.yaml - - snakemake - - if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then snakemake solve_all_elec_networks; fi + - snakemake solve_all_elec_networks - rm -rf resources/*.nc resources/*.geojson resources/*.h5 networks results # could repeat for more configurations in future diff --git a/environment.yaml b/environment.yaml index 46ab4fa8..dc7baee8 100644 --- a/environment.yaml +++ b/environment.yaml @@ -42,7 +42,7 @@ dependencies: - conda-forge::libgdal - pip: - - vresutils>=0.3 + - git+https://github.com/FRESNA/vresutils.git#egg=vresutils - git+https://github.com/PyPSA/pypsa.git#egg=pypsa # until pypsa/pypsa#102 closed - git+https://github.com/PyPSA/glaes.git#egg=glaes - git+https://github.com/PyPSA/geokit.git#egg=geokit