New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update copyright to 2023 #501

Merged

pfuehrlich-pik merged 6 commits into magpiemodel:develop from pfuehrlich-pik:develop

Jan 12, 2023

Contributor

pfuehrlich-pik commented Jan 11, 2023 •

edited by tscheypidi

Loading

🐦 Description of this PR 🐦

update copyright to 2023

🔧 Checklist for PR creator 🔧

Label pull request from the label list.
- Low risk: Simple bugfixes (missing files, updated documentation, typos) or changes in start or output scripts
Self-review own code
- No hard coded numbers and cluster/country/region names.
- The new code doesn't contain declared but unused parameters or variables.
- magpie4 R library has been updated accordingly and backwards compatible where necessary.
- scenario_config.csv has been updated accordingly (important if default.cfg has been updated)
Document changes
- Add changes to CHANGELOG.md
- Where relevant, put In-code documentation comments
- Properly address updates in interfaces in the module documentations
- run goxygen::goxygen() and verify the modified code is properly documented
Perform test runs
- Low risk:
  - Run a compilation check via Rscript start.R --> "compilation check"

🚨 Checklist for reviewer 🚨

PR is labeled correctly
Code changes look reasonable
- No hard coded numbers and cluster/country/region names.
- No unnecessary increase in module interfaces
- model behavior/performance is satisfactory.
Changes are properly documented
- CHANGELOG is updated correctly
- Updates in interfaces have been properly addressed in the module documentations
- In-code documentation looks appropriate
content review done (at least 1)
RSE review done (at least 1)

pfuehrlich-pik added 2 commits

January 11, 2023 15:29


          copyright 2023

fb924ea


          run insertheader.R

1a520bc

pfuehrlich-pik requested a review from tscheypidi

January 11, 2023 14:46

pfuehrlich-pik added the Low risk label

pfuehrlich-pik requested a review from weindl

January 11, 2023 14:48

tscheypidi approved these changes

View reviewed changes

Member

tscheypidi left a comment

686 files changed? 🕺

modules/57_maccs/on_aug22/not_used.txt Outdated

    
              # |  of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of

              # |  AGPL-3.0, you are granted additional permissions described in the

              # |  MAgPIE License Exception, version 1.0 (see LICENSE file).

              # |  Contact: magpie@pik-potsdam.de

              name,type,reason

Member

tscheypidi Jan 11, 2023

This seems to be an empty not_used.txt. Can you delete it?

pfuehrlich-pik added 4 commits

January 11, 2023 15:55


          delete empty not_used.txt

5fddf72


          remove empty not_used.txt, remove header

ac2a531


          remove copyright not_used

c6e1b75


          insertheader -txt

3030e92

weindl approved these changes

View reviewed changes

Contributor

weindl left a comment

In some files (where I left a comment), the header was deleted completely, instead of updating the year in the header. Could you have a look at it before merging?

modules/38_factor_costs/sticky_labor/not_used.txt

-              # |  authors, and contributors see CITATION.cff file. This file is part
-              # |  of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of
-              # |  AGPL-3.0, you are granted additional permissions described in the
-              # |  MAgPIE License Exception, version 1.0 (see LICENSE file).

Contributor

weindl Jan 11, 2023

Why is the header here deleted, instead of replacing 2021 with 2023?

Contributor Author

pfuehrlich-pik Jan 11, 2023

this was intentional, Jan said as not_used files do not really contain code they should not have the copyright header

Contributor

weindl Jan 11, 2023

+1

modules/41_area_equipped_for_irrigation/static/not_used.txt

Comment on lines -1 to -6

    
              # |  (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK)

              # |  authors, and contributors see CITATION.cff file. This file is part

              # |  of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of

              # |  AGPL-3.0, you are granted additional permissions described in the

              # |  MAgPIE License Exception, version 1.0 (see LICENSE file).

              # |  Contact: magpie@pik-potsdam.de

Contributor

weindl Jan 11, 2023

Why is the header here deleted, instead of replacing 2021 with 2023?

modules/51_nitrogen/off/not_used.txt

    
              # |  (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK)

              # |  authors, and contributors see CITATION.cff file. This file is part

              # |  of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of

              # |  AGPL-3.0, you are granted additional permissions described in the

              # |  MAgPIE License Exception, version 1.0 (see LICENSE file).

              # |  Contact: magpie@pik-potsdam.de

              name,type,reason

Contributor

weindl Jan 11, 2023

Why is the header here deleted, instead of replacing 2021 with 2023?

modules/59_som/static_jan19/not_used.txt

Comment on lines -1 to -6

    
              # |  (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK)

              # |  authors, and contributors see CITATION.cff file. This file is part

              # |  of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of

              # |  AGPL-3.0, you are granted additional permissions described in the

              # |  MAgPIE License Exception, version 1.0 (see LICENSE file).

              # |  Contact: magpie@pik-potsdam.de

Contributor

weindl Jan 11, 2023

Why is the header here deleted, instead of replacing 2021 with 2023?

modules/80_optimization/nlp_apr17/not_used.txt

Comment on lines -1 to -6

    
              # |  (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK)

              # |  authors, and contributors see CITATION.cff file. This file is part

              # |  of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of

              # |  AGPL-3.0, you are granted additional permissions described in the

              # |  MAgPIE License Exception, version 1.0 (see LICENSE file).

              # |  Contact: magpie@pik-potsdam.de

Contributor

weindl Jan 11, 2023

Why is the header here deleted, instead of replacing 2021 with 2023?

modules/80_optimization/nlp_par/not_used.txt

Comment on lines -1 to -6

    
              # |  (C) 2008-2021 Potsdam Institute for Climate Impact Research (PIK)

              # |  authors, and contributors see CITATION.cff file. This file is part

              # |  of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of

              # |  AGPL-3.0, you are granted additional permissions described in the

              # |  MAgPIE License Exception, version 1.0 (see LICENSE file).

              # |  Contact: magpie@pik-potsdam.de

Contributor

weindl Jan 11, 2023

Why is the header here deleted, instead of replacing 2021 with 2023?

pfuehrlich-pik merged commit b261bc8 into magpiemodel:develop

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment