Skip to content

Commit

Permalink
add reuse compatability
Browse files Browse the repository at this point in the history
  • Loading branch information
pz-max committed Mar 26, 2023
1 parent efdafe7 commit fe992e8
Show file tree
Hide file tree
Showing 111 changed files with 824 additions and 1,036 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC0-1.0

# Fix language stats: https://github.com/github/linguist/issues/3316#issuecomment-263485606
*.ipynb linguist-vendored
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
SPDX-License-Identifier: GPL-3.0-or-later
-->

---
name: Bug report
about: Create a report if something doesn't work quite right.
Expand Down
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC0-1.0

blank_issues_enabled: false
contact_links:
- name: Discussion board
Expand Down
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
SPDX-License-Identifier: GPL-3.0-or-later
-->

---
name: Feature request
about: Suggest an idea for this project
Expand Down
10 changes: 10 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
#
# SPDX-License-Identifier: GPL-3.0-or-later

<!--
SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
SPDX-License-Identifier: GPL-3.0-or-later
-->

# Closes # (if applicable).

## Changes proposed in this Pull Request
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-linux.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: : 2022 The PyPSA-Earth Authors
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC0-1.0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-mac.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: : 2022 The PyPSA-Earth Authors
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC0-1.0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-windows.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: : 2022 The PyPSA-Earth Authors
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC0-1.0

Expand Down
61 changes: 0 additions & 61 deletions .github/workflows/linter.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC0-1.0

on:
push:
branches:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC0-1.0

# Byte-compiled / optimized / DLL files
**/__pycache__
Expand All @@ -14,6 +17,7 @@
# Untracked files
config.yaml
dag.svg
scripts/__init__.py

# Untracked folders (and files within)
img/
Expand Down
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2022 The PyPSA-Earth and Eur Authors
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC0-1.0

Expand Down Expand Up @@ -64,7 +64,7 @@ repos:
- id: snakefmt

# # Check for FSFE REUSE compliance (licensing)
# - repo: https://github.com/fsfe/reuse-tool
# rev: v0.14.0
# hooks:
# - id: reuse
- repo: https://github.com/fsfe/reuse-tool
rev: v1.0.0
hooks:
- id: reuse
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: : 2017-2020 The PyPSA-Eur Authors, 2021-now PyPSA-Earth
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC0-1.0

Expand Down
20 changes: 20 additions & 0 deletions .reuse/dep5
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: pypsa-earth
Upstream-Contact: The PyPSA-Earth and PyPSA-Eur Authors <[email protected]>
Source: https://github.com/pypsa-meets-earth/pypsa-earth

Files: doc/data.csv
Copyright: The PyPSA-Earth and PyPSA-Eur Authors
License: CC-BY-4.0

Files: doc/configtables/*
Copyright: The PyPSA-Earth and PyPSA-Eur Authors
License: CC-BY-4.0

Files: data/*
Copyright: The PyPSA-Earth and PyPSA-Eur Authors
License: CC-BY-4.0

Files: .github/*
Copyright: The PyPSA-Earth and PyPSA-Eur Authors
License: CC0-1.0
2 changes: 1 addition & 1 deletion .yamllint
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: : 2022 The PyPSA-Earth and Eur Authors
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC0-1.0

Expand Down
Loading

0 comments on commit fe992e8

Please sign in to comment.