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

Commit

Permalink
Merge branch 't/20601/20601_experimental' into benchmarking_tool
Browse files Browse the repository at this point in the history
  • Loading branch information
David Lucas committed May 13, 2016
2 parents 8e363dd + d14bdd4 commit fe0b956
Show file tree
Hide file tree
Showing 13 changed files with 74 additions and 29 deletions.
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 7.2.rc1, Release Date: 2016-05-07
SageMath version 7.2.rc2, Release Date: 2016-05-11
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=6ba41f01a5e6c4244ae0cd1b777d1f105ca2c507
md5=44f2228be0b7190646294a40ff5b7806
cksum=3056196411
sha1=2e2f3713d17f597d923c35d7af4bd5f19e226b15
md5=bb04a6931810f297e95152485156bcb8
cksum=1667255197
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
162
163
6 changes: 3 additions & 3 deletions build/pkgs/giacpy/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=giacpy-VERSION.tar.gz
sha1=67693f9a60601fc8c4a0c0ba41300f88679ed070
md5=6ebb254d597eb00b95b2b36ae4dbbdbf
cksum=3344860417
sha1=871b31ca287253090923dda0403b08eda1d0d846
md5=3129fd620fbb6e16f33345d44d4fea73
cksum=1753840688
2 changes: 1 addition & 1 deletion build/pkgs/giacpy/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.5
0.5.6
6 changes: 3 additions & 3 deletions build/pkgs/openssl/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=openssl-VERSION.tar.gz
sha1=36af23887402a5ea4ebef91df8e61654906f58f2
md5=f3c710c045cdee5fd114feb69feba7aa
cksum=1676048282
sha1=577585f5f5d299c44dd3c993d3c0ac7a219e4949
md5=9392e65072ce4b614c1392eefc1f23d0
cksum=3553483078
2 changes: 1 addition & 1 deletion build/pkgs/openssl/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.2g
1.0.2h
8 changes: 3 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -449,11 +449,9 @@ else
# Add the .0 because Debian/Ubuntu gives version numbers like
# 4.6 instead of 4.6.4 (Trac #18885)
case "$GXX_VERSION.0" in
[[0-3]].*|4.[[0-8]].*)
# Install our own GCC if the system-provided one is older than GCC-4.9.
# GCC-4.8.x breaks because of http://trac.sagemath.org/ticket/14460
# which is GCC bug http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56982
SAGE_SHOULD_INSTALL_GCC([you have $CXX version $GXX_VERSION, which is too old]);;
[[0-3]].*|4.[[0-7]].*)
# Install our own GCC if the system-provided one is older than gcc-4.8.
SAGE_SHOULD_INSTALL_GCC([you have $CXX version $GXX_VERSION, which is quite old]);;
esac

# The following tests check that the version of the compilers
Expand Down
2 changes: 1 addition & 1 deletion src/bin/sage-banner
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
┌────────────────────────────────────────────────────────────────────┐
│ SageMath version 7.2.rc1, Release Date: 2016-05-07
│ SageMath version 7.2.rc2, Release Date: 2016-05-11
│ Type "notebook()" for the browser-based notebook interface. │
│ Type "help()" for help. │
└────────────────────────────────────────────────────────────────────┘
Expand Down
4 changes: 2 additions & 2 deletions src/bin/sage-version.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sage version information for shell scripts
# This file is auto-generated by the sage-update-version script, do not edit!
SAGE_VERSION='7.2.rc1'
SAGE_RELEASE_DATE='2016-05-07'
SAGE_VERSION='7.2.rc2'
SAGE_RELEASE_DATE='2016-05-11'
51 changes: 45 additions & 6 deletions src/sage/misc/superseded.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,21 @@ def __init__(self, trac_number, stacklevel=4):
See http://trac.sagemath.org/99999 for details.
piep (99,) {}
TESTS:
The following test works together with the doc-test for
:method:`__experimental_self_test` to demonstrate that warnings are issued only
once, even in doc-tests (see :trac:`20601`).
::
sage: from sage.misc.superseded import __experimental_self_test
sage: _ = __experimental_self_test("A")
doctest:...: FutureWarning: This class/method/function is
marked as experimental. It, its functionality or its
interface might change without a formal deprecation.
See http://trac.sagemath.org/88888 for details.
I'm A
.. SEEALSO::
:func:`experimental`,
Expand Down Expand Up @@ -252,16 +267,40 @@ def __call__(self, func):
@sage_wraps(func)
def wrapper(*args, **kwds):
from sage.misc.superseded import experimental_warning
experimental_warning(self.trac_number,
'This class/method/function is marked as '
'experimental. It, its functionality or its '
'interface might change without a '
'formal deprecation.',
self.stacklevel)
if not wrapper._already_issued:
experimental_warning(self.trac_number,
'This class/method/function is marked as '
'experimental. It, its functionality or its '
'interface might change without a '
'formal deprecation.',
self.stacklevel)
wrapper._already_issued = True
return func(*args, **kwds)
wrapper._already_issued = False

return wrapper

from sage.structure.sage_object import SageObject
class __experimental_self_test(SageObject):
r"""
This is a class only to demonstrate with a doc-test that the @experimental
decorator only issues a warning message once (see :trac:`20601`).
The test below does not issue a warning message because that warning has
already been issued by a previous doc-test in the @experimental code. Note
that this behaviour can not be demonstrated within a single documentation
string: Sphinx will itself supress multiple issued warnings.
TESTS::
sage: from sage.misc.superseded import __experimental_self_test
sage: _ = __experimental_self_test("B")
I'm B
"""
@experimental(trac_number=88888)
def __init__(self, x):
print("I'm " + x)


class DeprecatedFunctionAlias(object):
"""
Expand Down
4 changes: 2 additions & 2 deletions src/sage/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sage version information for Python scripts
# This file is auto-generated by the sage-update-version script, do not edit!
version = '7.2.rc1'
date = '2016-05-07'
version = '7.2.rc2'
date = '2016-05-11'
8 changes: 8 additions & 0 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@ def excepthook(*exc):
if DEVEL:
extra_compile_args.append('-ggdb')

# Work around GCC-4.8.0 bug which miscompiles some sig_on() statements,
# as witnessed by a doctest in sage/libs/gap/element.pyx if the
# compiler flag -Og is used. See also
# * http://trac.sagemath.org/sage_trac/ticket/14460
# * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56982
if subprocess.call("""$CC --version | grep -i 'gcc.* 4[.]8' >/dev/null """, shell=True) == 0:
extra_compile_args.append('-fno-tree-dominator-opts')

#########################################################
### Testing related stuff
#########################################################
Expand Down

0 comments on commit fe0b956

Please sign in to comment.