release v1.1.0

ucbds-infra · Sep 8, 2020 · 0214f81 · 0214f81
1 parent 18ff10a
commit 0214f81
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 9 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.1.0.b1
+RUN pip install otter-grader==1.1.0
diff --git 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.1.0.b1
+otter-grader==1.1.0
 {% 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.1.0.b1"
+__version__ = "1.1.0"
 
 LOGO_WITH_VERSION = fr"""
   _________        __          __               

diff --git a/release.py b/release.py
@@ -16,7 +16,7 @@
 ]
 
 
-def run_release_commands(test, beta, new_version):
+def run_release_commands(test, beta, new_version, no_twine=False):
     assert shutil.which("hub") is not None, (
         "You must have the GitHub CLI installed to use this script. Please see "
         "https://github.com/github/hub to install it."
@@ -35,6 +35,9 @@ def run_release_commands(test, beta, new_version):
         f"hub release create -a dist/*.tar.gz -a dist/*.whl -m 'v{new_version}' {' -p' if beta else ''} {new_version}",
     ]
 
+    if no_twine:
+        del commands[2]
+
     for cmd in commands:
         subprocess.run(cmd, shell=True, check=True)
 
@@ -46,6 +49,7 @@ def run_release_commands(test, beta, new_version):
 PARSER.add_argument("--dry-run", action="store_true", default=False, help="Update files only but do not push release")
 PARSER.add_argument("--git", action="store_true", default=False, help="Indicates that new release should be installed via git")
 PARSER.add_argument("--test", action="store_true", default=False, help="Indicates that new release should be pushed to test PyPI")
+PARSER.add_argument("--no-twine", action="store_true", default=False, help="Don't upload the release to PyPI")
 PARSER.add_argument("-f", "--force", action="store_true", default=False, help="Force run (ignore uncommitted changes)")
 
 
@@ -124,4 +128,4 @@ def run_release_commands(test, beta, new_version):
     if args.dry_run:
         sys.exit()
 
-    run_release_commands(args.test, to_beta, new_version_number)
+    run_release_commands(args.test, to_beta, new_version_number, no_twine=args.no_twine)
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.1.0.b1
+otter-grader==1.1.0
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.1.0.b1
+otter-grader==1.1.0
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.1.0.b1
+otter-grader==1.1.0
 
 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.1.0.b1
+otter-grader==1.1.0
 
 tqdm