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

Commit 570058c

Browse files
tobiasdieztobiasdiez
committed
Merge remote-tracking branch 'origin/u/mkoeppe/update_cython_to_0_29_29' into public/26254
2 parents a23ffe9 + 92e9cff commit 570058c

32 files changed

+371
-265
lines changed

‎.github/workflows/tox.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,12 @@ jobs:
169169
2-optional*) export TARGETS_PRE="build/make/Makefile" TARGETS="build/make/Makefile"
170170
targets_pattern="${{ matrix.stage }}"
171171
targets_pattern="${targets_pattern#2-optional-}"
172-
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 }}]' ) )
172+
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]" ) )
173173
;;
174174
2-experimental*) export TARGETS_PRE="build/make/Makefile" TARGETS="build/make/Makefile"
175175
targets_pattern="${{ matrix.stage }}"
176176
targets_pattern="${targets_pattern#2-experimental-}"
177-
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 }}]' ) )
177+
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]" ) )
178178
;;
179179
esac
180180
MAKE="make -j12" tox -e $TOX_ENV -- SAGE_NUM_THREADS=4 $TARGETS

‎.vscode/launch.json

+12
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@
88
"program": "${file}",
99
"console": "integratedTerminal",
1010
"justMyCode": false
11+
},
12+
{
13+
"name": "Sage: Test",
14+
"type": "python",
15+
"request": "launch",
16+
"program": "${workspaceFolder}/src/bin/sage-runtests",
17+
"args": [
18+
"--verbose",
19+
"${file}"
20+
],
21+
"console": "integratedTerminal",
22+
"justMyCode": false
1123
}
1224
],
1325
}

