Merge pull request #1933 from dklein-pik/develop

Bug fixes in release scripts, code cleaning in GAMS
remindmodel · Dec 16, 2024 · 9588fa3 · 9588fa3
2 parents faf7fc6 + 0962924
commit 9588fa3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/modules/80_optimization/nash/declarations.gms b/modules/80_optimization/nash/declarations.gms
@@ -128,7 +128,6 @@ s80_after                                  "value of time step after current int
 s80_numberIterations                       "display helper"
 s80_bool                                   "helper"
 s80_converged                              "if nash converged, this is 1"
-s80_cnptfile                               "parameter that indicates which optimality tolerance will be used"      /1/
 s80_runInDebug                             "Is 1 if regions stayed infeasible in nash and start in debug mode automatically following the parallel mode" /0/
 ;
 

diff --git a/modules/80_optimization/testOneRegi/declarations.gms b/modules/80_optimization/testOneRegi/declarations.gms
@@ -26,8 +26,4 @@ q80_budg_intertemp(all_regi)                        "interemporal trade balance
 q80_costAdjNash(ttot,all_regi)                      "plays a dummy role for now, allowing fixing to Nash GDX files"
 ;
 
-scalar
-s80_cnptfile                                       "parameter that indicates which optimality tolerance will be used"      /1/
-;
-
 *** EOF ./modules/80_optimization/testOneRegi/declarations.gms
diff --git a/scripts/utils/postRelease.R b/scripts/utils/postRelease.R
@@ -44,7 +44,7 @@ postRelease <- function() {
   # gh pr create --help
   # --base branch The branch into which you want your code merged
   # --head branch The branch that contains commits for your pull request (default [current branch])
-  system(paste0("gh pr create --base develop --title 'merge master into develop' --body ''"))
+  system(paste0("gh pr create --base develop --title 'merge master with new release into develop' --body ''"))
 }
 
 postRelease()

diff --git a/scripts/utils/release.R b/scripts/utils/release.R
@@ -63,15 +63,15 @@ release <- function(newVersion) {
   cfg$input <- cfg$input[cfg$stopOnMissing]
   gms::publish_data(cfg,target = "dataupload@rse.pik-potsdam.de:/remind/public")
 
-  message("If not already done please perform the two following steps manually now:\n",
+  message("If not already done please perform the first step manually now. Please perform step two in any case:\n",
           "1. CHANGELOG.md: sort lines in each category: input data/calibration, changed, added, removed, fixed; remove empty categories\n",
-          "2. git add -p\n",
+          "2. git add -p (in another terminal)\n",
           "--> When done press ENTER to commit, push and create PR")
   gms::getLine()
 
-  message("Committing and pushing changes")
-  gert::git_commit(paste("remind release", newVersion))
-  gert::git_push()
+  #message("Committing and pushing changes")
+  #gert::git_commit(paste("remind release", newVersion))
+  #gert::git_push()
 
   message("Creating tag")
   tag <- paste0("v",newVersion)