Update Python and dependency versions in test fixtures (#1571)

* Switches any tests that aren't testing the Python version itself to using Python 3.12 (so that the Python version is available when the tests are run against newer stacks where older Python versions won't have been built). * Refreshes the lockfiles for the Pipenv tests * Fixes the Heroku CI test since `nose` doesn't work with modern Python, and the old test also didn't actually test the CI-specific `requirements-test.txt` feature. * Replaces the unicode ellipsis character used in buildpack output with repeated ASCII periods (`"..."`) since: - Hatchet doesn't handle the unicode properly in its CI output logs (which could issues with the improved Heroku CI Hatchet test) - It's inconsistent with output elsewhere in the buildpack where the ASCII periods were already used. (This change has been split out of the Heroku-24 PR for easier review.) GUS-W-14667590.
heroku · Apr 18, 2024 · 4e9eac2 · 4e9eac2
1 parent 2c35ea4
commit 4e9eac2
Show file tree

Hide file tree

Showing 34 changed files with 135 additions and 100 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 __pycache__/
 .hatchet/repos/
+.venv/
 .DS_Store
 .rspec_status
diff --git a/bin/steps/nltk b/bin/steps/nltk
@@ -15,7 +15,7 @@ source "$BIN_DIR/utils"
 
 # Check that nltk was installed by pip, otherwise obviously not needed
 if is_module_available 'nltk'; then
-    puts-step "Downloading NLTK corpora…"
+    puts-step "Downloading NLTK corpora..."
 
     nltk_packages_definition="$BUILD_DIR/nltk.txt"
 

diff --git a/bin/steps/pip-install b/bin/steps/pip-install
@@ -45,7 +45,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
     # Install test dependencies, for CI.
     if [ "$INSTALL_TEST" ]; then
         if [[ -f requirements-test.txt ]]; then
-            puts-step "Installing test dependencies…"
+            puts-step "Installing test dependencies..."
             /app/.heroku/python/bin/pip install -r requirements-test.txt --exists-action=w --src='/app/.heroku/src' --disable-pip-version-check --no-cache-dir 2>&1 | cleanup | indent
         fi
     fi

diff --git a/spec/fixtures/ci_nose/requirements.txt b/spec/fixtures/ci_nose/requirements.txt
diff --git a/spec/fixtures/ci_nose/runtime.txt b/spec/fixtures/ci_nose/runtime.txt
diff --git a/spec/fixtures/ci_nose/app.json → spec/fixtures/ci_requirements/app.json b/spec/fixtures/ci_nose/app.json → spec/fixtures/ci_requirements/app.json
@@ -2,7 +2,7 @@
   "environments": {
     "test": {
       "scripts": {
-        "test": "nosetests"
+        "test": "pytest --version"
       }
     }
   }

diff --git a/spec/fixtures/ci_requirements/requirements-test.txt b/spec/fixtures/ci_requirements/requirements-test.txt
@@ -0,0 +1 @@
+pytest
diff --git a/spec/fixtures/ci_requirements/requirements.txt b/spec/fixtures/ci_requirements/requirements.txt
@@ -0,0 +1 @@
+urllib3
diff --git a/spec/fixtures/pipenv_and_requirements_txt/Pipfile b/spec/fixtures/pipenv_and_requirements_txt/Pipfile
@@ -9,4 +9,4 @@ urllib3 = "*"
 [dev-packages]
 
 [requires]
-python_version = "3.10"
+python_version = "3.12"
diff --git a/spec/fixtures/pipenv_and_requirements_txt/Pipfile.lock b/spec/fixtures/pipenv_and_requirements_txt/Pipfile.lock
diff --git a/spec/fixtures/pipenv_and_runtime_txt/Pipfile b/spec/fixtures/pipenv_and_runtime_txt/Pipfile
@@ -9,4 +9,4 @@ urllib3 = "*"
 [dev-packages]
 
 [requires]
-python_version = "3.9"
+python_version = "3.11"
diff --git a/spec/fixtures/pipenv_and_runtime_txt/Pipfile.lock b/spec/fixtures/pipenv_and_runtime_txt/Pipfile.lock
diff --git a/spec/fixtures/pipenv_and_runtime_txt/runtime.txt b/spec/fixtures/pipenv_and_runtime_txt/runtime.txt
@@ -1 +1 @@
-python-3.10.14
+python-3.12.3
diff --git a/spec/fixtures/pipenv_editable/Pipfile.lock b/spec/fixtures/pipenv_editable/Pipfile.lock
diff --git a/spec/fixtures/pipenv_lockfile_out_of_sync/Pipfile b/spec/fixtures/pipenv_lockfile_out_of_sync/Pipfile
@@ -9,4 +9,4 @@ urllib3 = "*"
 [dev-packages]
 
 [requires]
-python_version = "3.10"
+python_version = "3.12"
diff --git a/spec/fixtures/pipenv_lockfile_out_of_sync/Pipfile.lock b/spec/fixtures/pipenv_lockfile_out_of_sync/Pipfile.lock
diff --git a/spec/fixtures/pipenv_python_3.10/Pipfile.lock b/spec/fixtures/pipenv_python_3.10/Pipfile.lock
diff --git a/spec/fixtures/pipenv_python_3.11/Pipfile.lock b/spec/fixtures/pipenv_python_3.11/Pipfile.lock
diff --git a/spec/fixtures/pipenv_python_3.12/Pipfile.lock b/spec/fixtures/pipenv_python_3.12/Pipfile.lock
diff --git a/spec/fixtures/pipenv_python_3.8/Pipfile.lock b/spec/fixtures/pipenv_python_3.8/Pipfile.lock
diff --git a/spec/fixtures/pipenv_python_3.9/Pipfile.lock b/spec/fixtures/pipenv_python_3.9/Pipfile.lock
diff --git a/spec/fixtures/pipenv_python_full_version/Pipfile b/spec/fixtures/pipenv_python_full_version/Pipfile
@@ -9,4 +9,4 @@ urllib3 = "*"
 [dev-packages]
 
 [requires]
-python_full_version = "3.10.7"
+python_full_version = "3.12.2"
diff --git a/spec/fixtures/pipenv_python_full_version/Pipfile.lock b/spec/fixtures/pipenv_python_full_version/Pipfile.lock
diff --git a/spec/fixtures/pipenv_python_full_version_invalid/Pipfile.lock b/spec/fixtures/pipenv_python_full_version_invalid/Pipfile.lock
diff --git a/spec/fixtures/pipenv_python_version_invalid/Pipfile b/spec/fixtures/pipenv_python_version_invalid/Pipfile
@@ -9,4 +9,4 @@ urllib3 = "*"
 [dev-packages]
 
 [requires]
-python_version = "^3.9"
+python_version = "^3.12"
diff --git a/spec/fixtures/pipenv_python_version_invalid/Pipfile.lock b/spec/fixtures/pipenv_python_version_invalid/Pipfile.lock
diff --git a/spec/fixtures/pipenv_python_version_unspecified/Pipfile.lock b/spec/fixtures/pipenv_python_version_unspecified/Pipfile.lock
diff --git a/spec/fixtures/runtime_txt_only/runtime.txt b/spec/fixtures/runtime_txt_only/runtime.txt
@@ -1 +1 @@
-python-3.10.14
+python-3.12.3
diff --git a/spec/fixtures/runtime_txt_with_stray_whitespace/runtime.txt b/spec/fixtures/runtime_txt_with_stray_whitespace/runtime.txt
@@ -1,3 +1,3 @@
 
- python-3.10.14 
+ python-3.12.3