Merge branch 'main' into intersphinx-131

IDAES · Sep 5, 2024 · 96122cb · 96122cb
2 parents 2efc4f0 + 8f46f82
commit 96122cb
Show file tree

Hide file tree

Showing 84 changed files with 22,079 additions and 25,729 deletions.
diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
@@ -34,7 +34,7 @@ concurrency:
 
 env:
   # default Python version to use for checks that do not require multiple versions
-  DEFAULT_PYTHON_VERSION: '3.8'
+  DEFAULT_PYTHON_VERSION: '3.10'
   IDAES_CONDA_ENV_NAME_DEV: idaes-examples-dev
   PYTEST_ADDOPTS: "--color=yes"
 
@@ -62,9 +62,10 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - '3.8'
           - '3.9'
           - '3.10'
+          - '3.11'
+          - '3.12'
         os:
           - linux
           - win64

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -3,7 +3,7 @@ version: 2
 build:
   os: ubuntu-20.04
   tools:
-    python: "3.8"
+    python: "3.10"
   jobs:
     pre_build:
       # Set conf vars and  update the Sphinx configuration (conf.py)

diff --git a/idaes_examples/browse.py b/idaes_examples/browse.py
@@ -4,9 +4,6 @@
 # stdlib
 from importlib import resources
 
-if not hasattr(resources, "files"):
-    # importlib.resources.files() added in Python 3.9
-    import importlib_resources as resources
 import json
 import logging
 from logging.handlers import RotatingFileHandler