‎.zenodo.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"description": "Mirror of the Sage https://sagemath.org/ source tree",
33
"license": "other-open",
4-
"title": "sagemath/sage: 9.6.rc3",
5-
"version": "9.6.rc3",
4+
"title": "sagemath/sage: 9.6",
5+
"version": "9.6",
66
"upload_type": "software",
7-
"publication_date": "2022-04-29",
7+
"publication_date": "2022-05-15",
88
"creators": [
99
{
1010
"affiliation": "SageMath.org",
@@ -15,7 +15,7 @@
1515
"related_identifiers": [
1616
{
1717
"scheme": "url",
18-
"identifier": "https://github.com/sagemath/sage/tree/9.6.rc3",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.6",
1919
"relation": "isSupplementTo"
2020
},
2121
{

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.6.rc3, Release Date: 2022-04-29
1+
SageMath version 9.6, Release Date: 2022-05-15

‎build/pkgs/configure/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=625fcd35850a91e736c0e618ace82b8e09c8e605
3-
md5=db697a2f6460f5328f64cfaafdb58703
4-
cksum=2241741028
2+
sha1=f0ab7c18b3a169fdf7238fe8d70f8bce29373ef4
3+
md5=37b7220d90d9ec624e126ebb12cc8547
4+
cksum=3498005086

‎build/pkgs/configure/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8e8d7b448d7dfe9b1c223a245e6d164507ddfe15
1+
888d18eb851f892097a0a683c01e3a95db863495

‎build/pkgs/cython/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=Cython-VERSION.tar.gz
2-
sha1=0e85468d2af207c19530648cda271d27d03c6894
3-
md5=0e98543dca816300a27e7d76146a6280
4-
cksum=3252194174
2+
sha1=89c8413689f06c999caf4700fb8bab53ba6f860a
3+
md5=3cf4001b4be42a263f163865235c39d8
4+
cksum=2022900074
55
upstream_url=https://pypi.io/packages/source/C/Cython/Cython-VERSION.tar.gz

‎build/pkgs/cython/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.29.28
1+
0.29.30

‎build/pkgs/sagelib/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.6.rc3
1+
9.6

‎src/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.6.rc3
1+
9.6

‎src/bin/sage-version.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Sage version information for shell scripts
22
# This file is auto-generated by the sage-update-version script, do not edit!
3-
SAGE_VERSION='9.6.rc3'
4-
SAGE_RELEASE_DATE='2022-04-29'
5-
SAGE_VERSION_BANNER='SageMath version 9.6.rc3, Release Date: 2022-04-29'
3+
SAGE_VERSION='9.6'
4+
SAGE_RELEASE_DATE='2022-05-15'
5+
SAGE_VERSION_BANNER='SageMath version 9.6, Release Date: 2022-05-15'

‎src/doc/en/reference/calculus/index.rst

-6
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ Using calculus
2525
- :doc:`Main operations on symbolic expressions <sage/symbolic/expression>`
2626
- :doc:`Assumptions about symbols and functions <sage/symbolic/assumptions>`
2727
- :doc:`sage/symbolic/relation`
28-
- :doc:`sage/symbolic/series`
2928
- :doc:`sage/symbolic/integration/integral`
3029
- :doc:`sage/calculus/desolvers`
3130
- :doc:`sage/calculus/ode`
@@ -49,7 +48,6 @@ Internal functionality supporting calculus
4948
- :doc:`sage/symbolic/ring`
5049
- :doc:`sage/symbolic/subring`
5150
- :doc:`sage/symbolic/operators`
52-
- :doc:`sage/symbolic/getitem`
5351
- :doc:`sage/symbolic/function`
5452
- :doc:`sage/calculus/functional`
5553
- :doc:`sage/symbolic/function_factory`
@@ -58,7 +56,6 @@ Internal functionality supporting calculus
5856
- :doc:`sage/symbolic/substitution_map`
5957
- :doc:`sage/symbolic/benchmark`
6058
- :doc:`sage/symbolic/random_tests`
61-
- :doc:`sage/libs/pynac/pynac`
6259
- :doc:`sage/symbolic/maxima_wrapper`
6360
- :doc:`External integrators <sage/symbolic/integration/external>`
6461
- :doc:`External interpolators <sage/calculus/interpolators>`
@@ -78,7 +75,6 @@ Internal functionality supporting calculus
7875
sage/symbolic/function
7976
sage/symbolic/function_factory
8077
sage/calculus/functional
81-
sage/symbolic/series
8278
sage/symbolic/integration/integral
8379
sage/symbolic/integration/external
8480
sage/calculus/test_sympy
@@ -97,12 +93,10 @@ Internal functionality supporting calculus
9793
sage/calculus/interpolators
9894
sage/calculus/functions
9995
sage/calculus/var
100-
sage/symbolic/getitem
10196
sage/symbolic/maxima_wrapper
10297
sage/symbolic/operators
10398
sage/symbolic/substitution_map
10499
sage/symbolic/benchmark
105100
sage/symbolic/random_tests
106-
sage/libs/pynac/pynac
107101

108102
.. include:: ../footer.txt

‎src/doc/en/reference/constants/index.rst

-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ Constants
55
:maxdepth: 2
66

77
sage/symbolic/constants
8-
sage/symbolic/constants_c
98

109
.. include:: ../footer.txt

‎src/doc/en/reference/finance/index.rst

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ Quantitative Finance
44
.. toctree::
55
:maxdepth: 2
66

7-
sage/finance/time_series
87
sage/finance/stock
98
sage/finance/option
109
sage/finance/fractal

‎src/sage/features/phitigra.py

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
r"""
2+
Check for phitigra
3+
"""
4+
from . import PythonModule
5+
6+
7+
class Phitigra(PythonModule):
8+
r"""
9+
A :class:`sage.features.Feature` describing the presence of phitigra.
10+
11+
Phitigra is provided by an optional package in the Sage distribution.
12+
13+
EXAMPLES::
14+
15+
sage: from sage.features.phitigra import Phitigra
16+
sage: Phitigra().is_present() # optional - phitigra
17+
FeatureTestResult('phitigra', True)
18+
"""
19+
def __init__(self):
20+
r"""
21+
TESTS::
22+
23+
sage: from sage.features.phitigra import Phitigra
24+
sage: isinstance(Phitigra(), Phitigra)
25+
True
26+
"""
27+
PythonModule.__init__(self, 'phitigra', spkg='phitigra')
28+
29+
30+
def all_features():
31+
return [Phitigra()]

‎src/sage/finance/time_series.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1-
from sage.misc.lazy_import import lazy_import
1+
r"""
2+
Time Series (deprecated module)
3+
4+
This module consists only of deprecated lazy imports from
5+
:mod:`sage.stats.time_series`.
6+
"""
27

8+
9+
from sage.misc.lazy_import import lazy_import
310
lazy_import('sage.stats.time_series', ('TimeSeries', 'autoregressive_fit'), deprecation=32427)

0 commit comments

Comments
 (0)