Merge pull request #26755 from oscarbenjamin/pr_galois_resolvents

fix(polys): use delayed import for galois_resolvents
sympy · Jul 1, 2024 · 866f968 · 866f968
2 parents 040dbb3 + bf8c9df
commit 866f968
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 41 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ on:
       - '1.13'
 env:
   release_branch: '1.13'
-  release_version: '1.13.0rc3'
+  release_version: '1.13.0rc4'
   final_release_version: '1.13.0'
   previous_version: '1.12.1'
   dev_version: '1.14-dev'

diff --git a/.github/workflows/runtests.yml b/.github/workflows/runtests.yml
@@ -176,12 +176,9 @@ jobs:
                          'antlr4-python3-runtime==4.11.*'                 \
                          symengine                                        \
                          numba llvmlite pymc                              \
+                         gmpy2                                            \
                          #
 
-      # Not available in CPython 3.12 (yet).
-      - if: ${{ ! contains(matrix.python-version, '3.12') }}
-        run: pip install gmpy2
-
       # Test external imports
       - run: bin/test_external_imports.py
       - run: bin/test_submodule_imports.py
@@ -190,51 +187,20 @@ jobs:
       # Test modules with specific dependencies
       - run: bin/test_optional_dependencies.py
 
-  # -------------------- NumPy 2.0 job ----------------------------- #
-
-  numpy-prerelease:
-    needs: code-quality
-
-    runs-on: ubuntu-20.04
-
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
-
-    name: ${{ matrix.python-version }} NumPy Prerelease
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - run: pip install -r requirements-dev.txt
-      - run: pip install --pre numpy scipy
-
-      # Test modules with specific dependencies
-      - run: bin/test_optional_dependencies.py
-
   # -------------------- NumPy nightly ----------------------------- #
 
   numpy-nightly:
     needs: code-quality
 
     runs-on: ubuntu-20.04
 
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
-
-    name: ${{ matrix.python-version }} NumPy nightly
+    name: NumPy/SciPy nightly
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: 3.12
 
       - run: pip install -r requirements-dev.txt
       - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
@@ -255,7 +221,7 @@ jobs:
         with:
           # python-flint is not yet available for Python 3.12
           # https://github.com/flintlib/python-flint/issues/52
-          python-version: '3.11'
+          python-version: '3.12'
       - run: python -m pip install --upgrade pip
       - run: pip install -r requirements-dev.txt
       - run: pip install python-flint

diff --git a/sympy/polys/numberfields/galois_resolvents.py b/sympy/polys/numberfields/galois_resolvents.py
@@ -25,7 +25,6 @@
 from sympy.core.symbol import symbols, Dummy
 from sympy.polys.densetools import dup_eval
 from sympy.polys.domains import ZZ
-from sympy.polys.numberfields.resolvent_lookup import resolvent_coeff_lambdas
 from sympy.polys.orderings import lex
 from sympy.polys.polyroots import preprocess_roots
 from sympy.polys.polytools import Poly
@@ -659,6 +658,7 @@ def get_resolvent_by_lookup(T, number):
     dup
 
     """
+    from sympy.polys.numberfields.resolvent_lookup import resolvent_coeff_lambdas
     degree = T.degree()
     L = resolvent_coeff_lambdas[(degree, number)]
     T_coeffs = T.rep.to_list()[1:]

diff --git a/sympy/release.py b/sympy/release.py
@@ -1 +1 @@
-__version__ = "1.13.0rc3"
+__version__ = "1.13.0rc4"