nucleic · MatthieuDartiailh · Sep 3, 2024 · Aug 7, 2024 · Aug 7, 2024 · Aug 7, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -78,16 +78,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12-dev', 'pypy-3.7', 'pypy-3.8']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13-dev', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10']
         exclude:
-          - python-version: '3.7'
-            os: macos-latest
           - python-version: '3.8'
             os: macos-latest
           - python-version: '3.9'
             os: macos-latest
-          - python-version: 'pypy-3.7'
-            os: macos-latest
           - python-version: 'pypy-3.8'
             os: macos-latest
     steps:
@@ -106,7 +102,6 @@ jobs:
       - name: Install project
         env:
           CPPFLAGS: --coverage
-          KIWI_DISABLE_FH4: 1
         run: |
           pip install .
       - name: Test with pytest

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -103,11 +103,16 @@ jobs:
       - name: Build wheels
         if: matrix.manylinux_version == 'manylinux1'
         env:
-          CIBW_BEFORE_BUILD_WINDOWS: >-
-            pip install delvewheel
-          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >-
-            delvewheel repair -w {dest_dir} {wheel}
-          CIBW_BUILD: "cp37-* cp38-*"
+          # On Windows, we explicitly request MSVC compilers (as GitHub Action runners have
+          # MinGW on PATH that would be picked otherwise), switch to a static build for
+          # runtimes, but use dynamic linking for `VCRUNTIME140.dll`, `VCRUNTIME140_1.dll`,
+          # and the UCRT. This avoids requiring specific versions of `MSVCP140.dll`, while
+          # keeping shared state with the rest of the Python process/extensions.
+          CIBW_CONFIG_SETTINGS_WINDOWS: >-
+            setup-args="--vsenv"
+            setup-args="-Db_vscrt=mt"
+            setup-args="-Dcpp_link_args=['ucrt.lib','vcruntime.lib','/nodefaultlib:libucrt.lib','/nodefaultlib:libvcruntime.lib']"
+          CIBW_BUILD: "cp38-*"
           CIBW_ARCHS_MACOS: x86_64 universal2 arm64
           CIBW_ARCHS_LINUX: ${{ matrix.archs }}
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
@@ -119,11 +124,16 @@ jobs:
       - name: Build wheels
         if: matrix.manylinux_version == 'manylinux2010'
         env:
-          CIBW_BEFORE_BUILD_WINDOWS: >-
-            pip install delvewheel
-          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >-
-            delvewheel repair -w {dest_dir} {wheel}
-          CIBW_BUILD: "cp39-* cp310-* pp37-* pp38-*"
+          # On Windows, we explicitly request MSVC compilers (as GitHub Action runners have
+          # MinGW on PATH that would be picked otherwise), switch to a static build for
+          # runtimes, but use dynamic linking for `VCRUNTIME140.dll`, `VCRUNTIME140_1.dll`,
+          # and the UCRT. This avoids requiring specific versions of `MSVCP140.dll`, while
+          # keeping shared state with the rest of the Python process/extensions.
+          CIBW_CONFIG_SETTINGS_WINDOWS: >-
+            setup-args="--vsenv"
+            setup-args="-Db_vscrt=mt"
+            setup-args="-Dcpp_link_args=['ucrt.lib','vcruntime.lib','/nodefaultlib:libucrt.lib','/nodefaultlib:libvcruntime.lib']"
+          CIBW_BUILD: "cp39-* cp310-* pp38-*"
           CIBW_ARCHS_MACOS: x86_64 universal2 arm64
           CIBW_ARCHS_LINUX: ${{ matrix.archs }}
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010
@@ -135,11 +145,16 @@ jobs:
       - name: Build wheels
         if: matrix.manylinux_version == 'manylinux2014'
         env:
