From a338f220b566fd296b531e458f23f32449a8850a Mon Sep 17 00:00:00 2001 From: Massimo Cimmino Date: Fri, 28 Jun 2024 17:09:45 -0400 Subject: [PATCH 1/8] Update pygfunction version in changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ef0881..6e103ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Version 2.3 (in development) +## Version 2.2.3 (2024-07-01) + ### New features * [Issue 276](https://github.com/MassimoCimmino/pygfunction/issues/276) - Added functions to the `boreholes` module for the generation of rectangular fields in a staggered configuration. From e122c56d3e03e8180208f0650568e8ee272a3f5a Mon Sep 17 00:00:00 2001 From: Massimo Cimmino Date: Fri, 28 Jun 2024 13:17:01 -0400 Subject: [PATCH 2/8] Update Python versions --- .github/workflows/test.yml | 2 +- setup.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 29bb991..38f98ec 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] fail-fast: false steps: diff --git a/setup.cfg b/setup.cfg index 31273b2..a68ac29 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,7 +17,7 @@ classifiers = Operating System :: OS Independent Programming Language :: Python :: 3 Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 Topic :: Scientific/Engineering Topic :: Utilities @@ -28,7 +28,7 @@ install_requires = numpy >= 1.21.5 scipy >= 1.7.3 secondarycoolantprops >= 1.1 -python_requires = >=3.7 +python_requires = >=3.8 [options.extras_require] doc = From 3418b164bb86488958304362e934b6d55210b96f Mon Sep 17 00:00:00 2001 From: Massimo Cimmino Date: Fri, 28 Jun 2024 13:27:40 -0400 Subject: [PATCH 3/8] Update readthedocs config file --- .readthedocs.yaml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 4975558..ddca7cf 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,20 +1,25 @@ -# .readthedocs.yaml -# Read the Docs configuration file +# Read the Docs configuration file for Sphinx projects # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details # Required version: 2 -# Build documentation in the docs/ directory with Sphinx +# Set the OS, Python version and other tools you might need +build: + tools: + python: "3.11" + +# Build documentation in the "docs/" directory with Sphinx sphinx: - configuration: doc/source/conf.py + configuration: docs/conf.py -# Optionally build your docs in additional formats such as PDF +# Optionally build your docs in additional formats such as PDF and ePub formats: - - pdf + - pdf -# Optionally set the version of Python and requirements required to build your docs +# Optional but recommended, declare the Python requirements required +# to build your documentation +# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html python: - version: 3.7 - install: - - requirements: doc/requirements.txt + install: + - requirements: docs/requirements.txt From 9a8f9d42eef21f79aaaa3b7d7a3c416fed3cc596 Mon Sep 17 00:00:00 2001 From: Massimo Cimmino Date: Fri, 28 Jun 2024 17:12:57 -0400 Subject: [PATCH 4/8] Update dates --- LICENSE.md | 2 +- doc/source/conf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 4843796..59f21b2 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,5 +1,5 @@ -Copyright (c) 2017-2023, Massimo Cimmino +Copyright (c) 2017-2024, Massimo Cimmino All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/doc/source/conf.py b/doc/source/conf.py index 8d4dc59..a434e1c 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -66,7 +66,7 @@ # General information about the project. project = u'pygfunction' -copyright = u'2017-2022, Massimo Cimmino' +copyright = u'2017-2024, Massimo Cimmino' author = u'Massimo Cimmino' # The version info for the project you're documenting, acts as replacement for From 72fec239b11c5eda56f88e5d1ae9ff969a296ad7 Mon Sep 17 00:00:00 2001 From: Massimo Cimmino Date: Fri, 28 Jun 2024 17:18:37 -0400 Subject: [PATCH 5/8] Update version in citation.cff --- CITATION.cff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 36210d9..0300b96 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -5,8 +5,8 @@ authors: given-names: "Massimo" orcid: "https://orcid.org/0000-0002-9981-9926" title: "pygfunction" -version: 2.2.2 -date-released: 2023-01-09 +version: 2.2.3 +date-released: 2024-07-01 url: "https://github.com/MassimoCimmino/pygfunction" preferred-citation: type: conference-paper From 123ebc54dd0fdbbd0118474504548e75d5ea54cd Mon Sep 17 00:00:00 2001 From: Massimo Cimmino Date: Fri, 28 Jun 2024 17:35:28 -0400 Subject: [PATCH 6/8] Add os to doc build --- .readthedocs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index ddca7cf..f60d9f8 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -6,6 +6,7 @@ version: 2 # Set the OS, Python version and other tools you might need build: + os: ubuntu-22.04 tools: python: "3.11" From 20174b2662b9118093a70651c6169e1556af7b8c Mon Sep 17 00:00:00 2001 From: Massimo Cimmino Date: Fri, 28 Jun 2024 17:37:36 -0400 Subject: [PATCH 7/8] Fix documentation paths --- .readthedocs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index f60d9f8..9fc4873 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -12,7 +12,7 @@ build: # Build documentation in the "docs/" directory with Sphinx sphinx: - configuration: docs/conf.py + configuration: doc/source/conf.py # Optionally build your docs in additional formats such as PDF and ePub formats: @@ -23,4 +23,4 @@ formats: # See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html python: install: - - requirements: docs/requirements.txt + - requirements: doc/requirements.txt From b82f0ce1a8f2cb08e627f27744a167fe9e54f047 Mon Sep 17 00:00:00 2001 From: Massimo Cimmino Date: Fri, 28 Jun 2024 23:01:47 -0400 Subject: [PATCH 8/8] Update python versions in tox.ini --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index f9b4152..8eeaf4d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,15 @@ [tox] minversion = 3.24.5 -envlist = py37, py38, py39, py310, py311 +envlist = py38, py39, py310, py311, py312 isolated_build = true [gh-actions] python = - 3.7: py37 3.8: py38 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [testenv] setenv =