Merge pull request #114 from ucbds-infra/fix-generate-reqs

ucbds-infra · Aug 29, 2020 · c8312a5 · c8312a5
2 parents 4d24466 + 00d1a6e
commit c8312a5
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 19 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -52,4 +52,4 @@ RUN apt-get clean && \
 ADD requirements.txt /tmp/requirements.txt
 RUN pip install -r /tmp/requirements.txt
 
-RUN pip install otter-grader==1.0.0
+RUN pip install otter-grader==1.0.1
diff --git a/otter/generate/autograder.py b/otter/generate/autograder.py
@@ -99,15 +99,16 @@ def main(args):
         # render the templates
         python_requirements = PYTHON_REQUIREMENTS.render(
             other_requirements = f.read() if args.lang.lower() == "python" else "",
-            overwrite_requirements = False
+            overwrite_requirements = args.lang.lower() == "python" and args.overwrite_requirements
         )
 
         # reset the stream
         f.seek(0)
 
         r_requirements = R_REQUIREMENTS.render(
             other_requirements = f.read() if args.lang.lower() == "r" else "",
-            overwrite = args.overwrite_requirements
+            overwrite_requirements = args.lang.lower() == "python" and args.overwrite_requirements
+
         )
 
         # close the stream

diff --git a/otter/generate/templates/requirements.r b/otter/generate/templates/requirements.r
@@ -1,4 +1,4 @@
-{% if not overwrite %}
+{% if not overwrite_requirements %}
 install.packages(c(
     "usethis",
     "testthat",

diff --git a/otter/generate/templates/requirements.txt b/otter/generate/templates/requirements.txt
@@ -1,4 +1,4 @@
-{% if not overwrite %}datascience
+{% if not overwrite_requirements %}datascience
 jupyter_client
 ipykernel
 matplotlib
@@ -15,6 +15,6 @@ rpy2
 jupytext
 numpy==1.16.0
 tornado==5.1.1
-otter-grader==1.0.0
+otter-grader==1.0.1
 {% endif %}{% if other_requirements %}
 {{ other_requirements }}{% endif %}
diff --git a/otter/version.py b/otter/version.py
@@ -6,7 +6,7 @@
 
 from textwrap import dedent
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"
 
 LOGO_WITH_VERSION = fr"""
   _________        __          __               

diff --git a/release.py b/release.py
@@ -10,6 +10,7 @@
     "Dockerfile",
     "otter/generate/templates/requirements.txt",
     "test/test_generate/test-autograder/autograder-correct/requirements.txt",
+    "test/test_generate/test-run-autograder/autograder-correct/source/requirements.txt",
     "test/test-assign/gs-autograder-correct/requirements.txt",
     "test/test-assign/pdf-autograder-correct/requirements.txt",
     "test/test-assign/r-autograder-correct/requirements.txt",
@@ -32,7 +33,8 @@ def run_release_commands(test, beta, new_version):
         f"docker build . -t ucbdsinfra/otter-grader{':beta' if beta else ''}",
         f"docker push ucbdsinfra/otter-grader{':beta' if beta else ''}",
         "make tutorial",
-        f"hub release create -a dist -m v{new_version}{' -p' if beta else ''} {new_version}",
+        f"git commit -am 'release v{new_version}'",
+        f"hub release create -a dist/*.tar.gz -a dist/*.whl -m 'v{new_version}{' -p' if beta else ''}' {new_version}",
     ]
 
     for cmd in commands:
@@ -67,11 +69,11 @@ def run_release_commands(test, beta, new_version):
     from_git = bool(re.search(r"https://github.com/ucbds-infra/otter-grader\.git@", contents))
     from_beta = bool(re.search(r"otter-grader==\d+\.\d+\.\d+\.b\d+", contents))
 
-    if to_git and subprocess.run(["git", "diff"], stdout=subprocess.PIPE).stdout.decode("utf-8").strip():
-        warnings.warn(
-            "You have uncommitted changes that will not be included in this release. To include "
-            "them, commit your changes and rerun this script.",
-            UserWarning
+    if subprocess.run(["git", "diff"], stdout=subprocess.PIPE).stdout.decode("utf-8").strip() and not args.dry_run:
+        # throw error because this will commit everything when you make a release
+        raise RuntimeError(
+            "You have uncommitted changes. Please add and commit these changes before pushing "
+            "a release." 
         )
 
     if to_git:

diff --git a/test/test-assign/gs-autograder-correct/requirements.txt b/test/test-assign/gs-autograder-correct/requirements.txt
@@ -15,4 +15,4 @@ rpy2
 jupytext
 numpy==1.16.0
 tornado==5.1.1
-otter-grader==1.0.0
+otter-grader==1.0.1
diff --git a/test/test-assign/pdf-autograder-correct/requirements.txt b/test/test-assign/pdf-autograder-correct/requirements.txt
@@ -15,4 +15,4 @@ rpy2
 jupytext
 numpy==1.16.0
 tornado==5.1.1
-otter-grader==1.0.0
+otter-grader==1.0.1
diff --git a/test/test-assign/r-autograder-correct/requirements.txt b/test/test-assign/r-autograder-correct/requirements.txt
@@ -15,4 +15,4 @@ rpy2
 jupytext
 numpy==1.16.0
 tornado==5.1.1
-otter-grader==1.0.0
+otter-grader==1.0.1
diff --git a/test/test-assign/rmd-autograder-correct/requirements.txt b/test/test-assign/rmd-autograder-correct/requirements.txt
@@ -15,4 +15,4 @@ rpy2
 jupytext
 numpy==1.16.0
 tornado==5.1.1
-otter-grader==1.0.0
+otter-grader==1.0.1
diff --git a/test/test_generate/test-autograder/autograder-correct/requirements.txt b/test/test_generate/test-autograder/autograder-correct/requirements.txt
@@ -15,6 +15,6 @@ rpy2
 jupytext
 numpy==1.16.0
 tornado==5.1.1
-otter-grader==1.0.0
+otter-grader==1.0.1
 
 tqdm
diff --git a/test/test_generate/test-run-autograder/autograder-correct/source/requirements.txt b/test/test_generate/test-run-autograder/autograder-correct/source/requirements.txt
@@ -15,6 +15,6 @@ rpy2
 jupytext
 numpy==1.16.0
 tornado==5.1.1
-otter-grader==1.0.0
+otter-grader==1.0.1
 
 tqdm