Skip to content

Commit

Permalink
Pin pywin32 version to 306 to address #1172 and remove support for Py…
Browse files Browse the repository at this point in the history
…thon 3.7 (#1173)

* Add push trigger while WIP

* Add Python 3.9 to compare

* Remove PR jobs while WIP

* Add pull_request trigger while WIP

* Try removing version constraint for Pywin32

* Modify job to run from PR branch

* Add back stable matrix item to avoid failures

* Add back pywin32 version constraint to verify correlation to failures

* Revert "Add back pywin32 version constraint to verify correlation to failures"

This reverts commit c78e3ae.

* Revert "Remove PR jobs while WIP"

This reverts commit e3e428d.

* Add exact version constraint for pywin32

* Add pywin32 version to conda install commands in docs and CI

* Remove Python 3.7 from installation docs and CI matrices

* Revert temporary changes to nightlies CI workflow
  • Loading branch information
lbianchi-lbl authored Nov 22, 2023
1 parent 250ee8c commit f69912d
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-foqus/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ runs:
shell: bash -l {0}
run: |
echo '::group::Output of "conda install" command'
conda install --yes --quiet -c conda-forge pip pywin32
conda install --yes --quiet -c conda-forge pip pywin32=306
conda list
echo '::endgroup::'
- name: Install FOQUS and dependencies using pip
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ jobs:
fail-fast: false
matrix:
python-version:
- '3.7'
- '3.8'
- '3.9'
# - '3.10'
Expand Down Expand Up @@ -133,7 +132,6 @@ jobs:
fail-fast: false
matrix:
python-version:
- '3.7'
- '3.8'
- '3.9'
# - '3.10'
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/nightlies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ jobs:
fail-fast: false
matrix:
python-version:
- '3.7'
- '3.8'
# - '3.9'
- '3.9'
os:
- linux
- win64
Expand Down Expand Up @@ -59,7 +58,7 @@ jobs:
pip_install_target: ${{ matrix.pip-install-target }}
run: |
echo '::group::Output of conda create/activate/install'
conda create --name ccsi-foqus --quiet --yes -c conda-forge python="$py_ver" pywin32
conda create --name ccsi-foqus --quiet --yes -c conda-forge python="$py_ver" pywin32=306
conda activate ccsi-foqus
conda install --yes -c CCSI-Toolset -c conda-forge psuade-lite=1.9
echo '::endgroup::'
Expand Down
2 changes: 1 addition & 1 deletion docs/source/chapt_dev/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ will need a copy of the source to work with. Here is rough set of steps to get s

- In a terminal create a conda env in which to work::

conda create --name ccsi-foqus -c conda-forge python=3.8 pywin32
conda create --name ccsi-foqus -c conda-forge python=3.8 pywin32=306
conda activate ccsi-foqus

- In a terminal, get the FOQUS source::
Expand Down
2 changes: 1 addition & 1 deletion docs/source/chapt_install/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ FOQUS:

- In a terminal, to setup and install::
conda create --name ccsi-foqus -c conda-forge python=3.8 pywin32
conda create --name ccsi-foqus -c conda-forge python=3.8 pywin32=306
conda activate ccsi-foqus
pip install ccsi-foqus
foqus --make-shortcut # Create Desktop shortcut (Windows only)
Expand Down
4 changes: 2 additions & 2 deletions docs/source/chapt_install/install_python.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Install Python
--------------

Python version 3.7 up through 3.9 is required to run FOQUS.
Python version 3.8 up through 3.9 is required to run FOQUS.

We recommend using either the `Miniconda <https://docs.conda.io/en/latest/miniconda.html>`_ or
`Anaconda <https://www.anaconda.com/download/>`_ Python distribution and package management
Expand Down Expand Up @@ -37,7 +37,7 @@ Anaconda or Miniconda Install and Setup
after the ``--name`` flag in the below command. In a terminal (or on Windows in the Anaconda
Prompt) type::

conda create --name ccsi-foqus -c conda-forge python=3.8 pywin32
conda create --name ccsi-foqus -c conda-forge python=3.8 pywin32=306

Then follow the prompts. This will create a new conda environment with a minimal set of
packages. To use a different version of python, change the version specified after ``python=`` in
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"pandas",
"psutil",
"PyQt5==5.15.7; platform_machine != 'arm64' or sys_platform != 'darwin'",
"pywin32<305; sys_platform == 'win32'",
"pywin32==306; sys_platform == 'win32'",
"requests",
"scipy",
"tqdm",
Expand Down

0 comments on commit f69912d

Please sign in to comment.