-          CIBW_BEFORE_BUILD_WINDOWS: >-
-            pip install delvewheel
-          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >-
-            delvewheel repair -w {dest_dir} {wheel}
-          CIBW_BUILD: "cp312-* cp311-* pp39-* pp310-*"
+          # On Windows, we explicitly request MSVC compilers (as GitHub Action runners have
+          # MinGW on PATH that would be picked otherwise), switch to a static build for
+          # runtimes, but use dynamic linking for `VCRUNTIME140.dll`, `VCRUNTIME140_1.dll`,
+          # and the UCRT. This avoids requiring specific versions of `MSVCP140.dll`, while
+          # keeping shared state with the rest of the Python process/extensions.
+          CIBW_CONFIG_SETTINGS_WINDOWS: >-
+            setup-args="--vsenv"
+            setup-args="-Db_vscrt=mt"
+            setup-args="-Dcpp_link_args=['ucrt.lib','vcruntime.lib','/nodefaultlib:libucrt.lib','/nodefaultlib:libvcruntime.lib']"
+          CIBW_BUILD: "cp312-* cp311-* pp39-*"
           CIBW_ARCHS_MACOS: x86_64 universal2 arm64
           CIBW_ARCHS_LINUX: ${{ matrix.archs }}
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
@@ -151,16 +166,16 @@ jobs:
       - name: Build wheels
         if: runner.os == 'Windows' && matrix.archs != 'auto'
         env:
-          CIBW_BEFORE_BUILD_WINDOWS: >-
-            pip install delvewheel
-          # To find the path to add I used this line within the REPAIR_WHEEL_COMMAND below:
-          # tree "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\" &
-          #
-          # Slightly weary of all the magic numbers/build numbers in the path being fragile for the future.
-          # However, unsure if there is a more stable way to achieve the same end here.
-          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >-
-            delvewheel repair -w {dest_dir} {wheel} --add-path "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\14.40.33807\arm64\Microsoft.VC143.CRT"
-          CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*"
+          # On Windows, we explicitly request MSVC compilers (as GitHub Action runners have
+          # MinGW on PATH that would be picked otherwise), switch to a static build for
+          # runtimes, but use dynamic linking for `VCRUNTIME140.dll`, `VCRUNTIME140_1.dll`,
+          # and the UCRT. This avoids requiring specific versions of `MSVCP140.dll`, while
+          # keeping shared state with the rest of the Python process/extensions.
+          CIBW_CONFIG_SETTINGS_WINDOWS: >-
+            setup-args="--vsenv"
+            setup-args="-Db_vscrt=mt"
+            setup-args="-Dcpp_link_args=['ucrt.lib','vcruntime.lib','/nodefaultlib:libucrt.lib','/nodefaultlib:libvcruntime.lib']"
+          CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* cp313-*"
           CIBW_ARCHS_WINDOWS: ${{ matrix.archs }}
           # It is not yet possible to run ARM64 tests, only cross-compile them.
           CIBW_TEST_SKIP: "*-win_arm64"

diff --git a/LICENSE b/LICENSE
@@ -4,7 +4,7 @@
 Kiwi is licensed under the terms of the Modified BSD License (also known as
 New or Revised BSD), as follows:
 
-Copyright (c) 2013, Nucleic Development Team
+Copyright (c) 2013-2024, Nucleic Development Team
 
 All rights reserved.
 
@@ -63,7 +63,7 @@ With this in mind, the following banner should be used in any source code file
 to indicate the copyright and license terms:
 
 #------------------------------------------------------------------------------
-# Copyright (c) 2013, Nucleic Development Team.
+# Copyright (c) 2013-2024, Nucleic Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #

diff --git a/benchmarks/enaml_like_benchmark.cpp b/benchmarks/enaml_like_benchmark.cpp
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2020, Nucleic Development Team.
+| Copyright (c) 2020-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/benchmarks/enaml_like_benchmark.py b/benchmarks/enaml_like_benchmark.py
@@ -1,5 +1,5 @@
 # --------------------------------------------------------------------------------------
