From 9b718d9d30f643d9032bd96c06d2aad69c75118e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 17 Feb 2025 12:32:56 -0600 Subject: [PATCH 1/9] Update to 0.14.0 --- .ci_support/migrations/libflint31.yaml | 8 + down_them_all.sh | 31 +- recipe/UPSTREAM_LICENSES.txt | 379 +++++------------- recipe/bld.bat | 4 +- recipe/meta.yaml | 21 +- recipe/patches/0001-cython-3.1-fixes.patch | 57 --- .../patches/0002-Another-cython-3.1-fix.patch | 27 -- .../patches/0003-freethreading-support.patch | 81 ---- 8 files changed, 142 insertions(+), 466 deletions(-) create mode 100644 .ci_support/migrations/libflint31.yaml mode change 100644 => 100755 down_them_all.sh delete mode 100644 recipe/patches/0001-cython-3.1-fixes.patch delete mode 100644 recipe/patches/0002-Another-cython-3.1-fix.patch delete mode 100644 recipe/patches/0003-freethreading-support.patch diff --git a/.ci_support/migrations/libflint31.yaml b/.ci_support/migrations/libflint31.yaml new file mode 100644 index 0000000..6448761 --- /dev/null +++ b/.ci_support/migrations/libflint31.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libflint 3.1 + kind: version + migration_number: 1 +libflint: +- '3.1' +migrator_ts: 1724552377.9154313 diff --git a/down_them_all.sh b/down_them_all.sh old mode 100644 new mode 100755 index 3d4a15d..e5c4a79 --- a/down_them_all.sh +++ b/down_them_all.sh @@ -12,44 +12,43 @@ if [[ "$1" == "" ]]; then fi declare -a arr=( - "-cp38-cp38-macosx_10_9_x86_64.whl" - "-cp39-cp39-macosx_10_9_x86_64.whl" - "-cp310-cp310-macosx_10_9_x86_64.whl" - "-cp311-cp311-macosx_10_9_x86_64.whl" - "-cp312-cp312-macosx_10_9_x86_64.whl" - "-cp38-cp38-macosx_11_0_arm64.whl" + "-cp39-cp39-macosx_10_13_x86_64.whl" + "-cp310-cp310-macosx_10_13_x86_64.whl" + "-cp311-cp311-macosx_10_13_x86_64.whl" + "-cp312-cp312-macosx_10_13_x86_64.whl" + "-cp313-cp313-macosx_10_13_x86_64.whl" + "-cp313-cp313t-macosx_10_13_x86_64.whl" "-cp39-cp39-macosx_11_0_arm64.whl" "-cp310-cp310-macosx_11_0_arm64.whl" "-cp311-cp311-macosx_11_0_arm64.whl" "-cp312-cp312-macosx_11_0_arm64.whl" - "-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + "-cp313-cp313-macosx_11_0_arm64.whl" + "-cp313-cp313t-macosx_11_0_arm64.whl" "-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" - "-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + "-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + "-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" - "-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" + "-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + "-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" "-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" "-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" "-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" - "-cp38-cp38-win_amd64.whl" + "-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" + "-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" "-cp39-cp39-win_amd64.whl" "-cp310-cp310-win_amd64.whl" "-cp311-cp311-win_amd64.whl" "-cp312-cp312-win_amd64.whl" - "-pp39-pypy39_pp73-macosx_10_9_x86_64.whl" - "-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" - "-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" - "-pp39-pypy39_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" + "-cp313-cp313-win_amd64.whl" ".tar.gz") for whl_file in "${arr[@]}" do curl -L -O https://github.com/symengine/symengine-wheels/releases/download/v${version}${version_post}/symengine-${version}${whl_file}; done - - diff --git a/recipe/UPSTREAM_LICENSES.txt b/recipe/UPSTREAM_LICENSES.txt index f62b575..30c55f3 100644 --- a/recipe/UPSTREAM_LICENSES.txt +++ b/recipe/UPSTREAM_LICENSES.txt @@ -19,19 +19,6 @@ or or both in parallel -================================MPIR======================================= - -Copyright 1991, 1996, 1999, 2000 Free Software Foundation, Inc. - -Copyright 2008, 2009 William Hart - -This file is part of the MPIR Library. - -The MPIR Library is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation; either version 3 of the License, or (at your -option) any later version. - ================================MPFR====================================== Copyright 2000-2020 Free Software Foundation, Inc. @@ -73,20 +60,8 @@ which is itself based on the GNU MP library (http://gmplib.org/). FLINT (Fast Library for Number Theory) is a C library in support of computations in number theory. It's also a research project into algorithms in number theory. -FLINT 2 is a complete rewrite of the FLINT library from scratch. It includes -much cleaner code and in many cases much faster algorithms and implementations. - -At this stage FLINT consists mainly of fast integer and polynomial -arithmetic and linear algebra. In the future it is planned that FLINT will -contain algorithms for algebraic number theory and other number theoretic -functionality. - -William Hart -- 16 Jan 2011. - -License -------- -This version is distributed under LGPL 2.1 (GNU Lesser General Public License). -See the LICENSE file. +FLINT is distributed under LGPL (GNU Lesser General Public License) version 3 or +later. See the COPYING.LESSER and COPYING files. ===============================LLVM============================================ @@ -318,259 +293,119 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -=============================PTHREADS-WIN32================================ - - pthreads-win32 - a POSIX threads library for Microsoft Windows - - - -This file is Copyrighted - ------------------------- - - - This file is covered under the following Copyright: - - - Copyright (C) 2001 Ross P. Johnson - - All rights reserved. - - - Everyone is permitted to copy and distribute verbatim copies - - of this license document, but changing it is not allowed. - - -Pthreads-win32 is covered by the GNU Lesser General Public License - ------------------------------------------------------------------- - - - Pthreads-win32 is open software; you can redistribute it and/or - - modify it under the terms of the GNU Lesser General Public License - - as published by the Free Software Foundation version 2.1 of the - - License. - - - Pthreads-win32 is several binary link libraries, several modules, - - associated interface definition files and scripts used to control - - its compilation and installation. - - - Pthreads-win32 is distributed in the hope that it will be useful, - - but WITHOUT ANY WARRANTY; without even the implied warranty of - - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - - GNU Lesser General Public License for more details. - - - A copy of the GNU Lesser General Public License is distributed with - - pthreads-win32 under the filename: - - - COPYING.LIB - - - You should have received a copy of the version 2.1 GNU Lesser General - - Public License with pthreads-win32; if not, write to: - - - Free Software Foundation, Inc. - - 59 Temple Place - - Suite 330 - - Boston, MA 02111-1307 - - USA - - - The contact addresses for pthreads-win32 is as follows: - - - Web: http://sources.redhat.com/pthreads-win32 - - Email: Ross Johnson , or - - Ross.Johnson@canberra.edu.au - - - -pthreads-win32 copyrights and exception files - ---------------------------------------------- - - - With the exception of the files listed below, Pthreads-win32 - - is covered under the following GNU Lesser General Public License - - Copyrights: - - - Pthreads-win32 - POSIX Threads Library for Win32 - - Copyright(C) 1998 John E. Bossom - - Copyright(C) 1999,2002 Pthreads-win32 contributors - - - The current list of contributors is contained - - in the file CONTRIBUTORS included with the source - - code distribution. The current list of CONTRIBUTORS - - can also be seen at the following WWW location: +=============================WINPTHREADS================================ - http://sources.redhat.com/pthreads-win32/contributors.html +Copyright (c) 2011 mingw-w64 project +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: - Contact Email: rpj@ise.canberra.edu.au - - - These files are not covered under one of the Copyrights listed above: - - - COPYING - - COPYING.LIB - - tests/rwlock7.c - - - This file, COPYING, is distributed under the Copyright found at the - - top of this file. It is important to note that you may distribute - - verbatim copies of this file but you may not modify this file. - - - The file COPYING.LIB, which contains a copy of the version 2.1 - - GNU Lesser General Public License, is itself copyrighted by the - - Free Software Foundation, Inc. Please note that the Free Software - - Foundation, Inc. does NOT have a copyright over Pthreads-win32, - - only the COPYING.LIB that is supplied with pthreads-win32. - - - The file tests/rwlock7.c is derived from code written by - - Dave Butenhof for his book 'Programming With POSIX(R) Threads'. - - The original code was obtained by free download from his website - - http://home.earthlink.net/~anneart/family/Threads/source.html - - and did not contain a copyright or author notice. It is assumed to - - be freely distributable. - - - In all cases one may use and distribute these exception files freely. - - And because one may freely distribute the LGPL covered files, the - - entire pthreads-win32 source may be freely used and distributed. - - - - -General Copyleft and License info - ---------------------------------- - - - For general information on Copylefts, see: - - - http://www.gnu.org/copyleft/ - - - For information on GNU Lesser General Public Licenses, see: - - - http://www.gnu.org/copyleft/lesser.html - - http://www.gnu.org/copyleft/lesser.txt - - - -Why pthreads-win32 did not use the GNU General Public License - -------------------------------------------------------------- - - - The goal of the pthreads-win32 project has been to - - provide a quality and complete implementation of the POSIX - - threads API for Microsoft Windows within the limits imposed - - by virtue of it being a stand-alone library and not - - linked directly to other POSIX compliant libraries. For - - example, some functions and features, such as those based - - on POSIX signals, are missing. - - - Pthreads-win32 is a library, available in several different - - versions depending on supported compilers, and may be used - - as a dynamically linked module or a statically linked set of - - binary modules. It is not an application on it's own. - - - It was fully intended that pthreads-win32 be usable with - - commercial software not covered by either the GPL or the LGPL - - licenses. Pthreads-win32 has many contributors to it's - - code base, many of whom have done so because they have - - used the library in commercial or proprietry software - - projects. - - - Releasing pthreads-win32 under the LGPL ensures that the - - library can be used widely, while at the same time ensures - - that bug fixes and improvements to the pthreads-win32 code - - itself is returned to benefit all current and future users +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. - of the library. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + + +/* + * Parts of this library are derived by: + * + * Posix Threads library for Microsoft Windows + * + * Use at own risk, there is no implied warranty to this code. + * It uses undocumented features of Microsoft Windows that can change + * at any time in the future. + * + * (C) 2010 Lockless Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * + * * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of Lockless Inc. nor the names of its contributors may be + * used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AN + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ +=============================ZSTD==================================== + +BSD License + +For Zstandard software + +Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the name Facebook, nor Meta, nor the names of its contributors may + be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +=============================ZLIB==================================== - Although pthreads-win32 makes it possible for applications +Copyright notice: - that use POSIX threads to be ported to Win32 platforms, the + (C) 1995-2024 Jean-loup Gailly and Mark Adler - broader goal of the project is to encourage the use of open + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - standards, and in particular, to make it just a little easier + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - for developers writing Win32 applications to consider + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. - widening the potential market for their products. + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu diff --git a/recipe/bld.bat b/recipe/bld.bat index 2eac89f..9fe26cf 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -41,8 +41,8 @@ set dep_dir=%LIBRARY_BIN% %dep_dir%\mpir.dll ^ %dep_dir%\mpfr.dll ^ %dep_dir%\mpc.dll ^ - %dep_dir%\flint-18.dll ^ - %dep_dir%\pthreadVSE2.dll ^ + %dep_dir%\flint-19.dll ^ + %dep_dir%\libwinpthread-1.dll ^ %dep_dir%\zstd.dll ^ %dep_dir%\zlib.dll if errorlevel 1 exit 1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d41c73b..32b23fe 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ -{% set version = "0.13.0" %} -{% set cxx_version = "0.13.0" %} +{% set version = "0.14.0" %} +{% set cxx_version = "0.14.0" %} package: name: symengine-wheels @@ -7,15 +7,11 @@ package: source: - url: https://github.com/symengine/symengine.py/releases/download/v{{ version }}/symengine.py-{{ version }}.tar.gz - sha256: fa48beb9b8d4574482edf19dc8671d4cb78f53c2511047a0e52bb88fbdeb6d0c + sha256: 38e742a9b3d03b36f07b2ccba39e7e3d626e37557c26bb03ce575b95cfbd9cc4 folder: python - patches: - - patches/0001-cython-3.1-fixes.patch - - patches/0002-Another-cython-3.1-fix.patch - - patches/0003-freethreading-support.patch - url: https://github.com/symengine/symengine/releases/download/v{{ cxx_version }}/symengine-{{ cxx_version }}.tar.gz - sha256: f46bcf037529cd1a422369327bf360ad4c7d2b02d0f607a62a5b09c74a55bb59 + sha256: 11c5f64e9eec998152437f288b8429ec001168277d55f3f5f1df78e3cf129707 folder: cxx build: @@ -47,13 +43,16 @@ requirements: - m2-unzip # [win] - cython >=0.29.24 host: - - gmp # [unix] - - mpir # [win] + - gmp - mpfr - mpc - - libflint 3.0.* + - libflint + - winpthreads-devel # [win] - llvmdev <17 + # for llvm - zlib + # for llvm + - zstd - python - setuptools - cython >=0.29.24 # [build_platform == target_platform] diff --git a/recipe/patches/0001-cython-3.1-fixes.patch b/recipe/patches/0001-cython-3.1-fixes.patch deleted file mode 100644 index 33d5f39..0000000 --- a/recipe/patches/0001-cython-3.1-fixes.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 1e47d959c4edd9c15e1f893a570e4b0082a39501 Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Sun, 29 Sep 2024 16:25:26 -0500 -Subject: [PATCH 1/3] cython 3.1 fixes - ---- - cmake/cython_test.pyx | 3 --- - symengine/lib/symengine_wrapper.in.pyx | 8 ++++---- - 2 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/cmake/cython_test.pyx b/cmake/cython_test.pyx -index 22cdb17..cb803c6 100644 ---- a/cmake/cython_test.pyx -+++ b/cmake/cython_test.pyx -@@ -1,6 +1,3 @@ --# Test that numpy works in Cython: --from numpy cimport ndarray -- - # Test that libcpp module is present: - from libcpp.vector cimport vector - from libcpp.string cimport string -diff --git a/symengine/lib/symengine_wrapper.in.pyx b/symengine/lib/symengine_wrapper.in.pyx -index 8bb9f9c..26c31ad 100644 ---- a/symengine/lib/symengine_wrapper.in.pyx -+++ b/symengine/lib/symengine_wrapper.in.pyx -@@ -5135,24 +5135,24 @@ cdef class _Lambdify(object): - return result - - --cdef double _scipy_callback_lambda_real(int n, double *x, void *user_data) nogil: -+cdef double _scipy_callback_lambda_real(int n, double *x, void *user_data) noexcept nogil: - cdef symengine.LambdaRealDoubleVisitor* lamb = user_data - cdef double result - deref(lamb).call(&result, x) - return result - --cdef void _ctypes_callback_lambda_real(double *output, const double *input, void *user_data) nogil: -+cdef void _ctypes_callback_lambda_real(double *output, const double *input, void *user_data) noexcept nogil: - cdef symengine.LambdaRealDoubleVisitor* lamb = user_data - deref(lamb).call(output, input) - - IF HAVE_SYMENGINE_LLVM: -- cdef double _scipy_callback_llvm_real(int n, double *x, void *user_data) nogil: -+ cdef double _scipy_callback_llvm_real(int n, double *x, void *user_data) noexcept nogil: - cdef symengine.LLVMDoubleVisitor* lamb = user_data - cdef double result - deref(lamb).call(&result, x) - return result - -- cdef void _ctypes_callback_llvm_real(double *output, const double *input, void *user_data) nogil: -+ cdef void _ctypes_callback_llvm_real(double *output, const double *input, void *user_data) noexcept nogil: - cdef symengine.LLVMDoubleVisitor* lamb = user_data - deref(lamb).call(output, input) - --- -2.44.0 - diff --git a/recipe/patches/0002-Another-cython-3.1-fix.patch b/recipe/patches/0002-Another-cython-3.1-fix.patch deleted file mode 100644 index 565fd9a..0000000 --- a/recipe/patches/0002-Another-cython-3.1-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 845168d3683f28781b32577abf4f38ed93f0bc79 Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Mon, 30 Sep 2024 11:38:54 -0500 -Subject: [PATCH 2/3] Another cython 3.1 fix - ---- - cmake/cython_test.pyx | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/cython_test.pyx b/cmake/cython_test.pyx -index cb803c6..47f9847 100644 ---- a/cmake/cython_test.pyx -+++ b/cmake/cython_test.pyx -@@ -75,8 +75,8 @@ cdef extern from "" namespace "SymEngine": - string get_name() nogil - - cdef extern from "" namespace "SymEngine": -- cdef RCP[Basic] add(RCP[Basic] &a, RCP[Basic] &b) nogil except+ -- cdef RCP[Basic] sub(RCP[Basic] &a, RCP[Basic] &b) nogil except+ -+ cdef RCP[Basic] add(RCP[Basic] &a, RCP[Basic] &b) except+ nogil -+ cdef RCP[Basic] sub(RCP[Basic] &a, RCP[Basic] &b) except+ nogil - - cdef cppclass Add(Basic): - void as_two_terms(const Ptr[RCP[Basic]] &a, const Ptr[RCP[Basic]] &b) --- -2.44.0 - diff --git a/recipe/patches/0003-freethreading-support.patch b/recipe/patches/0003-freethreading-support.patch deleted file mode 100644 index 72cd0c3..0000000 --- a/recipe/patches/0003-freethreading-support.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 170e7ded46b60ee43ec1e6ee997fd95205cad2f4 Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Mon, 30 Sep 2024 11:39:06 -0500 -Subject: [PATCH 3/3] freethreading support - ---- - cmake/FindPython.cmake | 32 +++++++++++++++++++++++--------- - 1 file changed, 23 insertions(+), 9 deletions(-) - -diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake -index f338132..2f54f50 100644 ---- a/cmake/FindPython.cmake -+++ b/cmake/FindPython.cmake -@@ -22,26 +22,36 @@ execute_process( - string(STRIP ${PYTHON_LIB_PATH} PYTHON_LIB_PATH) - - execute_process( -- COMMAND ${PYTHON_BIN} -c "import sys; print(sys.prefix)" -- OUTPUT_VARIABLE PYTHON_PREFIX_PATH -- ) -+ COMMAND ${PYTHON_BIN} -c "import sys; print(sys.prefix)" -+ OUTPUT_VARIABLE PYTHON_PREFIX_PATH -+) - - string(STRIP ${PYTHON_PREFIX_PATH} PYTHON_PREFIX_PATH) - - execute_process( -- COMMAND ${PYTHON_BIN} -c "import sys; print('%s.%s' % sys.version_info[:2])" -+ COMMAND ${PYTHON_BIN} -c "import sys; print('%s.%s' % sys.version_info[:2])" - OUTPUT_VARIABLE PYTHON_VERSION -- ) -+) - string(STRIP ${PYTHON_VERSION} PYTHON_VERSION) - message(STATUS "Python version: ${PYTHON_VERSION}") - - string(REPLACE "." "" PYTHON_VERSION_WITHOUT_DOTS ${PYTHON_VERSION}) - -+execute_process( -+ COMMAND ${PYTHON_BIN} -c "import sysconfig;print(bool(sysconfig.get_config_var('Py_GIL_DISABLED')))" -+ OUTPUT_VARIABLE PY_GIL_DISABLED -+) -+string(STRIP ${PY_GIL_DISABLED} PY_GIL_DISABLED) -+ -+if ("${PY_GIL_DISABLED}" STREQUAL "True") -+ set (PY_THREAD "t") -+endif() -+ - if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - FIND_LIBRARY(PYTHON_LIBRARY NAMES -- python${PYTHON_VERSION} -+ python${PYTHON_VERSION}${PY_THREAD} - python${PYTHON_VERSION}m -- python${PYTHON_VERSION_WITHOUT_DOTS} -+ python${PYTHON_VERSION_WITHOUT_DOTS}${PY_THREAD} - PATHS ${PYTHON_LIB_PATH} ${PYTHON_PREFIX_PATH}/lib ${PYTHON_PREFIX_PATH}/libs - PATH_SUFFIXES ${CMAKE_LIBRARY_ARCHITECTURE} - NO_DEFAULT_PATH -@@ -51,8 +61,8 @@ endif() - - execute_process( - COMMAND ${PYTHON_BIN} -c "from sysconfig import get_paths; print(get_paths()['purelib'])" -- OUTPUT_VARIABLE PYTHON_INSTALL_PATH_tmp -- ) -+ OUTPUT_VARIABLE PYTHON_INSTALL_PATH_tmp -+) - string(STRIP ${PYTHON_INSTALL_PATH_tmp} PYTHON_INSTALL_PATH_tmp) - set(PYTHON_INSTALL_PATH ${PYTHON_INSTALL_PATH_tmp} - CACHE BOOL "Python install path") -@@ -129,5 +139,9 @@ macro(ADD_PYTHON_LIBRARY name) - IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - target_link_libraries(${name} ${PYTHON_LIBRARY}) - set_target_properties(${name} PROPERTIES SUFFIX ".pyd") -+ IF("${PY_GIL_DISABLED}" STREQUAL "True") -+ target_compile_definitions(${name} PRIVATE Py_GIL_DISABLED=1) -+ ENDIF() - ENDIF() -+ - endmacro(ADD_PYTHON_LIBRARY) --- -2.44.0 - From 70efe6bba07afe1d2a5042467c671ab394938b42 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 17 Feb 2025 12:35:01 -0600 Subject: [PATCH 2/9] no llvm dylib --- recipe/bld.bat | 1 + recipe/build.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 9fe26cf..376b10a 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -18,6 +18,7 @@ cmake ^ -DBUILD_SHARED_LIBS=yes ^ -DMSVC_USE_MT=no ^ -DBUILD_SHARED_LIBS=no ^ + -DWITH_LLVM_DYLIB=no ^ .. if errorlevel 1 exit 1 diff --git a/recipe/build.sh b/recipe/build.sh index c64de4d..fd7052d 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -35,6 +35,7 @@ cmake ${CMAKE_ARGS} \ -DWITH_COTIRE=no \ -DBUILD_FOR_DISTRIBUTION=yes \ -DBUILD_SHARED_LIBS=no \ + -DWITH_LLVM_DYLIB=no \ .. make -j${CPU_COUNT} VERBOSE=1 From b026d86e5150b55af9ea5cd510d494e3f429a48f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 17 Feb 2025 13:27:45 -0600 Subject: [PATCH 3/9] fix win builds --- recipe/bld.bat | 2 ++ recipe/meta.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 376b10a..36571d6 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,3 +1,5 @@ +sed -i.bak "s/typedef int pid_t/typedef int pid2_t/g" %PREFIX%\include\pyconfig.h + cd cxx mkdir build diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 32b23fe..dcaef23 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,6 +41,7 @@ requirements: - setuptools # [build_platform != target_platform] - unzip # [unix] - m2-unzip # [win] + - m2-sed # [win] - cython >=0.29.24 host: - gmp From ac67d8ed4ff0ff8278148a4145cd5452682cef20 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 17 Feb 2025 13:55:51 -0600 Subject: [PATCH 4/9] fix dll names --- recipe/bld.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 36571d6..3366e94 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -41,9 +41,9 @@ if errorlevel 1 exit 1 set dep_dir=%LIBRARY_BIN% %PYTHON% %RECIPE_DIR%\fix_windows_wheel.py ^ - %dep_dir%\mpir.dll ^ - %dep_dir%\mpfr.dll ^ - %dep_dir%\mpc.dll ^ + %dep_dir%\libgmp-10.dll ^ + %dep_dir%\libmpfr-6.dll ^ + %dep_dir%\libmpc-3.dll ^ %dep_dir%\flint-19.dll ^ %dep_dir%\libwinpthread-1.dll ^ %dep_dir%\zstd.dll ^ From 20cf958ab56bdb2bf0915115456168a401e465aa Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 17 Feb 2025 14:16:54 -0600 Subject: [PATCH 5/9] rerender --- ...ngfalsenumpy1.21python3.8.____cpython.yaml | 10 ++-- ...gfalsenumpy1.22python3.10.____cpython.yaml | 10 ++-- ...ngfalsenumpy1.22python3.9.____cpython.yaml | 10 ++-- ...gfalsenumpy1.23python3.11.____cpython.yaml | 10 ++-- ...gfalsenumpy1.26python3.12.____cpython.yaml | 10 ++-- ...eadingfalsenumpy2python3.13.____cp313.yaml | 12 ++--- ...eadingtruenumpy2python3.13.____cp313t.yaml | 12 ++--- ...ngfalsenumpy1.21python3.8.____cpython.yaml | 12 ++--- ...gfalsenumpy1.22python3.10.____cpython.yaml | 12 ++--- ...ngfalsenumpy1.22python3.9.____cpython.yaml | 12 ++--- ...gfalsenumpy1.23python3.11.____cpython.yaml | 12 ++--- ...gfalsenumpy1.26python3.12.____cpython.yaml | 12 ++--- ...eadingfalsenumpy2python3.13.____cp313.yaml | 14 ++---- ...eadingtruenumpy2python3.13.____cp313t.yaml | 14 ++---- ...ngfalsenumpy1.21python3.8.____cpython.yaml | 8 +-- ...gfalsenumpy1.22python3.10.____cpython.yaml | 8 +-- ...ngfalsenumpy1.22python3.9.____cpython.yaml | 8 +-- ...gfalsenumpy1.23python3.11.____cpython.yaml | 8 +-- ...gfalsenumpy1.26python3.12.____cpython.yaml | 8 +-- ...eadingfalsenumpy2python3.13.____cp313.yaml | 10 ++-- ...eadingtruenumpy2python3.13.____cp313t.yaml | 10 ++-- .ci_support/migrations/python38.yaml | 2 + ...ngfalsenumpy1.21python3.8.____cpython.yaml | 8 +-- ...gfalsenumpy1.22python3.10.____cpython.yaml | 8 +-- ...ngfalsenumpy1.22python3.9.____cpython.yaml | 8 +-- ...gfalsenumpy1.23python3.11.____cpython.yaml | 8 +-- ...gfalsenumpy1.26python3.12.____cpython.yaml | 8 +-- ...eadingfalsenumpy2python3.13.____cp313.yaml | 10 ++-- ...eadingtruenumpy2python3.13.____cp313t.yaml | 10 ++-- ...ngfalsenumpy1.21python3.8.____cpython.yaml | 8 +-- ...gfalsenumpy1.22python3.10.____cpython.yaml | 8 +-- ...ngfalsenumpy1.22python3.9.____cpython.yaml | 8 +-- ...gfalsenumpy1.23python3.11.____cpython.yaml | 8 +-- ...gfalsenumpy1.26python3.12.____cpython.yaml | 8 +-- ...eadingfalsenumpy2python3.13.____cp313.yaml | 10 ++-- ...eadingtruenumpy2python3.13.____cp313t.yaml | 10 ++-- ...ngfalsenumpy1.21python3.8.____cpython.yaml | 4 +- ...gfalsenumpy1.22python3.10.____cpython.yaml | 4 +- ...ngfalsenumpy1.22python3.9.____cpython.yaml | 4 +- ...gfalsenumpy1.23python3.11.____cpython.yaml | 4 +- ...gfalsenumpy1.26python3.12.____cpython.yaml | 4 +- ...eadingfalsenumpy2python3.13.____cp313.yaml | 6 ++- ...eadingtruenumpy2python3.13.____cp313t.yaml | 6 ++- .github/workflows/conda-build.yml | 21 +++----- .gitignore | 3 ++ .scripts/build_steps.sh | 14 +++--- .scripts/run_osx_build.sh | 50 ++++++++++++------- .scripts/run_win_build.bat | 41 +++++++++++---- build-locally.py | 7 +++ 49 files changed, 283 insertions(+), 229 deletions(-) diff --git a/.ci_support/linux_64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml b/.ci_support/linux_64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml index f8af82d..9861769 100644 --- a/.ci_support/linux_64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -17,13 +17,13 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -39,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml index 903b33c..24283d9 100644 --- a/.ci_support/linux_64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -17,13 +17,13 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -39,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml index a2dc319..6f205ed 100644 --- a/.ci_support/linux_64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -17,13 +17,13 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -39,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml index 1d907ac..4ded9ee 100644 --- a/.ci_support/linux_64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -17,13 +17,13 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -39,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml index 725d0b1..7c15890 100644 --- a/.ci_support/linux_64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -17,13 +17,13 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -39,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml b/.ci_support/linux_64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml index 2164419..7da050a 100644 --- a/.ci_support/linux_64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml @@ -7,9 +7,9 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - isuruf test cxx_compiler: @@ -17,13 +17,13 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -39,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml b/.ci_support/linux_64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml index 0456296..7b546ba 100644 --- a/.ci_support/linux_64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml +++ b/.ci_support/linux_64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml @@ -7,9 +7,9 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: -- conda-forge/label/python_rc,conda-forge/label/cython_dev,conda-forge +- conda-forge/label/cython_dev,conda-forge channel_targets: - isuruf test cxx_compiler: @@ -17,13 +17,13 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 gmp: - '6' is_freethreading: - 'true' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -39,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml b/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml index e4c3d4c..ad40e43 100644 --- a/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,10 +6,8 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -27,7 +23,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -43,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml index 4489251..2f8b4f8 100644 --- a/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,10 +6,8 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -27,7 +23,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -43,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml index c1bef4a..9014c13 100644 --- a/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,10 +6,8 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -27,7 +23,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -43,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml index f479b2a..c595d41 100644 --- a/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,10 +6,8 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -27,7 +23,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -43,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml index 332ad26..71c4622 100644 --- a/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,10 +6,8 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -27,7 +23,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -43,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_aarch64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml b/.ci_support/linux_aarch64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml index fa5bf2a..8749741 100644 --- a/.ci_support/linux_aarch64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,12 +6,10 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: -- cos7 +- conda channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - isuruf test cxx_compiler: @@ -27,7 +23,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -43,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_aarch64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml b/.ci_support/linux_aarch64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml index 8057b30..65437d6 100644 --- a/.ci_support/linux_aarch64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml +++ b/.ci_support/linux_aarch64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_compiler: - gcc c_compiler_version: @@ -8,12 +6,10 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: -- cos7 +- conda channel_sources: -- conda-forge/label/python_rc,conda-forge/label/cython_dev,conda-forge +- conda-forge/label/cython_dev,conda-forge channel_targets: - isuruf test cxx_compiler: @@ -27,7 +23,7 @@ gmp: is_freethreading: - 'true' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -43,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml index 6939637..d8a4770 100644 --- a/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -23,7 +23,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -39,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml index 6765fdf..bc3df49 100644 --- a/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -23,7 +23,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -39,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml index 6486361..3070334 100644 --- a/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -23,7 +23,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -39,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml index b902047..4a2aa90 100644 --- a/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -23,7 +23,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -39,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml index 08e0c4c..132fb92 100644 --- a/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -23,7 +23,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -39,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy2python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy2python3.13.____cp313.yaml index ba72835..2a6eb70 100644 --- a/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_ppc64le_is_freethreadingfalsenumpy2python3.13.____cp313.yaml @@ -7,9 +7,9 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - isuruf test cxx_compiler: @@ -23,7 +23,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -39,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/linux_ppc64le_is_freethreadingtruenumpy2python3.13.____cp313t.yaml b/.ci_support/linux_ppc64le_is_freethreadingtruenumpy2python3.13.____cp313t.yaml index b1832f0..f498cd8 100644 --- a/.ci_support/linux_ppc64le_is_freethreadingtruenumpy2python3.13.____cp313t.yaml +++ b/.ci_support/linux_ppc64le_is_freethreadingtruenumpy2python3.13.____cp313t.yaml @@ -7,9 +7,9 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: -- conda-forge/label/python_rc,conda-forge/label/cython_dev,conda-forge +- conda-forge/label/cython_dev,conda-forge channel_targets: - isuruf test cxx_compiler: @@ -23,7 +23,7 @@ gmp: is_freethreading: - 'true' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -39,11 +39,11 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - channel_sources - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/migrations/python38.yaml b/.ci_support/migrations/python38.yaml index 43f28f9..81b041f 100644 --- a/.ci_support/migrations/python38.yaml +++ b/.ci_support/migrations/python38.yaml @@ -39,3 +39,5 @@ numpy: - 1.21 python_impl: - cpython +is_python_min: + - False diff --git a/.ci_support/osx_64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml b/.ci_support/osx_64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml index 24107ed..55ddcd6 100644 --- a/.ci_support/osx_64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' macos_machine: - x86_64-apple-darwin13.4.0 mpfr: @@ -47,3 +47,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/osx_64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml index b061128..daa4bcc 100644 --- a/.ci_support/osx_64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' macos_machine: - x86_64-apple-darwin13.4.0 mpfr: @@ -47,3 +47,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/osx_64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml index 461df25..4ff08f6 100644 --- a/.ci_support/osx_64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' macos_machine: - x86_64-apple-darwin13.4.0 mpfr: @@ -47,3 +47,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/osx_64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml index cc02368..efd1cd8 100644 --- a/.ci_support/osx_64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' macos_machine: - x86_64-apple-darwin13.4.0 mpfr: @@ -47,3 +47,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/osx_64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml index c482d91..48413c8 100644 --- a/.ci_support/osx_64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' macos_machine: - x86_64-apple-darwin13.4.0 mpfr: @@ -47,3 +47,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/osx_64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml b/.ci_support/osx_64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml index 7290556..0c73353 100644 --- a/.ci_support/osx_64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml @@ -5,25 +5,25 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - isuruf test cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' macos_machine: - x86_64-apple-darwin13.4.0 mpfr: @@ -47,3 +47,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/osx_64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml b/.ci_support/osx_64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml index a5960c2..208d8df 100644 --- a/.ci_support/osx_64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml +++ b/.ci_support/osx_64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml @@ -5,25 +5,25 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/python_rc,conda-forge/label/cython_dev,conda-forge +- conda-forge/label/cython_dev,conda-forge channel_targets: - isuruf test cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' gmp: - '6' is_freethreading: - 'true' libflint: -- '3.0' +- '3.1' macos_machine: - x86_64-apple-darwin13.4.0 mpfr: @@ -47,3 +47,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml b/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml index 987f55c..76557e0 100644 --- a/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' macos_machine: - arm64-apple-darwin20.0.0 mpfr: @@ -47,3 +47,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml index 2d6e3ab..bfc45eb 100644 --- a/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' macos_machine: - arm64-apple-darwin20.0.0 mpfr: @@ -47,3 +47,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml index ecd8385..c08a58c 100644 --- a/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' macos_machine: - arm64-apple-darwin20.0.0 mpfr: @@ -47,3 +47,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml index 4abe49b..4188d2e 100644 --- a/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' macos_machine: - arm64-apple-darwin20.0.0 mpfr: @@ -47,3 +47,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml index 9c58cf9..8532201 100644 --- a/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' macos_machine: - arm64-apple-darwin20.0.0 mpfr: @@ -47,3 +47,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/osx_arm64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml index 3b3cf3a..37c47c7 100644 --- a/.ci_support/osx_arm64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml @@ -5,25 +5,25 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - isuruf test cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' gmp: - '6' is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' macos_machine: - arm64-apple-darwin20.0.0 mpfr: @@ -47,3 +47,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/osx_arm64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml b/.ci_support/osx_arm64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml index da2915e..df5c842 100644 --- a/.ci_support/osx_arm64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml +++ b/.ci_support/osx_arm64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml @@ -5,25 +5,25 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge/label/cython_dev,conda-forge +- conda-forge/label/cython_dev,conda-forge channel_targets: - isuruf test cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' gmp: - '6' is_freethreading: - 'true' libflint: -- '3.0' +- '3.1' macos_machine: - arm64-apple-darwin20.0.0 mpfr: @@ -47,3 +47,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/win_64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml b/.ci_support/win_64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml index f9f6336..197c488 100644 --- a/.ci_support/win_64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml +++ b/.ci_support/win_64_is_freethreadingfalsenumpy1.21python3.8.____cpython.yaml @@ -13,7 +13,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -33,3 +33,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/win_64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml index cbed81e..fddfc4b 100644 --- a/.ci_support/win_64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_is_freethreadingfalsenumpy1.22python3.10.____cpython.yaml @@ -13,7 +13,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -33,3 +33,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/win_64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml index 4da4777..4b3d9c5 100644 --- a/.ci_support/win_64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_is_freethreadingfalsenumpy1.22python3.9.____cpython.yaml @@ -13,7 +13,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -33,3 +33,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/win_64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml index 2f111df..c739c61 100644 --- a/.ci_support/win_64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_is_freethreadingfalsenumpy1.23python3.11.____cpython.yaml @@ -13,7 +13,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -33,3 +33,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/win_64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml index 36e9000..3cecc6d 100644 --- a/.ci_support/win_64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_is_freethreadingfalsenumpy1.26python3.12.____cpython.yaml @@ -13,7 +13,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -33,3 +33,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/win_64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml b/.ci_support/win_64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml index f81348b..a7636a8 100644 --- a/.ci_support/win_64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml +++ b/.ci_support/win_64_is_freethreadingfalsenumpy2python3.13.____cp313.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - isuruf test cxx_compiler: @@ -13,7 +13,7 @@ gmp: is_freethreading: - 'false' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -33,3 +33,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.ci_support/win_64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml b/.ci_support/win_64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml index 63b978f..1b3990e 100644 --- a/.ci_support/win_64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml +++ b/.ci_support/win_64_is_freethreadingtruenumpy2python3.13.____cp313t.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge/label/cython_dev,conda-forge +- conda-forge/label/cython_dev,conda-forge channel_targets: - isuruf test cxx_compiler: @@ -13,7 +13,7 @@ gmp: is_freethreading: - 'true' libflint: -- '3.0' +- '3.1' mpfr: - '4' numpy: @@ -33,3 +33,5 @@ zip_keys: - is_freethreading zlib: - '1' +zstd: +- '1.5' diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 30518e9..944d9cb 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -25,37 +25,37 @@ jobs: UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_is_freethreadingfalsenumpy1.22python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_is_freethreadingfalsenumpy1.22python3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_is_freethreadingfalsenumpy1.23python3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_is_freethreadingfalsenumpy1.26python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_is_freethreadingfalsenumpy2python3.13.____cp313 UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_is_freethreadingtruenumpy2python3.13.____cp313t UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_aarch64_is_freethreadingfalsenumpy1.21python3.8.____cpython UPLOAD_PACKAGES: True os: ubuntu @@ -262,12 +262,6 @@ jobs: fi ./.scripts/run_osx_build.sh - - name: Install Miniconda for windows - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 - with: - miniforge-version: latest - if: matrix.os == 'windows' - - name: Build on windows shell: cmd run: | @@ -276,6 +270,7 @@ jobs: set "sha=%GITHUB_SHA%" call ".scripts\run_win_build.bat" env: + MINIFORGE_HOME: D:\Miniforge PYTHONUNBUFFERED: 1 CONFIG: ${{ matrix.CONFIG }} CI: github_actions diff --git a/.gitignore b/.gitignore index 179afe5..bb38536 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ /build_artifacts *.pyc + +# Rattler-build's artifacts are in `output` when not specifying anything. +/output diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 28096ec..352d052 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,13 +31,13 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -76,8 +76,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b9cecc2..8b83147 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -6,29 +6,41 @@ source .scripts/logging_utils.sh set -xe -MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} - -( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null - -MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" -curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" -rm -rf ${MINIFORGE_HOME} -bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} - -( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null +MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" +MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash +export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" + +( startgroup "Provisioning base env with micromamba" ) 2> /dev/null +MICROMAMBA_VERSION="1.5.10-0" +if [[ "$(uname -m)" == "arm64" ]]; then + osx_arch="osx-arm64" +else + osx_arch="osx-64" +fi +MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" +MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" +echo "Downloading micromamba ${MICROMAMBA_VERSION}" +micromamba_exe="$(mktemp -d)/micromamba" +curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" +chmod +x "${micromamba_exe}" +echo "Creating environment" +"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ + --channel conda-forge \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" +mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" +echo "Cleaning up micromamba" +rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true +( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null - -source ${MINIFORGE_HOME}/etc/profile.d/conda.sh +echo "Activating environment" +source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + @@ -88,8 +100,8 @@ else ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 2c9a688..f270dfb 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -3,30 +3,51 @@ :: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also :: benefit from the improvement. -:: Note: we assume a Miniforge installation is available - :: INPUTS (required environment variables) :: CONFIG: name of the .ci_support/*.yaml file for this job :: CI: azure, github_actions, or unset +:: MINIFORGE_HOME: where to install the base conda environment :: UPLOAD_PACKAGES: true or false :: UPLOAD_ON_BRANCH: true or false setlocal enableextensions enabledelayedexpansion +FOR %%A IN ("%~dp0.") DO SET "REPO_ROOT=%%~dpA" +if "%MINIFORGE_HOME%"=="" set "MINIFORGE_HOME=%USERPROFILE%\Miniforge3" +:: Remove trailing backslash, if present +if "%MINIFORGE_HOME:~-1%"=="\" set "MINIFORGE_HOME=%MINIFORGE_HOME:~0,-1%" +call :start_group "Provisioning base env with micromamba" +set "MAMBA_ROOT_PREFIX=%MINIFORGE_HOME%-micromamba-%RANDOM%" +set "MICROMAMBA_VERSION=1.5.10-0" +set "MICROMAMBA_URL=https://github.com/mamba-org/micromamba-releases/releases/download/%MICROMAMBA_VERSION%/micromamba-win-64" +set "MICROMAMBA_TMPDIR=%TMP%\micromamba-%RANDOM%" +set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" + +echo Downloading micromamba %MICROMAMBA_VERSION% +if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" +certutil -urlcache -split -f "%MICROMAMBA_URL%" "%MICROMAMBA_EXE%" +if !errorlevel! neq 0 exit /b !errorlevel! + +echo Creating environment +call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ + --channel conda-forge ^ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +if !errorlevel! neq 0 exit /b !errorlevel! +echo Removing %MAMBA_ROOT_PREFIX% +del /S /Q "%MAMBA_ROOT_PREFIX%" >nul +del /S /Q "%MICROMAMBA_TMPDIR%" >nul +call :end_group + call :start_group "Configuring conda" :: Activate the base conda environment -call activate base +echo Activating environment +call "%MINIFORGE_HOME%\Scripts\activate.bat" :: Configure the solver set "CONDA_SOLVER=libmamba" if !errorlevel! neq 0 exit /b !errorlevel! set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" -:: Provision the necessary dependencies to build the recipe later -echo Installing dependencies -mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes -if !errorlevel! neq 0 exit /b !errorlevel! - :: Set basic configuration echo Setting up configuration setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml @@ -59,8 +80,8 @@ conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTR if !errorlevel! neq 0 exit /b !errorlevel! call :start_group "Inspecting artifacts" -:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 -WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts --recipe-dir ".\recipe" -m .ci_support\%CONFIG%.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" call :end_group :: Prepare some environment variables for the upload step diff --git a/build-locally.py b/build-locally.py index 6788aea..c4a56c6 100755 --- a/build-locally.py +++ b/build-locally.py @@ -26,6 +26,13 @@ def setup_environment(ns): os.path.dirname(__file__), "miniforge3" ) + # The default cache location might not be writable using docker on macOS. + if ns.config.startswith("linux") and platform.system() == "Darwin": + os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( + os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") + + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" + ) + def run_docker_build(ns): script = ".scripts/run_docker_build.sh" From 057560f5d50989f3fdc239a936f835fa30047d10 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 17 Feb 2025 15:12:10 -0600 Subject: [PATCH 6/9] libgcc_s --- recipe/bld.bat | 11 ++++++----- recipe/fix_windows_wheel.py | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 3366e94..1882b7d 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -41,13 +41,14 @@ if errorlevel 1 exit 1 set dep_dir=%LIBRARY_BIN% %PYTHON% %RECIPE_DIR%\fix_windows_wheel.py ^ - %dep_dir%\libgmp-10.dll ^ - %dep_dir%\libmpfr-6.dll ^ - %dep_dir%\libmpc-3.dll ^ - %dep_dir%\flint-19.dll ^ + %dep_dir%\libgmp-*.dll ^ + %dep_dir%\libmpfr-*.dll ^ + %dep_dir%\libmpc-*.dll ^ + %dep_dir%\flint-*.dll ^ %dep_dir%\libwinpthread-1.dll ^ %dep_dir%\zstd.dll ^ - %dep_dir%\zlib.dll + %dep_dir%\zlib.dll ^ + %dep_dir%\libgcc_s_seh-1.dll if errorlevel 1 exit 1 mkdir %RECIPE_DIR%\..\build_artifacts diff --git a/recipe/fix_windows_wheel.py b/recipe/fix_windows_wheel.py index 4799d25..c92a39c 100644 --- a/recipe/fix_windows_wheel.py +++ b/recipe/fix_windows_wheel.py @@ -18,8 +18,9 @@ def add_library(lib_paths, dist_path='dist'): shutil.copy2(lib_path, pjoin('symengine', 'lib')) def main(): - args = list(sys.argv) - args.pop(0) + args = [sys.argv[1]] + for arg in sys.argv[2:]: + args.extend(glob(arg)) add_library(args) if __name__ == '__main__': From 60cbf1bf93c9c46f8e02fa88afe5fd5212c42317 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 17 Feb 2025 15:14:27 -0600 Subject: [PATCH 7/9] ignore zstd --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dcaef23..314a362 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,6 +23,7 @@ build: - libflint - llvmdev - zlib + - zstd - {{ compiler('c') }} - {{ compiler('cxx') }} - {{ stdlib('c') }} From 3fc66fd278793c78c2e3abfa5a66557e985dbe2f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 17 Feb 2025 15:52:48 -0600 Subject: [PATCH 8/9] debug --- recipe/fix_windows_wheel.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/fix_windows_wheel.py b/recipe/fix_windows_wheel.py index c92a39c..8fdc326 100644 --- a/recipe/fix_windows_wheel.py +++ b/recipe/fix_windows_wheel.py @@ -20,7 +20,10 @@ def add_library(lib_paths, dist_path='dist'): def main(): args = [sys.argv[1]] for arg in sys.argv[2:]: + print(arg, glob(arg)) args.extend(glob(arg)) + for arg in args: + print(arg) add_library(args) if __name__ == '__main__': From 1f598e2bf73b137196d38ef41210eb005a4567f5 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 17 Feb 2025 17:30:17 -0600 Subject: [PATCH 9/9] fix win wheel --- recipe/fix_windows_wheel.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/recipe/fix_windows_wheel.py b/recipe/fix_windows_wheel.py index 8fdc326..32d4b2b 100644 --- a/recipe/fix_windows_wheel.py +++ b/recipe/fix_windows_wheel.py @@ -18,12 +18,9 @@ def add_library(lib_paths, dist_path='dist'): shutil.copy2(lib_path, pjoin('symengine', 'lib')) def main(): - args = [sys.argv[1]] - for arg in sys.argv[2:]: - print(arg, glob(arg)) + args = [] + for arg in sys.argv[1:]: args.extend(glob(arg)) - for arg in args: - print(arg) add_library(args) if __name__ == '__main__':