From e11d490d18ce09950c670b46161325c314e187f0 Mon Sep 17 00:00:00 2001 From: Keith Beattie Date: Wed, 11 Dec 2024 15:10:51 -0800 Subject: [PATCH 1/4] Fixing PyQt5-sip to the last version for python 3.8 --- requirements-dev.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-dev.txt b/requirements-dev.txt index 0cfd5d444..6ec27a957 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -10,6 +10,7 @@ # occurring with Pylint 3 pylint==2.17.7;python_version=="3.8" astroid==2.15.8;python_version=="3.8" +PyQt5-sip==12.15.0;python_version=="3.8" pylint==3.1.0;python_version>"3.8" astroid==3.1.0;python_version>"3.8" From fa2d5b0e979ef915151bf6078ce25636f2a77272 Mon Sep 17 00:00:00 2001 From: Keith Beattie Date: Wed, 11 Dec 2024 15:47:37 -0800 Subject: [PATCH 2/4] Removing tests and documentation for python 3.8 --- .github/workflows/checks.yml | 2 -- .github/workflows/nightlies.yml | 4 ++-- docs/source/chapt_install/install_python.rst | 4 ++-- requirements-dev.txt | 5 ----- turbine_aws.cfg | 23 ++++++++++++++++++++ user_ml_ai_models/__init__.py | 0 6 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 turbine_aws.cfg create mode 100644 user_ml_ai_models/__init__.py diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 85dd1251b..fe3569a56 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -65,7 +65,6 @@ jobs: fail-fast: false matrix: python-version: - - '3.8' - '3.9' - '3.10' - '3.11' @@ -167,7 +166,6 @@ jobs: fail-fast: false matrix: python-version: - - '3.8' - '3.9' - '3.10' - '3.11' diff --git a/.github/workflows/nightlies.yml b/.github/workflows/nightlies.yml index a2bf71fd8..11ee8da1f 100644 --- a/.github/workflows/nightlies.yml +++ b/.github/workflows/nightlies.yml @@ -23,8 +23,8 @@ jobs: fail-fast: false matrix: python-version: - - '3.8' - '3.9' + - '3.10' os: - linux - win64 @@ -47,7 +47,7 @@ jobs: pip-install-target: https://github.com/CCSI-Toolset/FOQUS/archive/master.zip - foqus-install-target: stable os: win64 - python-version: '3.8' + python-version: '3.9' steps: - name: Set up Conda diff --git a/docs/source/chapt_install/install_python.rst b/docs/source/chapt_install/install_python.rst index 5fec1ab52..4eebde283 100644 --- a/docs/source/chapt_install/install_python.rst +++ b/docs/source/chapt_install/install_python.rst @@ -3,7 +3,7 @@ Install Python -------------- -Python version 3.8 up through 3.12 is required to run FOQUS. +Python version 3.9 up through 3.12 is required to run FOQUS. We recommend using either the `Miniconda `_ or `Anaconda `_ Python distribution and package management @@ -17,7 +17,7 @@ ability to create self-contained python environments without any need for admini privileges. These separate environments can have different set of packages, isolating version dependencies when working with multiple python projects. -If you have a working version of Python 3.8 through 3.12, which you prefer over Anaconda, you can +If you have a working version of Python 3.9 through 3.12, which you prefer over Anaconda, you can skip these steps. Anaconda or Miniconda Install and Setup diff --git a/requirements-dev.txt b/requirements-dev.txt index 6ec27a957..8ed071c94 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,11 +6,6 @@ # - also pinning the version for Astroid (used by pylint to analyze the AST) # since there can be significant differences between (non-major) versions, # both in terms of behavior and performance -# - we need to use Pylint 2 with Python 3.8 b/c of a critical error (stack overflow) -# occurring with Pylint 3 -pylint==2.17.7;python_version=="3.8" -astroid==2.15.8;python_version=="3.8" -PyQt5-sip==12.15.0;python_version=="3.8" pylint==3.1.0;python_version>"3.8" astroid==3.1.0;python_version>"3.8" diff --git a/turbine_aws.cfg b/turbine_aws.cfg new file mode 100644 index 000000000..a3ffcc6c5 --- /dev/null +++ b/turbine_aws.cfg @@ -0,0 +1,23 @@ +[Consumer] +url = https://b7x9ucxadg.execute-api.us-east-1.amazonaws.com/development/consumer/ + +[Job] +url = https://b7x9ucxadg.execute-api.us-east-1.amazonaws.com/development/job/ + +[Simulation] +url = https://b7x9ucxadg.execute-api.us-east-1.amazonaws.com/development/simulation/ +SignedUrl = True + +[Session] +url = https://b7x9ucxadg.execute-api.us-east-1.amazonaws.com/development/session/ + +[Application] +url = https://b7x9ucxadg.execute-api.us-east-1.amazonaws.com/development/application/ + +[Authentication] +username = +password = + +[Notification] +url = wss://du6p1udafi.execute-api.us-east-1.amazonaws.com/Development + diff --git a/user_ml_ai_models/__init__.py b/user_ml_ai_models/__init__.py new file mode 100644 index 000000000..e69de29bb From f755b168f97b29adbceb908b0804394a8aca9956 Mon Sep 17 00:00:00 2001 From: Keith Beattie Date: Wed, 11 Dec 2024 15:49:33 -0800 Subject: [PATCH 3/4] Removing and ignoring some accidentally added files --- .gitignore | 4 +++- turbine_aws.cfg | 23 ----------------------- user_ml_ai_models/__init__.py | 0 3 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 turbine_aws.cfg delete mode 100644 user_ml_ai_models/__init__.py diff --git a/.gitignore b/.gitignore index 68b25a900..8abe3c097 100644 --- a/.gitignore +++ b/.gitignore @@ -53,4 +53,6 @@ gams logging.conf logs turbine.cfg -user_plugins \ No newline at end of file +user_plugins +turbine_aws.cfg +user_ml_ai_models/__init__.py diff --git a/turbine_aws.cfg b/turbine_aws.cfg deleted file mode 100644 index a3ffcc6c5..000000000 --- a/turbine_aws.cfg +++ /dev/null @@ -1,23 +0,0 @@ -[Consumer] -url = https://b7x9ucxadg.execute-api.us-east-1.amazonaws.com/development/consumer/ - -[Job] -url = https://b7x9ucxadg.execute-api.us-east-1.amazonaws.com/development/job/ - -[Simulation] -url = https://b7x9ucxadg.execute-api.us-east-1.amazonaws.com/development/simulation/ -SignedUrl = True - -[Session] -url = https://b7x9ucxadg.execute-api.us-east-1.amazonaws.com/development/session/ - -[Application] -url = https://b7x9ucxadg.execute-api.us-east-1.amazonaws.com/development/application/ - -[Authentication] -username = -password = - -[Notification] -url = wss://du6p1udafi.execute-api.us-east-1.amazonaws.com/Development - diff --git a/user_ml_ai_models/__init__.py b/user_ml_ai_models/__init__.py deleted file mode 100644 index e69de29bb..000000000 From c70ee09fcc3908c36bddf79b778da46e47408e6c Mon Sep 17 00:00:00 2001 From: Keith Beattie Date: Thu, 12 Dec 2024 10:24:25 -0800 Subject: [PATCH 4/4] Nightlies use 3.12, remove unneeded restrictions on >3.8 and <3.8 --- .github/workflows/nightlies.yml | 2 +- requirements-dev.txt | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nightlies.yml b/.github/workflows/nightlies.yml index 11ee8da1f..50a096047 100644 --- a/.github/workflows/nightlies.yml +++ b/.github/workflows/nightlies.yml @@ -24,7 +24,7 @@ jobs: matrix: python-version: - '3.9' - - '3.10' + - '3.12' os: - linux - win64 diff --git a/requirements-dev.txt b/requirements-dev.txt index 8ed071c94..6247b1e67 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,8 +6,8 @@ # - also pinning the version for Astroid (used by pylint to analyze the AST) # since there can be significant differences between (non-major) versions, # both in terms of behavior and performance -pylint==3.1.0;python_version>"3.8" -astroid==3.1.0;python_version>"3.8" +pylint==3.1.0 +astroid==3.1.0 pytest<8.1 ### coverage @@ -20,8 +20,6 @@ addheader==0.3.2 pytest-qt==4.2.* python-slugify oyaml -# singledispatchmethod needed for < 3.8 -singledispatchmethod;python_version<"3.8" hypothesis sphinx