From 2bc045e69ec28073191749d4703da08d9a185eaf Mon Sep 17 00:00:00 2001 From: grantbuster Date: Fri, 10 Nov 2023 10:05:12 -0700 Subject: [PATCH 1/2] updated python requirement >= 3.8 --- .github/workflows/codecov.yml | 4 ++-- .github/workflows/pull_request_tests_tf_latest.yml | 8 ++++++-- README.rst | 14 +++++++------- phygnn/version.py | 2 +- setup.py | 6 ++++-- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 9d73832..925652c 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -13,13 +13,13 @@ jobs: os: [ubuntu-latest] env: OS: ${{ matrix.os }} - PYTHON: '3.7' + PYTHON: '3.9' steps: - uses: actions/checkout@v2 - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.9 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/pull_request_tests_tf_latest.yml b/.github/workflows/pull_request_tests_tf_latest.yml index ea83f7c..03e604e 100644 --- a/.github/workflows/pull_request_tests_tf_latest.yml +++ b/.github/workflows/pull_request_tests_tf_latest.yml @@ -13,12 +13,16 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] python-version: ['3.10'] include: + - os: ubuntu-latest + python-version: 3.12 + - os: ubuntu-latest + python-version: 3.11 + - os: ubuntu-latest + python-version: 3.10 - os: ubuntu-latest python-version: 3.9 - os: ubuntu-latest python-version: 3.8 - - os: ubuntu-latest - python-version: 3.7 steps: - uses: actions/checkout@v2 with: diff --git a/README.rst b/README.rst index 0643dca..a140d30 100644 --- a/README.rst +++ b/README.rst @@ -28,10 +28,10 @@ phygnn .. image:: https://zenodo.org/badge/276492167.svg :target: https://zenodo.org/badge/latestdoi/276492167 - + .. image:: https://mybinder.org/badge_logo.svg :target: https://mybinder.org/v2/gh/NREL/PHYGNN/HEAD - + **phygnn** (fi-geon | \ ˈfi-jən) noun. @@ -53,8 +53,8 @@ here. `_. -You can also run the examples using a free cloud-hosted jupyter instance via +`_. +You can also run the examples using a free cloud-hosted jupyter instance via `Binder `_. At the National Renewable Energy Lab (NREL), we are using the phygnn framework @@ -101,9 +101,9 @@ Installation Simple Install -------------- -1. Use conda (anaconda or miniconda with python 3.7 or 3.8) to create a phygnn environment: ``conda create --name phygnn python=3.7`` +1. Use conda (anaconda or miniconda) to create a phygnn environment: ``conda create --name phygnn python=3.9`` - i. Note that phygnn is tested with python 3.7 and 3.8 via pip install. Users have reported issues installing phygnn on python 3.8 using conda install. + i. Note that phygnn is tested with python >= 3.8 via pip install. Users have reported issues installing phygnn using conda install. 2. Activate your new conda env: ``conda activate phygnn`` 3. Install with pip or conda: @@ -115,7 +115,7 @@ Simple Install Developer Install ----------------- -1. Use conda (anaconda or miniconda with python 3.7 or 3.8) to create a phygnn environment: ``conda create --name phygnn python=3.7`` +1. Use conda (anaconda or miniconda) to create a phygnn environment: ``conda create --name phygnn python=3.9`` 2. Activate your new conda env: ``conda activate phygnn`` 3. Clone the phygnn repository: ``git clone git@github.com:NREL/phygnn.git`` 4. Navigate to the cloned repo and checkout your desired branch: ``git checkout main`` or ``git checkout `` diff --git a/phygnn/version.py b/phygnn/version.py index 6f22689..7c48dcb 100644 --- a/phygnn/version.py +++ b/phygnn/version.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- """Physics Guided Neural Network version.""" -__version__ = '0.0.24' +__version__ = '0.0.25' diff --git a/setup.py b/setup.py index d5156ab..d1e0f2b 100644 --- a/setup.py +++ b/setup.py @@ -60,12 +60,14 @@ def run(self): "Intended Audience :: Science/Research", "License :: OSI Approved :: BSD License", "Natural Language :: English", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], test_suite="tests", - python_requires='>=3.7', + python_requires='>=3.8', install_requires=install_requires, extras_require={ "dev": ["flake8", "pre-commit", "pylint"], From 07b576ed7a3892f10afa9a4359ee69bd305eae95 Mon Sep 17 00:00:00 2001 From: grantbuster Date: Fri, 10 Nov 2023 10:50:16 -0700 Subject: [PATCH 2/2] tensorflow currently does not support py3.12 --- .github/workflows/pull_request_tests_tf_latest.yml | 2 -- setup.py | 1 - 2 files changed, 3 deletions(-) diff --git a/.github/workflows/pull_request_tests_tf_latest.yml b/.github/workflows/pull_request_tests_tf_latest.yml index 03e604e..568d6de 100644 --- a/.github/workflows/pull_request_tests_tf_latest.yml +++ b/.github/workflows/pull_request_tests_tf_latest.yml @@ -13,8 +13,6 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] python-version: ['3.10'] include: - - os: ubuntu-latest - python-version: 3.12 - os: ubuntu-latest python-version: 3.11 - os: ubuntu-latest diff --git a/setup.py b/setup.py index d1e0f2b..dcc79c6 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,6 @@ def run(self): "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", ], test_suite="tests", python_requires='>=3.8',