Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge tag '9.6.rc4' into t/32423/update_numpy_to_1_22_x__scipy_1_8_x_…
Browse files Browse the repository at this point in the history
…__requires_dropping_python_3_7

SageMath version 9.6.rc4, Release Date: 2022-05-12
  • Loading branch information
Matthias Koeppe committed May 13, 2022
2 parents 7619755 + 888d18e commit 253a8f2
Show file tree
Hide file tree
Showing 30 changed files with 367 additions and 261 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,12 @@ jobs:
2-optional*) export TARGETS_PRE="build/make/Makefile" TARGETS="build/make/Makefile"
targets_pattern="${{ matrix.stage }}"
targets_pattern="${targets_pattern#2-optional-}"
export TARGETS_OPTIONAL=$( echo $(export PATH=build/bin:$PATH && (for a in spkg-install.in spkg-install requirements.txt; do sage-package list :optional: --has-file $a --no-file huge --no-file has_nonfree_dependencies; done) | grep -v ^_ | grep -v sagemath_doc | grep '^[${{ matrix.targets_pattern }}]' ) )
export TARGETS_OPTIONAL=$( echo $(export PATH=build/bin:$PATH && (for a in spkg-install.in spkg-install requirements.txt; do sage-package list :optional: --has-file $a --no-file huge --no-file has_nonfree_dependencies; done) | grep -v ^_ | grep -v sagemath_doc | grep "^[$targets_pattern]" ) )
;;
2-experimental*) export TARGETS_PRE="build/make/Makefile" TARGETS="build/make/Makefile"
targets_pattern="${{ matrix.stage }}"
targets_pattern="${targets_pattern#2-experimental-}"
export TARGETS_OPTIONAL=$( echo $(export PATH=build/bin:$PATH && (for a in spkg-install.in spkg-install requirements.txt; do sage-package list :experimental: --has-file $a --no-file huge --no-file has_nonfree_dependencies; done) | grep -v ^_ | grep -v sagemath_doc | grep '^[${{ matrix.targets_pattern }}]' ) )
export TARGETS_OPTIONAL=$( echo $(export PATH=build/bin:$PATH && (for a in spkg-install.in spkg-install requirements.txt; do sage-package list :experimental: --has-file $a --no-file huge --no-file has_nonfree_dependencies; done) | grep -v ^_ | grep -v sagemath_doc | grep "^[$targets_pattern]" ) )
;;
esac
MAKE="make -j12" tox -e $TOX_ENV -- SAGE_NUM_THREADS=4 $TARGETS
Expand Down
12 changes: 12 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@
"program": "${file}",
"console": "integratedTerminal",
"justMyCode": false
},
{
"name": "Sage: Test",
"type": "python",
"request": "launch",
"program": "${workspaceFolder}/src/bin/sage-runtests",
"args": [
"--verbose",
"${file}"
],
"console": "integratedTerminal",
"justMyCode": false
}
],
}
8 changes: 4 additions & 4 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"description": "Mirror of the Sage https://sagemath.org/ source tree",
"license": "other-open",
"title": "sagemath/sage: 9.6.rc3",
"version": "9.6.rc3",
"title": "sagemath/sage: 9.6.rc4",
"version": "9.6.rc4",
"upload_type": "software",
"publication_date": "2022-04-29",
"publication_date": "2022-05-12",
"creators": [
{
"affiliation": "SageMath.org",
Expand All @@ -15,7 +15,7 @@
"related_identifiers": [
{
"scheme": "url",
"identifier": "https://github.com/sagemath/sage/tree/9.6.rc3",
"identifier": "https://github.com/sagemath/sage/tree/9.6.rc4",
"relation": "isSupplementTo"
},
{
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 9.6.rc3, Release Date: 2022-04-29
SageMath version 9.6.rc4, Release Date: 2022-05-12
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=625fcd35850a91e736c0e618ace82b8e09c8e605
md5=db697a2f6460f5328f64cfaafdb58703
cksum=2241741028
sha1=ebad99b2c419469d2b491a012dc3a4d53a0fc4c0
md5=f0696455b8ba7dc50b7d23031f52ed19
cksum=143579459
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8e8d7b448d7dfe9b1c223a245e6d164507ddfe15
feb23e71747e42520fe984fa377c7ce5b5af025e
2 changes: 1 addition & 1 deletion build/pkgs/sagelib/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.6.rc3
9.6.rc4
2 changes: 1 addition & 1 deletion src/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.6.rc3
9.6.rc4
6 changes: 3 additions & 3 deletions src/bin/sage-version.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Sage version information for shell scripts
# This file is auto-generated by the sage-update-version script, do not edit!
SAGE_VERSION='9.6.rc3'
SAGE_RELEASE_DATE='2022-04-29'
SAGE_VERSION_BANNER='SageMath version 9.6.rc3, Release Date: 2022-04-29'
SAGE_VERSION='9.6.rc4'
SAGE_RELEASE_DATE='2022-05-12'
SAGE_VERSION_BANNER='SageMath version 9.6.rc4, Release Date: 2022-05-12'
6 changes: 0 additions & 6 deletions src/doc/en/reference/calculus/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ Using calculus
- :doc:`Main operations on symbolic expressions <sage/symbolic/expression>`
- :doc:`Assumptions about symbols and functions <sage/symbolic/assumptions>`
- :doc:`sage/symbolic/relation`
- :doc:`sage/symbolic/series`
- :doc:`sage/symbolic/integration/integral`
- :doc:`sage/calculus/desolvers`
- :doc:`sage/calculus/ode`
Expand All @@ -49,7 +48,6 @@ Internal functionality supporting calculus
- :doc:`sage/symbolic/ring`
- :doc:`sage/symbolic/subring`
- :doc:`sage/symbolic/operators`
- :doc:`sage/symbolic/getitem`
- :doc:`sage/symbolic/function`
- :doc:`sage/calculus/functional`
- :doc:`sage/symbolic/function_factory`
Expand All @@ -58,7 +56,6 @@ Internal functionality supporting calculus
- :doc:`sage/symbolic/substitution_map`
- :doc:`sage/symbolic/benchmark`
- :doc:`sage/symbolic/random_tests`
- :doc:`sage/libs/pynac/pynac`
- :doc:`sage/symbolic/maxima_wrapper`
- :doc:`External integrators <sage/symbolic/integration/external>`
- :doc:`External interpolators <sage/calculus/interpolators>`
Expand All @@ -78,7 +75,6 @@ Internal functionality supporting calculus
sage/symbolic/function
sage/symbolic/function_factory
sage/calculus/functional
sage/symbolic/series
sage/symbolic/integration/integral
sage/symbolic/integration/external
sage/calculus/test_sympy
Expand All @@ -97,12 +93,10 @@ Internal functionality supporting calculus
sage/calculus/interpolators
sage/calculus/functions
sage/calculus/var
sage/symbolic/getitem
sage/symbolic/maxima_wrapper
sage/symbolic/operators
sage/symbolic/substitution_map
sage/symbolic/benchmark
sage/symbolic/random_tests
sage/libs/pynac/pynac

.. include:: ../footer.txt
1 change: 0 additions & 1 deletion src/doc/en/reference/constants/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ Constants
:maxdepth: 2

sage/symbolic/constants
sage/symbolic/constants_c

.. include:: ../footer.txt
1 change: 0 additions & 1 deletion src/doc/en/reference/finance/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ Quantitative Finance
.. toctree::
:maxdepth: 2

sage/finance/time_series
sage/finance/stock
sage/finance/option
sage/finance/fractal
Expand Down
31 changes: 31 additions & 0 deletions src/sage/features/phitigra.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
r"""
Check for phitigra
"""
from . import PythonModule


class Phitigra(PythonModule):
r"""
A :class:`sage.features.Feature` describing the presence of phitigra.
Phitigra is provided by an optional package in the Sage distribution.
EXAMPLES::
sage: from sage.features.phitigra import Phitigra
sage: Phitigra().is_present() # optional - phitigra
FeatureTestResult('phitigra', True)
"""
def __init__(self):
r"""
TESTS::
sage: from sage.features.phitigra import Phitigra
sage: isinstance(Phitigra(), Phitigra)
True
"""
PythonModule.__init__(self, 'phitigra', spkg='phitigra')


def all_features():
return [Phitigra()]
9 changes: 8 additions & 1 deletion src/sage/finance/time_series.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
from sage.misc.lazy_import import lazy_import
r"""
Time Series (deprecated module)
This module consists only of deprecated lazy imports from
:mod:`sage.stats.time_series`.
"""


from sage.misc.lazy_import import lazy_import
lazy_import('sage.stats.time_series', ('TimeSeries', 'autoregressive_fit'), deprecation=32427)
Loading

0 comments on commit 253a8f2

Please sign in to comment.