-# Copyright (c) 2019, Nucleic Development Team.
+# Copyright (c) 2019-2024, Nucleic Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -22,7 +22,7 @@
 # -- Project information -----------------------------------------------------
 
 project = "kiwisolver"
-copyright = "2018-2021, Nucleic team"
+copyright = "2018-2024, Nucleic team"
 author = "Nucleic team"
 
 # The short X.Y version

diff --git a/kiwi/constraint.h b/kiwi/constraint.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/debug.h b/kiwi/debug.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/errors.h b/kiwi/errors.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/expression.h b/kiwi/expression.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/kiwi.h b/kiwi/kiwi.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/maptype.h b/kiwi/maptype.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2019, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/row.h b/kiwi/row.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/shareddata.h b/kiwi/shareddata.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |
@@ -33,7 +33,7 @@ class SharedData
     int m_refcount;
 
     SharedData &operator=(const SharedData &other) = delete;
-    
+
     SharedData &operator=(SharedData&& other) = delete;
 };
 

diff --git a/kiwi/solver.h b/kiwi/solver.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/solverimpl.h b/kiwi/solverimpl.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/strength.h b/kiwi/strength.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/symbol.h b/kiwi/symbol.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/symbolics.h b/kiwi/symbolics.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/term.h b/kiwi/term.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/util.h b/kiwi/util.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/variable.h b/kiwi/variable.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2017, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/kiwi/version.h b/kiwi/version.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2022, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/py/kiwisolver/__init__.py b/py/kiwisolver/__init__.py
@@ -1,5 +1,5 @@
 # --------------------------------------------------------------------------------------
-# Copyright (c) 2013-2022, Nucleic Development Team.
+# Copyright (c) 2013-2024, Nucleic Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #

diff --git a/py/kiwisolver/_cext.pyi b/py/kiwisolver/_cext.pyi
@@ -1,5 +1,5 @@
 # --------------------------------------------------------------------------------------
-# Copyright (c) 2021, Nucleic Development Team.
+# Copyright (c) 2021-2024, Nucleic Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #

diff --git a/py/kiwisolver/exceptions.py b/py/kiwisolver/exceptions.py
@@ -1,5 +1,5 @@
 # --------------------------------------------------------------------------------------
-# Copyright (c) 2023, Nucleic Development Team.
+# Copyright (c) 2023-2024, Nucleic Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #

diff --git a/py/src/constraint.cpp b/py/src/constraint.cpp
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2019, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/py/src/expression.cpp b/py/src/expression.cpp
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2019, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/py/src/kiwisolver.cpp b/py/src/kiwisolver.cpp
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2021, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/py/src/solver.cpp b/py/src/solver.cpp
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2019, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/py/src/strength.cpp b/py/src/strength.cpp
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2019, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/py/src/symbolics.h b/py/src/symbolics.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2019, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/py/src/term.cpp b/py/src/term.cpp
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2019, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/py/src/types.h b/py/src/types.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2019, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/py/src/util.h b/py/src/util.h
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2019, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/py/src/variable.cpp b/py/src/variable.cpp
@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2013-2019, Nucleic Development Team.
+| Copyright (c) 2013-2024, Nucleic Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |

diff --git a/py/tests/test_constraint.py b/py/tests/test_constraint.py
@@ -1,5 +1,5 @@
 # --------------------------------------------------------------------------------------
-# Copyright (c) 2014-2021, Nucleic Development Team.
+# Copyright (c) 2014-2024,, Nucleic Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #

diff --git a/py/tests/test_expression.py b/py/tests/test_expression.py
@@ -1,5 +1,5 @@
 # --------------------------------------------------------------------------------------
-# Copyright (c) 2014-2021, Nucleic Development Team.
+# Copyright (c) 2014-2024,, Nucleic Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #

diff --git a/py/tests/test_solver.py b/py/tests/test_solver.py
@@ -1,5 +1,5 @@
 # --------------------------------------------------------------------------------------
-# Copyright (c) 2014-2022, Nucleic Development Team.
+# Copyright (c) 2014-2024,, Nucleic Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #