Merge pull request #15 from CalebBell/ci_updates

Ci updates

Author: CalebBell

.github/workflows/build-multiarch.yml

@@ -33,25 +33,12 @@ jobs:
           - arch: aarch64
             distro: ubuntu_latest
           - arch: riscv64
-            distro: ubuntu_latest
+            distro: ubuntu_devel
           - arch: s390x
             distro: ubuntu_latest
           - arch: ppc64le
             distro: ubuntu_latest
 
-          - arch: armv7
-            distro: ubuntu22.04
-          - arch: aarch64
-            distro: ubuntu22.04
-          # - arch: riscv64
-          #   distro: ubuntu22.04
-          - arch: s390x
-            distro: ubuntu22.04
-          - arch: ppc64le
-            distro: ubuntu22.04
-          # ubuntu with riscv64 has three failures and a crash on test_SolverInterface_basics in scipy's root function; also test_is_poly_positive and test_bend_rounded_Miller_Re_correction
-          # ubuntu20.04 is too old, fluids dropped support with numpy 2.0 compat
-
           - arch: armv6
             distro: alpine_latest
           - arch: armv7
@@ -98,4 +85,4 @@ jobs:
                 python3 -m pip install wheel --break-system-packages
                 pip3 install -r requirements_test_multiarch.txt --break-system-packages
               fi
-              python3 -m pytest . -v -m "not online and not thermo and not numba"
+              python3 -m pytest . -v -m "not online and not thermo and not numba"

.ruff.toml

@@ -19,6 +19,7 @@ select = ["ALL"]
 extend-ignore = [
     "FBT001", # boolean positional argument
     "PD008", # .at with pandas is fine with me
+    "PD011", # Use .values instead of .to_numpy() - I prefer not to copy arrays
     "RUF059", # Allow unused variables
     "FIX002", # TODO are OK
     "FIX004", # HACK is OK
@@ -110,6 +111,7 @@ extend-ignore = [
     "RET",
     "RSE102",
     "RUF001",
+    "RUF003",  # greek characters are used in this project e.g. for allotropes
     "RUF005",  # this one is not micropython compatible
     "S101",
     "S110",

Changelog.md

@@ -2,6 +2,46 @@
 
 ## [Unreleased]
 
+## [1.1.0] - 2025-10-19
+
+### Added
+
+- Python 3.13 and 3.13t (free-threaded) support with PYTHON_GIL=0 configuration
+- Pre-commit configuration with Ruff, mdformat, and file validators
+- New GitHub Actions workflows for pre-commit checks and security scanning
+- Packaging compatibility workflows for cx_Freeze, PyInstaller, and py2exe
+- Standalone test scripts and demo builders for verifying packaged distributions
+- Coverage HTML artifact uploads to all test workflows
+- Concurrency controls to workflows to cancel redundant builds
+- Justfile for streamlined development tasks (setup, docs, test, typecheck, lint)
+- Security scanning with pip-audit and bandit
+
+### Changed
+
+- Minimum Python version raised from 3.6 to 3.8
+- Updated actions to latest versions (setup-qemu v3, run-on-arch v3)
+- Updated macOS CI runners (macos-13 → macos-15-intel, added macos-latest for ARM)
+- Extensive code quality improvements with Ruff linting across entire codebase:
+  - String quote normalization to double quotes
+  - Removed unused imports and variables
+  - Improved code formatting and PEP 8 compliance
+  - Better type hints compatibility
+- Merged type hints across the codebase with improved accuracy
+- Updated copyright year to 2025
+- Fixed numerous typos across documentation files
+- Improved Sphinx configuration for Python 3.13 compatibility
+- Enhanced docstring and markdown formatting
+- Updated README to reflect Python 3.8+ requirement
+
+### Removed
+
+- Dropped Python 3.6 and 3.7 support
+- Removed obsolete platform-specific exclusions
+
+### Security
+
+- Added automated security scanning workflow documented in SECURITY.md
+
 ## [1.0.7] - 2024-11-10
 
 ### Changed

Justfile

@@ -35,9 +35,9 @@ docs:
     @echo "✅ Docs built in _build/html"
 
 ## 🧪 test: Run the test suite with pytest.
-test:
+test *ARGS:
     @echo ">>> Running pytest..."
-    @{{VENV_PYTEST}} -n auto
+    @{{VENV_PYTEST}} -n auto {{ARGS}}
 
 ## 📊 test-cov: Run tests with coverage report.
 test-cov:

ht/__init__.py

@@ -133,5 +133,5 @@ def __getattr__(name):
         return ht.numba_vectorized
     raise AttributeError(f"module {__name__} has no attribute {name}")
 
-__version__ = "1.0.7"
+__version__ = "1.1.0"
 

ht/hx.py

@@ -28,7 +28,7 @@
 from fluids.constants import Btu, degree_Fahrenheit, foot, hour, inch
 from fluids.numerics import bisect, brenth, factorial, gamma, horner, iv, quad, secant
 from fluids.numerics import numpy as np
-from fluids.piping import BWG_SI, BWG_integers
+from fluids.piping import BWG_SI, BWG_gauges
 
 __all__: list[str] = [
     "DBundle_for_Ntubes_HEDH",
@@ -4309,7 +4309,7 @@ def F_LMTD_Fakheri(Thi: int, Tho: float, Tci: int, Tco: float, shells: int=1) ->
 #
 #for tup in TEMA_Full_Tubing:
 #    Do, BWG = tup[0]/1000., tup[1]
-#    t = BWG_SI[BWG_integers.index(BWG)]
+#    t = BWG_SI[BWG_gauges.index(BWG)]
 #    Di = Do-2*t
 #    print t*1000, Di*1000
 #
@@ -4334,43 +4334,43 @@ def get_tube_TEMA(NPS=None, BWG=None, Do=None, Di=None, tmin=None):
         if not check_tubing_TEMA(NPS, BWG):
             raise ValueError("NPS and BWG Specified are not listed in TEMA")
         Do = 0.0254*NPS
-        t = BWG_SI[BWG_integers.index(BWG)]
+        t = BWG_SI[BWG_gauges.index(BWG)]
         Di = Do-2*t
     elif Do and BWG:
         NPS = Do/.0254
         if not check_tubing_TEMA(NPS, BWG):
             raise ValueError("NPS and BWG Specified are not listed in TEMA")
-        t = BWG_SI[BWG_integers.index(BWG)]
+        t = BWG_SI[BWG_gauges.index(BWG)]
         Di = Do-2*t
     elif BWG and Di:
-        t = BWG_SI[BWG_integers.index(BWG)] # Will fail if BWG not int
+        t = BWG_SI[BWG_gauges.index(BWG)] # Will fail if BWG not int
         Do = t*2 + Di
         NPS = Do/.0254
         if not check_tubing_TEMA(NPS, BWG):
             raise ValueError("NPS and BWG Specified are not listed in TEMA")
     elif NPS and Di:
         Do = 0.0254*NPS
         t = (Do - Di)/2
-        BWG = [BWG_integers[BWG_SI.index(t)]]
+        BWG = [BWG_gauges[BWG_SI.index(t)]]
         if not check_tubing_TEMA(NPS, BWG):
             raise ValueError("NPS and BWG Specified are not listed in TEMA")
     elif Di and Do:
         NPS = Do/.0254
         t = (Do - Di)/2
-        BWG = [BWG_integers[BWG_SI.index(t)]]
+        BWG = [BWG_gauges[BWG_SI.index(t)]]
         if not check_tubing_TEMA(NPS, BWG):
             raise ValueError("NPS and BWG Specified are not listed in TEMA")
     # Begin Fuzzy matching
     elif NPS and tmin:
         Do = 0.0254*NPS
-        ts = [BWG_SI[BWG_integers.index(BWG)] for BWG in TEMA_tubing[NPS]]
+        ts = [BWG_SI[BWG_gauges.index(BWG)] for BWG in TEMA_tubing[NPS]]
         ts.reverse() # Small to large
         if tmin > ts[-1]:
             raise ValueError("Specified minimum thickness is larger than available in TEMA")
         for t in ts: # Runs if at least 1 of the thicknesses are the right size.
             if tmin <= t:
                 break
-        BWG = [BWG_integers[BWG_SI.index(t)]]
+        BWG = [BWG_gauges[BWG_SI.index(t)]]
         Di = Do-2*t
     elif Do and tmin:
         NPS = Do/.0254
@@ -4380,7 +4380,7 @@ def get_tube_TEMA(NPS=None, BWG=None, Do=None, Di=None, tmin=None):
     elif NPS:
         BWG = TEMA_tubing[NPS][0] # Pick the first listed size
         Do = 0.0254*NPS
-        t = BWG_SI[BWG_integers.index(BWG)]
+        t = BWG_SI[BWG_gauges.index(BWG)]
         Di = Do-2*t
     else:
         raise ValueError("Insufficient information provided")

requirements.txt

@@ -1,2 +1,2 @@
-fluids>=1.1.0
+fluids>=1.2.0
 scipy>=1.6.0

requirements_docs.txt

@@ -25,4 +25,4 @@ jacobi
 numdifftools
 mpmath
 pandas
-fluids>=1.1.0
+fluids>=1.2.0

requirements_test.txt

@@ -13,7 +13,7 @@ IPython
 sphinx
 wheel
 mpmath
-fluids>=1.1.0
+fluids>=1.2.0
 matplotlib
 ruff
 mypy

requirements_test_multiarch.txt

@@ -1,10 +1,11 @@
 pytest
+pytest-cov
 sympy
-fuzzywuzzy
+thefuzz
 pint
 pytz
 IPython
 sphinx
 wheel
 mpmath
-fluids>=1.1.0
+fluids>=1.2.0