Merge pull request #667 from chrispyles/default-python

ucbds-infra · Jul 16, 2023 · 72555ea · 72555ea
2 parents d7a75b9 + b4041d0
commit 72555ea
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 24 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -9,16 +9,8 @@ version: 2
 sphinx:
   configuration: docs/conf.py
 
-# Build documentation with MkDocs
-#mkdocs:
-#  configuration: mkdocs.yml
-
 # Optionally build your docs in additional formats such as PDF and ePub
 formats: all
 
-# Optionally set the version of Python and requirements required to build your docs
-python:
-  version: 3.7
-
 conda:
   environment: rtd_environment.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@
 * Updated Otter Assign to normalize notebooks before writing them with `nbformat.validator.normalize` per [#658](https://github.com/ucbds-infra/otter-grader/issues/658)
 * Added summary of assignment questions to Otter Assign logging per [#564](https://github.com/ucbds-infra/otter-grader/issues/564)
 * Converted to Mamba from Conda for package management in grading containers per [#660](https://github.com/ucbds-infra/otter-grader/issues/660)
+* Upgraded default Python version in grading containers from 3.7 to 3.9
 
 **v4.4.0:**
 

diff --git a/docs/_static/grading-environment-r.yml b/docs/_static/grading-environment-r.yml
@@ -4,7 +4,7 @@ channels:
   - conda-forge
   - r
 dependencies:
-  - python=3.7
+  - python=3.9
   - pip
   - nb_conda_kernels
   - r-base>=4.0.0

diff --git a/docs/_static/grading-environment.yml b/docs/_static/grading-environment.yml
@@ -3,7 +3,7 @@ channels:
   - defaults
   - conda-forge
 dependencies:
-  - python=3.7
+  - python=3.9
   - pip
   - nb_conda_kernels
   - pip:

diff --git a/docs/conf.py b/docs/conf.py
@@ -246,7 +246,7 @@ def setup(app):
     make_setup_sh_files()
 
     with open("_static/grading-environment.yml", "w+") as f:
-        f.write(CondaEnvironment(3.7, False, [], False, None).to_str())
+        f.write(CondaEnvironment("3.9", False, [], False, None).to_str())
 
     with open("_static/grading-environment-r.yml", "w+") as f:
-        f.write(CondaEnvironment(3.7, True, [], False, None).to_str())
+        f.write(CondaEnvironment("3.9", True, [], False, None).to_str())
diff --git a/docs/otter_assign/notebook_format.rst b/docs/otter_assign/notebook_format.rst
@@ -178,13 +178,13 @@ name in the metadata.
 You can find more information about how Otter performs assignment name verification
 :ref:`here<workflow_execution_submissions_assignment_name_verification>`.
 
-By default, Otter's grading images uses Python 3.7. If you need a different version, you can
+By default, Otter's grading images uses Python 3.9. If you need a different version, you can
 specify one using the ``python_version`` config:
 
 .. code-block:: yaml
 
     # ASSIGNMENT CONFIG
-    python_version: 3.9
+    python_version: 3.10
 
 
 .. _otter_assign_seed_variables:

diff --git a/docs/workflow/otter_generate/container_image.rst b/docs/workflow/otter_generate/container_image.rst
@@ -49,7 +49,7 @@ included if you have provided an :ref:`R requirements file
 -------------------
 
 This file specifies the conda environment that Otter creates in ``setup.sh``. By default, it uses
-Python 3.7, but this can be changed using the ``--python-version`` flag to Otter Generate.
+Python 3.9, but this can be changed using the ``--python-version`` flag to Otter Generate.
 
 .. literalinclude:: ../../_static/grading-environment.yml
     :language: yaml

diff --git a/otter/generate/__init__.py b/otter/generate/__init__.py
@@ -22,7 +22,7 @@
 from ..version import __version__
 
 
-DEFAULT_PYTHON_VERSION = "3.7"
+DEFAULT_PYTHON_VERSION = "3.9"
 OTTER_ENV_NAME = "otter-env"
 OTTR_VERSION = "1.2.0"
 TEMPLATE_DIR = pkg_resources.resource_filename(__name__, "templates")

diff --git a/rtd_environment.yml b/rtd_environment.yml
@@ -3,7 +3,7 @@ channels:
     - conda-forge
     - defaults
 dependencies:
-    - python>=3.6
+    - python
     - pip
     - pip:
         - -r requirements.txt

diff --git a/test/test_assign/files/gs-autograder-correct/environment.yml b/test/test_assign/files/gs-autograder-correct/environment.yml
@@ -3,7 +3,7 @@ channels:
   - defaults
   - conda-forge
 dependencies:
-  - python=3.7
+  - python=3.9
   - pip
   - nb_conda_kernels
   - pip:

diff --git a/test/test_assign/files/rmd-autograder-correct/environment.yml b/test/test_assign/files/rmd-autograder-correct/environment.yml
@@ -4,7 +4,7 @@ channels:
   - conda-forge
   - r
 dependencies:
-  - python=3.7
+  - python=3.9
   - pip
   - nb_conda_kernels
   - r-base>=4.0.0

diff --git a/test/test_generate/files/autograder-correct/environment.yml b/test/test_generate/files/autograder-correct/environment.yml
@@ -3,7 +3,7 @@ channels:
   - defaults
   - conda-forge
 dependencies:
-  - python=3.7
+  - python=3.9
   - pip
   - nb_conda_kernels
   - pip:

diff --git a/test/test_generate/files/autograder-r-correct/environment.yml b/test/test_generate/files/autograder-r-correct/environment.yml
@@ -4,7 +4,7 @@ channels:
   - conda-forge
   - r
 dependencies:
-  - python=3.7
+  - python=3.9
   - pip
   - nb_conda_kernels
   - r-base>=4.0.0

diff --git a/test/test_generate/files/autograder-r-requirements-correct/environment.yml b/test/test_generate/files/autograder-r-requirements-correct/environment.yml
@@ -4,7 +4,7 @@ channels:
   - conda-forge
   - r
 dependencies:
-  - python=3.7
+  - python=3.9
   - pip
   - nb_conda_kernels
   - r-base>=4.0.0

diff --git a/test/test_generate/files/autograder-token-correct/environment.yml b/test/test_generate/files/autograder-token-correct/environment.yml
@@ -3,7 +3,7 @@ channels:
   - defaults
   - conda-forge
 dependencies:
-  - python=3.7
+  - python=3.9
   - pip
   - nb_conda_kernels
   - pip:

diff --git a/test/test_run/files/autograder/source/environment.yml b/test/test_run/files/autograder/source/environment.yml
@@ -3,7 +3,7 @@ channels:
   - defaults
   - conda-forge
 dependencies:
-  - python=3.7
+  - python=3.9
   - pip
   - nb_conda_kernels
   - pip: