From f06c77e66170132c6fc269839656359b0fdfee3e Mon Sep 17 00:00:00 2001 From: Chris Pyles Date: Fri, 28 Aug 2020 18:04:17 -0700 Subject: [PATCH 1/4] fixing bug w/ overwrite_requirements in generate --- otter/generate/autograder.py | 5 +++-- otter/generate/templates/requirements.r | 2 +- otter/generate/templates/requirements.txt | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/otter/generate/autograder.py b/otter/generate/autograder.py index 4e386c1c9..978a8425c 100644 --- a/otter/generate/autograder.py +++ b/otter/generate/autograder.py @@ -99,7 +99,7 @@ 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 @@ -107,7 +107,8 @@ def main(args): 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 index 1dcf13d39..f79c62180 100644 --- 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 index 3451c6041..b6c426262 100644 --- 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 From 3b29738caabdc7a4d17756e8ce6506b3e9098eb4 Mon Sep 17 00:00:00 2001 From: Chris Pyles Date: Fri, 28 Aug 2020 18:55:52 -0700 Subject: [PATCH 2/4] release v1.0.1 --- Dockerfile | 2 +- otter/generate/templates/requirements.txt | 2 +- otter/version.py | 2 +- test/test-assign/gs-autograder-correct/requirements.txt | 2 +- test/test-assign/pdf-autograder-correct/requirements.txt | 2 +- test/test-assign/r-autograder-correct/requirements.txt | 2 +- test/test-assign/rmd-autograder-correct/requirements.txt | 2 +- .../test-autograder/autograder-correct/requirements.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index f0ca417a8..3abadba0c 100644 --- 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/templates/requirements.txt b/otter/generate/templates/requirements.txt index b6c426262..901c5d079 100644 --- a/otter/generate/templates/requirements.txt +++ b/otter/generate/templates/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 {% endif %}{% if other_requirements %} {{ other_requirements }}{% endif %} \ No newline at end of file diff --git a/otter/version.py b/otter/version.py index fcab33793..9b790ef21 100644 --- 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/test/test-assign/gs-autograder-correct/requirements.txt b/test/test-assign/gs-autograder-correct/requirements.txt index ddb8f687e..410d36ed0 100644 --- 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 index ddb8f687e..410d36ed0 100644 --- 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 index ddb8f687e..410d36ed0 100644 --- 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 index ddb8f687e..410d36ed0 100644 --- 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 index ca8a69c6a..a166959af 100644 --- 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 From 4b299122a994c65742261bbebc8aa03a20382936 Mon Sep 17 00:00:00 2001 From: Chris Pyles Date: Fri, 28 Aug 2020 19:05:42 -0700 Subject: [PATCH 3/4] updated release.py --- release.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/release.py b/release.py index 0f7ba6677..4647406f3 100644 --- a/release.py +++ b/release.py @@ -32,7 +32,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 +68,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(): + # 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: From 00d1a6edd8ca68ceac729c499d890840ee76ab65 Mon Sep 17 00:00:00 2001 From: Chris Pyles Date: Fri, 28 Aug 2020 19:36:13 -0700 Subject: [PATCH 4/4] fixed test --- release.py | 3 ++- .../autograder-correct/source/requirements.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/release.py b/release.py index 4647406f3..fac9a0ecf 100644 --- 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", @@ -68,7 +69,7 @@ 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 subprocess.run(["git", "diff"], stdout=subprocess.PIPE).stdout.decode("utf-8").strip(): + 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 " 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 index ca8a69c6a..a166959af 100644 --- 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