From 894ffb2cdc4ffd9c4735a4441ffcfb82400768b1 Mon Sep 17 00:00:00 2001 From: Daniel Silva Date: Fri, 27 Feb 2026 21:25:08 +0000 Subject: [PATCH 1/3] chore: upgrade all packages for python 3.14 --- docs/conf.py | 2 +- docs/index.rst | 2 +- heatrapy/__init__.py | 2 +- requirements.txt | 35 +++++++++++++++++++---------------- setup.py | 4 ++-- 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 11cbf2c..85c7ddb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -14,7 +14,7 @@ project = 'heatrapy' copyright = '2026, Daniel Silva' author = 'Daniel Silva' -release = '2.1.0' +release = '2.1.1' # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/docs/index.rst b/docs/index.rst index 8a4e40e..029ffda 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -13,7 +13,7 @@ incorporation of phase transitions. |icon_github| `github repository `_ -|icon_heatrapy| current version: v2.1.0 +|icon_heatrapy| current version: v2.1.1 .. |icon_github| image:: https://github.githubassets.com/favicons/favicon.png :width: 25px diff --git a/heatrapy/__init__.py b/heatrapy/__init__.py index 935f248..a5f0be0 100644 --- a/heatrapy/__init__.py +++ b/heatrapy/__init__.py @@ -1,7 +1,7 @@ """Heatrapy. author: Daniel Silva (djsilva@gmx.com) -current version: v2.1.0 +current version: v2.1.1 url: https://github.com/djsilva99/heatrapy This module allows to create thermal objects, establish thermal contact between diff --git a/requirements.txt b/requirements.txt index b114229..7caf5e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,17 +1,20 @@ -coverage==7.6.1 -cycler==0.10.0 -exceptiongroup==1.2.2 -iniconfig==2.0.0 -kiwisolver==1.3.1 +contourpy==1.3.3 +coverage==7.13.4 +cycler==0.12.1 +exceptiongroup==1.3.1 +fonttools==4.61.1 +iniconfig==2.3.0 +kiwisolver==1.4.9 matplotlib==3.10.8 -numpy==2.2.6 -packaging==24.1 -Pillow==12.1.1 -pluggy==1.5.0 -pyparsing==3.1.0 -pytest==8.3.3 -pytest-cov==5.0.0 -python-dateutil==2.8.1 -six==1.15.0 -tomli==2.0.1 -ruff==0.12.10 +numpy==2.4.2 +packaging==26.0 +pillow==12.1.1 +pluggy==1.6.0 +Pygments==2.19.2 +pyparsing==3.3.2 +pytest==9.0.2 +pytest-cov==7.0.0 +python-dateutil==2.9.0.post0 +ruff==0.15.4 +six==1.17.0 +tomli==2.4.0 diff --git a/setup.py b/setup.py index bcaed45..078d65d 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ setup(name='heatrapy', - version='2.1.0', + version='2.1.1', description='Library for simulating 1D and 2D heat transfer processes', long_description=description, classifiers=[ @@ -31,7 +31,7 @@ license='MIT', packages=['heatrapy'], install_requires=[ - 'numpy==2.2.6', 'matplotlib==3.10.8' + 'numpy==2.4.2', 'matplotlib==3.10.8' ], include_package_data=True, zip_safe=False) From 4ed809cc02ce553c6d4e412cda75731fbebe3d9a Mon Sep 17 00:00:00 2001 From: Daniel Silva Date: Fri, 27 Feb 2026 21:32:05 +0000 Subject: [PATCH 2/3] ci: install python 3.14 --- .github/workflows/heatrapy-app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/heatrapy-app.yml b/.github/workflows/heatrapy-app.yml index 294f561..b5ec8f3 100644 --- a/.github/workflows/heatrapy-app.yml +++ b/.github/workflows/heatrapy-app.yml @@ -29,10 +29,10 @@ jobs: https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }} \ -d '{"base": "develop"}' - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.14 uses: actions/setup-python@v3 with: - python-version: "3.10" + python-version: "3.14" - name: Install dependencies run: | python -m pip install --upgrade pip From f4de87e22bd262991a0354e804b02c15044dea2f Mon Sep 17 00:00:00 2001 From: Daniel Silva Date: Fri, 27 Feb 2026 23:03:11 +0000 Subject: [PATCH 3/3] ci: add setuptools in requirements --- requirements.txt | 1 + setup.py | 56 ++++++++++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7caf5e0..a6eddb5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,5 +16,6 @@ pytest==9.0.2 pytest-cov==7.0.0 python-dateutil==2.9.0.post0 ruff==0.15.4 +setuptools==82.0.0 six==1.17.0 tomli==2.4.0 diff --git a/setup.py b/setup.py index 078d65d..d50190c 100644 --- a/setup.py +++ b/setup.py @@ -7,31 +7,35 @@ from setuptools import setup -description = 'This package is a module for simulating dynamic 1D and 2D heat ' -description += 'transfer processes by using the finite difference method. The ' -description += 'packages is based on thermal objects. Two different ' -description += 'approaches can be used: single thermal object and a system of ' -description += 'thermal objects that can contact with each other. The heatrapy' -description += 'package includes the incorporation of phase transitions.' +description = ( + 'This package is a module for simulating dynamic 1D and 2D heat transfer ' + 'processes by using the finite difference method. The packages is based ' + 'on thermal objects. Two different approaches can be used: single thermal ' + 'object and a system of thermal objects that can contact with each other. ' + 'The heatrapy package includes the incorporation of phase transitions.' +) -setup(name='heatrapy', - version='2.1.1', - description='Library for simulating 1D and 2D heat transfer processes', - long_description=description, - classifiers=[ - 'Development Status :: 3 - Alpha', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 3.7', - 'Topic :: Scientific/Engineering :: Physics', - ], - url='https://github.com/djsilva99/heatrapy', - author='Daniel Silva', - author_email='djsilva@gmx.com', - license='MIT', - packages=['heatrapy'], - install_requires=[ - 'numpy==2.4.2', 'matplotlib==3.10.8' - ], - include_package_data=True, - zip_safe=False) +setup( + name='heatrapy', + version='2.1.1', + description='Library for simulating 1D and 2D heat transfer processes', + long_description=description, + classifiers=[ + 'Development Status :: 3 - Alpha', + 'License :: OSI Approved :: MIT License', + 'Programming Language :: Python :: 3.14', + 'Topic :: Scientific/Engineering :: Physics', + ], + url='https://github.com/djsilva99/heatrapy', + author='Daniel Silva', + author_email='djsilva@gmx.com', + license='MIT', + packages=['heatrapy'], + install_requires=[ + 'numpy==2.4.2', + 'matplotlib==3.10.8' + ], + include_package_data=True, + zip_safe=False +)