re-enable 3.12 and remove CI changes

apache · Sep 5, 2024 · ef44575 · ef44575
1 parent 6b0d847
commit ef44575
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -1063,13 +1063,6 @@ function check_run_tests() {
  return
  fi
 
- if [[ " 3.8 3.9 3.12 " == *" ${PYTHON_MAJOR_MINOR_VERSION} "* && ${TEST_TYPE} == "Providers[cloudant]" ]]; then
- echo
- echo "${COLOR_YELLOW}Skipping Cloudant tests on Python 3.8, 3.9, 3.12 because cloudant is disabled there${COLOR_RESET}"
- echo
- exit 0
- fi
-
  if [[ ${REMOVE_ARM_PACKAGES:="false"} == "true" ]]; then
  # Test what happens if we do not have ARM packages installed.
  # This is useful to see if pytest collection works without ARM packages which is important

diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh
@@ -303,13 +303,6 @@ function check_run_tests() {
  return
  fi
 
- if [[ " 3.8 3.9 3.12 " == *" ${PYTHON_MAJOR_MINOR_VERSION} "* && ${TEST_TYPE} == "Providers[cloudant]" ]]; then
- echo
- echo "${COLOR_YELLOW}Skipping Cloudant tests on Python 3.8, 3.9, 3.12 because cloudant is disabled there${COLOR_RESET}"
- echo
- exit 0
- fi
-
  if [[ ${REMOVE_ARM_PACKAGES:="false"} == "true" ]]; then
  # Test what happens if we do not have ARM packages installed.
  # This is useful to see if pytest collection works without ARM packages which is important

diff --git a/tests/providers/cloudant/hooks/test_cloudant.py b/tests/providers/cloudant/hooks/test_cloudant.py
@@ -32,7 +32,7 @@
 else:
  pytestmark.append(
  pytest.mark.skip(
- f"Skipping {__name__} as the cloudant provider is not supported on Python 3.8, 3.9 and 3.12, see #41555."
+ f"Skipping {__name__} as the cloudant provider is not supported on Python 3.8 and 3.9, see #41555."
  )
  )