diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a3b588a6a884..2a6da6848aca 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,10 +18,10 @@ on: - '1.14' env: release_branch: '1.14' - release_version: '1.14.0-dev' + release_version: '1.14.0' final_release_version: '1.14.0' - previous_version: '1.13.0' - dev_version: '1.14-dev' + previous_version: '1.13.3' + dev_version: '1.15-dev' jobs: @@ -29,7 +29,7 @@ jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: # Check out with full git history for authors check: - uses: actions/checkout@v4 @@ -39,7 +39,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' - name: Build release files run: release/ci_release_script.sh ${{ env.release_version }} ${{ env.previous_version }} @@ -55,7 +55,7 @@ jobs: test-install: needs: [build] - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -181,9 +181,9 @@ jobs: GH_TOKEN: ${{ github.token }} run: > gh release create ${{ env.release_version }} dist/* - --prerelease - --title "SymPy ${{ env.release_version }}" - --notes "See https://github.com/sympy/sympy/wiki/release-notes-for-${{ env.final_release_version }} for release notes" + --prerelease + --title "SymPy ${{ env.release_version }}" + --notes "See https://github.com/sympy/sympy/wiki/release-notes-for-${{ env.final_release_version }} for release notes" - name: Create Final GitHub release if: ${{ needs.check-final.outputs.is-final == 'true' }} @@ -191,8 +191,8 @@ jobs: GH_TOKEN: ${{ github.token }} run: > gh release create ${{ env.release_version }} dist/* - --title "SymPy ${{ env.release_version }}" - --notes "See https://github.com/sympy/sympy/wiki/release-notes-for-${{ env.final_release_version }} for release notes" + --title "SymPy ${{ env.release_version }}" + --notes "See https://github.com/sympy/sympy/wiki/release-notes-for-${{ env.final_release_version }} for release notes" # -------------------- Update the docs repository ---------------- # diff --git a/.github/workflows/runtests.yml b/.github/workflows/runtests.yml index 6c19d584262e..d00612693952 100644 --- a/.github/workflows/runtests.yml +++ b/.github/workflows/runtests.yml @@ -223,15 +223,21 @@ jobs: python-flint: needs: [doctests-latest, tests-latest] + strategy: + fail-fast: false + matrix: + flint-version: ['0.6.0', '0.7.1'] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.13' + # flint==0.6.0 needs 3.12 + python-version: '3.12' - run: python -m pip install --upgrade pip - run: pip install -r requirements-dev.txt - - run: pip install python-flint + - run: pip install python-flint==${{ matrix.flint-version }} - run: pip install . - run: pytest -n auto @@ -473,7 +479,7 @@ jobs: # well. - run: git remote add upstream https://github.com/sympy/sympy.git - - run: git fetch upstream master + - run: git fetch upstream 1.14 - run: git fetch upstream 1.13 - name: Configure benchmarks @@ -484,10 +490,10 @@ jobs: run: asv run --config asv.conf.actions.json # Output benchmark results - - run: asv compare upstream/master HEAD --config asv.conf.actions.json --factor 1.5 | tee pr_vs_master.txt - - run: asv compare upstream/master HEAD --config asv.conf.actions.json --factor 1.5 --only-changed | tee pr_vs_master_changed.txt - - run: asv compare upstream/1.13 upstream/master --config asv.conf.actions.json --factor 1.5 | tee master_vs_release.txt - - run: asv compare upstream/1.13 upstream/master --config asv.conf.actions.json --factor 1.5 --only-changed | tee master_vs_release_changed.txt + - run: asv compare upstream/1.14 HEAD --config asv.conf.actions.json --factor 1.5 | tee pr_vs_1.14.txt + - run: asv compare upstream/1.14 HEAD --config asv.conf.actions.json --factor 1.5 --only-changed | tee pr_vs_1.14_changed.txt + - run: asv compare upstream/1.13 upstream/1.14 --config asv.conf.actions.json --factor 1.5 | tee 1.14_vs_1.13.txt + - run: asv compare upstream/1.13 upstream/1.14 --config asv.conf.actions.json --factor 1.5 --only-changed | tee 1.14_vs_1.13_changed.txt # we save all outputs as artifacts that can be downloaded from the # GitHub Actions summary page. @@ -497,7 +503,7 @@ jobs: with: name: benchmarks path: | - pr_vs_master.txt - pr_vs_master_changed.txt - master_vs_release.txt - master_vs_release_changed.txt + pr_vs_1.14.txt + pr_vs_1.14_changed.txt + 1.14_vs_1.13.txt + 1.14_vs_1.13_changed.txt diff --git a/asv.conf.actions.json b/asv.conf.actions.json index e6971b90b8dc..39eae31474c6 100644 --- a/asv.conf.actions.json +++ b/asv.conf.actions.json @@ -29,7 +29,7 @@ // This list needs to be updated after each release of sympy. The branch to // be checked should always be the previous release. - "branches": ["upstream/1.13", "upstream/master", "HEAD"], // for git + "branches": ["upstream/1.13", "upstream/1.14", "HEAD"], // for git // "branches": ["tip"], // for mercurial // The DVCS being used. If not set, it will be automatically diff --git a/setup.py b/setup.py index 611309240070..9c751f3244c4 100755 --- a/setup.py +++ b/setup.py @@ -321,7 +321,7 @@ def run(self): }, # Set upper bound when making the release branch. install_requires=[ - 'mpmath >= 1.1.0', + 'mpmath >= 1.1.0, < 1.4', ], py_modules=['isympy'], packages=['sympy'] + modules + tests, diff --git a/sympy/external/gmpy.py b/sympy/external/gmpy.py index 8554ce619cd7..d26942864bf4 100644 --- a/sympy/external/gmpy.py +++ b/sympy/external/gmpy.py @@ -93,7 +93,7 @@ # Tested python-flint version. Future versions might work but we will only use # them if explicitly requested by SYMPY_GROUND_TYPES=flint. # -_PYTHON_FLINT_VERSION_NEEDED = ["0.6", "0.7", "0.8", "0.9"] +_PYTHON_FLINT_VERSION_NEEDED = ["0.6", "0.7", "0.8", "0.9", "0.10"] def _flint_version_okay(flint_version): diff --git a/sympy/interactive/printing.py b/sympy/interactive/printing.py index 04caea6e5192..2fcc73e3e96a 100644 --- a/sympy/interactive/printing.py +++ b/sympy/interactive/printing.py @@ -80,7 +80,7 @@ def _init_ipython_printing(ip, stringify_func, use_latex, euler, forecolor, def _print_plain(arg, p, cycle): """caller for pretty, for use in IPython 0.11""" if _can_print(arg): - p.text(stringify_func(arg, **settings)) + p.text(stringify_func(arg)) else: p.text(IPython.lib.pretty.pretty(arg)) diff --git a/sympy/release.py b/sympy/release.py index 1423f6cbb204..b9f68edb2f57 100644 --- a/sympy/release.py +++ b/sympy/release.py @@ -1 +1 @@ -__version__ = "1.14.dev" +__version__ = "1.14.0"