Merge remote-tracking branch 'origin/public/build/pytest-github-workf…

…low' into public/build/pytest_doctests_fixes

.github/workflows/build.yml

@@ -44,6 +44,13 @@ jobs:
           MAKE: make -j2
           SAGE_NUM_THREADS: 2
 
+      - name: Pytest
+        if: contains(github.ref, 'pytest')
+        run: |
+          ../sage -python -m pip install coverage pytest-xdist
+          ../sage -python -m coverage run -m pytest -c tox.ini --doctest-modules || true
+        working-directory: ./src
+
       - name: Test
         run: |
           ../sage -python -m pip install coverage

.github/workflows/tox.yml

@@ -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

.vscode/launch.json

@@ -19,6 +19,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
         }
     ],
 }

.zenodo.json

@@ -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", 
+    "version": "9.6", 
     "upload_type": "software", 
-    "publication_date": "2022-04-29", 
+    "publication_date": "2022-05-15", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -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", 
             "relation": "isSupplementTo"
         }, 
         {

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.6.rc3, Release Date: 2022-04-29
+SageMath version 9.6, Release Date: 2022-05-15

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=625fcd35850a91e736c0e618ace82b8e09c8e605
-md5=db697a2f6460f5328f64cfaafdb58703
-cksum=2241741028
+sha1=f0ab7c18b3a169fdf7238fe8d70f8bce29373ef4
+md5=37b7220d90d9ec624e126ebb12cc8547
+cksum=3498005086

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-8e8d7b448d7dfe9b1c223a245e6d164507ddfe15
+888d18eb851f892097a0a683c01e3a95db863495

build/pkgs/sagelib/package-version.txt

@@ -1 +1 @@
-9.6.rc3
+9.6

src/VERSION.txt

@@ -1 +1 @@
-9.6.rc3
+9.6

src/bin/sage-version.sh

@@ -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'
+SAGE_RELEASE_DATE='2022-05-15'
+SAGE_VERSION_BANNER='SageMath version 9.6, Release Date: 2022-05-15'

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

@@ -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`
@@ -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`
@@ -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>`
@@ -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
@@ -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

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

@@ -5,6 +5,5 @@ Constants
    :maxdepth: 2
 
    sage/symbolic/constants
-   sage/symbolic/constants_c
 
 .. include:: ../footer.txt

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

@@ -4,7 +4,6 @@ Quantitative Finance
 .. toctree::
    :maxdepth: 2
 
-   sage/finance/time_series
    sage/finance/stock
    sage/finance/option
    sage/finance/fractal

src/sage/features/phitigra.py

@@ -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()]

src/sage/finance/time_series.py

@@ -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)