PyPSA · fneum · Dec 3, 2020 · Sep 11, 2020 · Sep 11, 2020 · Sep 11, 2020
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -11,7 +11,7 @@ assignees: ''
 ## Checklist
 
 - [ ] I am using the current [`master`](https://github.com/PyPSA/pypsa-eur/tree/master) branch or the latest [release](https://github.com/PyPSA/pypsa-eur/releases). Please indicate.
-- [ ] I am running on an up-to-date [`pypsa-eur` environment](https://github.com/PyPSA/pypsa-eur/blob/master/environment.yaml). Update via `conda env update -f environment.yaml`.
+- [ ] I am running on an up-to-date [`pypsa-eur` environment](https://github.com/PyPSA/pypsa-eur/blob/master/envs/environment.yaml). Update via `conda env update -f envs/environment.yaml`.
 
 ## Describe the Bug
 
@@ -24,4 +24,4 @@ assignees: ''
 
 ```
 <paste here>
-```
+```
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,4 +2,4 @@ blank_issues_enabled: false
 contact_links:
   - name: PyPSA Mailing List
     url: https://groups.google.com/forum/#!forum/pypsa
-    about: Please ask and answer general usage questions here.
+    about: Please ask and answer general usage questions here.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -7,7 +7,7 @@ Closes # (if applicable).
 
 - [ ] I tested my contribution locally and it seems to work fine.
 - [ ] Code and workflow changes are sufficiently documented.
-- [ ] Newly introduced dependencies are added to `environment.yaml` and `environment.docs.yaml`.
+- [ ] Newly introduced dependencies are added to `envs/environment.yaml` and `envs/environment.docs.yaml`.
 - [ ] Changes in configuration options are added in all of `config.default.yaml`, `config.tutorial.yaml`, and `test/config.test1.yaml`.
 - [ ] Changes in configuration options are also documented in `doc/configtables/*.csv` and line references are adjusted in `doc/configuration.rst` and `doc/tutorial.rst`.
-- [ ] A note for the release notes `doc/release_notes.rst` is amended in the format of previous release notes.
+- [ ] A note for the release notes `doc/release_notes.rst` is amended in the format of previous release notes.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 __pycache__
 *dconf
 gurobi.log
+.vscode
 
 /bak
 /resources

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -5,4 +5,4 @@
 version: 2
 
 conda:
-    environment: environment.docs.yaml
+    environment: envs/environment.docs.yaml
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -25,4 +25,4 @@ License: CC0-1.0
 
 Files: borg-it
 Copyright: : 2017-2020 The PyPSA-Eur Authors
-License: CC0-1.0
+License: CC0-1.0
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ before_install:
 
   # install conda environment
   - conda install -c conda-forge mamba
-  - mamba env create -f ./environment.yaml
+  - mamba env create -f ./envs/environment.yaml
   - conda activate pypsa-eur
 
   # install open-source solver

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ and local grid
 bottlenecks may cause unrealistic load-shedding or generator
 curtailment. We recommend to cluster the network to a couple of
 hundred nodes to remove these local inconsistencies. See the
-discussion in Section 3.4 "Model validation" of the paper. 
+discussion in Section 3.4 "Model validation" of the paper.
 
 ![PyPSA-Eur Grid Model](doc/img/base.png)
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
     __pycache__
     *dconf
     gurobi.log
+    .vscode
     /bak
     /resources
@@ Expand Down @@