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

Commit

Permalink
Update to 7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
David Lucas committed Jan 21, 2016
2 parents 37dad1a + 1961f94 commit 88f0d6f
Show file tree
Hide file tree
Showing 306 changed files with 6,183 additions and 6,271 deletions.
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Sage version 7.0.rc1, released 2016-01-14
Sage version 7.0, released 2016-01-19
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=5718238d9da2cc8a70a66d9dff3f6da33d0cb579
md5=3f84f3806e725dbfe742d8b6a22750f9
cksum=7625246
sha1=631a348f0ac864b3ec37dfcb1d7fab79e213a075
md5=5759d84c96102aee89c7eaea0aadf842
cksum=2510923339
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
139
140
5 changes: 1 addition & 4 deletions src/bin/sage-banner
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
┌────────────────────────────────────────────────────────────────────┐
│ SageMath Version 7.0.rc1, Release Date: 2016-01-14
│ SageMath Version 7.0, Release Date: 2016-01-19
│ Type "notebook()" for the browser-based notebook interface. │
│ Type "help()" for help. │
└────────────────────────────────────────────────────────────────────┘
┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
┃ Warning: this is a prerelease version, and it may be unstable. ┃
┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
32 changes: 32 additions & 0 deletions src/bin/sage-location
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,36 @@ def sage_relocate():
write_location_file()


RELOCATION_ERROR = """
ERROR: The Sage installation tree has moved
from {OLD_SAGE_ROOT}
to {SAGE_ROOT}
This is not supported, and Sage will not work. To install Sage from a
binary package:
1. Open the .tar.bz2 archive (or .dmg on OSX)
2. Move the SageMath folder/app to where you want it to be. You can
also rename the directory now.
3. Start sage for the first time. This will then automatically patch
paths in binaries.
After starting Sage for the first time you cannot change the
installation any more. To install Sage elsewhere, start over from the
binary package. Or recompile Sage from scratch in the new location
("make distclean && make")
"""


if __name__ == '__main__':

if SAGE_ROOT is None:
print('You must run this script from within a Sage shell')
sys.exit(1)

# Previous SAGE_ROOT, read from "sage-location.txt".
# OLD_SAGE_ROOT is None if this is a first-time install.
OLD_SAGE_ROOT = read_location_file()
Expand All @@ -292,12 +320,16 @@ if __name__ == '__main__':
if OLD_SAGE_ROOT != SAGE_ROOT or force_relocate:
if OLD_SAGE_ROOT is None:
print("This looks like the first time you are running Sage.")
elif OLD_SAGE_ROOT != SAGE_ROOT:
print(RELOCATION_ERROR.format(OLD_SAGE_ROOT=OLD_SAGE_ROOT, SAGE_ROOT=SAGE_ROOT))
sys.exit(1)
elif force_relocate:
print("Forcing sage-location, probably because a new package was installed.")
else:
print("The Sage installation tree has moved")
print("from %s" % OLD_SAGE_ROOT)
print(" to %s" % SAGE_ROOT)
assert(False)
print("Updating various hardcoded paths...")
print("(Please wait at most a few minutes.)")
print("DO NOT INTERRUPT THIS.")
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.0.rc1'
SAGE_RELEASE_DATE='2016-01-14'
SAGE_VERSION='7.0'
SAGE_RELEASE_DATE='2016-01-19'
2 changes: 1 addition & 1 deletion src/doc/en/reference/rings_standard/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Integers
sage/rings/fast_arith
sage/rings/sum_of_squares
sage/ext/multi_modular
sage/rings/arith
sage/arith/misc

.. SEEALSO::

Expand Down
2 changes: 1 addition & 1 deletion src/doc/en/thematic_tutorials/profiling.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ when ``code_to_run`` is executed::
1193 def random_prime(n, proof=None, lbound=2):
... ...
1251 # since we don't want current_randstate to get
1252 # pulled when you say "from sage.arith import *".
1252 # pulled when you say "from sage.arith.all import *".
1253 1 11 11.0 0.0 from sage.misc.randstate import current_randstate
1254 1 7 7.0 0.0 from sage.structure.proof.proof import get_flag
1255 1 6 6.0 0.0 proof = get_flag(proof, "arithmetic")
Expand Down
2 changes: 1 addition & 1 deletion src/sage/algebras/iwahori_hecke_algebra.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
from sage.rings.all import ZZ
from sage.rings.polynomial.laurent_polynomial_ring import LaurentPolynomialRing
from sage.rings.polynomial.polydict import ETuple
from sage.rings.arith import is_square
from sage.arith.all import is_square
from sage.combinat.root_system.weyl_group import WeylGroup
from sage.combinat.family import Family
from sage.combinat.free_module import CombinatorialFreeModule, CombinatorialFreeModuleElement
Expand Down
5 changes: 2 additions & 3 deletions src/sage/algebras/quatalg/quaternion_algebra.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@
#*****************************************************************************


from sage.rings.arith import (GCD,
hilbert_conductor_inverse, hilbert_conductor,
factor, gcd, lcm, kronecker_symbol, valuation)
from sage.arith.all import (hilbert_conductor_inverse, hilbert_conductor,
factor, gcd, lcm, kronecker_symbol, valuation)
from sage.rings.all import RR, Integer
from sage.rings.integer_ring import ZZ
from sage.rings.rational import Rational
Expand Down
1 change: 0 additions & 1 deletion src/sage/algebras/quatalg/quaternion_algebra_element.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ from sage.structure.element cimport AlgebraElement, RingElement, ModuleElement,
from sage.algebras.quatalg.quaternion_algebra_element cimport QuaternionAlgebraElement_abstract
from sage.rings.rational cimport Rational
from sage.rings.integer cimport Integer
from sage.rings.arith import lcm
from sage.rings.polynomial.polynomial_integer_dense_flint cimport Polynomial_integer_dense_flint
from sage.rings.number_field.number_field_element cimport NumberFieldElement
from sage.rings.all import PolynomialRing
Expand Down
2 changes: 1 addition & 1 deletion src/sage/algebras/steenrod/steenrod_algebra.py
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ def __init__(self, p=2, basis='milnor', **kwds):
sage: TestSuite(SteenrodAlgebra(basis='comm_deg', p=5)).run() # long time
sage: TestSuite(SteenrodAlgebra(p=2,generic=True)).run()
"""
from sage.rings.arith import is_prime
from sage.arith.all import is_prime
from sage.categories.graded_hopf_algebras_with_basis import GradedHopfAlgebrasWithBasis
from sage.categories.infinite_enumerated_sets import InfiniteEnumeratedSets
from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets
Expand Down
2 changes: 1 addition & 1 deletion src/sage/algebras/steenrod/steenrod_algebra_mult.py
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ def multinomial_odd(list,p):
105
"""
from sage.rings.all import GF, Integer
from sage.rings.arith import binomial
from sage.arith.all import binomial
n = sum(list)
answer = 1
F = GF(p)
Expand Down
1 change: 1 addition & 0 deletions src/sage/all.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@

from sage.structure.all import *
from sage.rings.all import *
from sage.arith.all import *
from sage.matrix.all import *

# This must come before Calculus -- it initializes the Pynac library.
Expand Down
Empty file added src/sage/arith/__init__.py
Empty file.
23 changes: 23 additions & 0 deletions src/sage/arith/all.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
from .misc import (algdep, bernoulli, is_prime, is_prime_power,
is_pseudoprime, is_pseudoprime_power, is_pseudoprime_small_power,
prime_powers, primes_first_n, eratosthenes, primes,
next_prime_power, next_probable_prime, next_prime,
previous_prime, previous_prime_power, random_prime,
divisors, sigma, gcd, GCD, lcm, LCM, xlcm, xgcd, xkcd,
inverse_mod, get_gcd, get_inverse_mod, power_mod,
rational_reconstruction, mqrr_rational_reconstruction,
trial_division, factor, prime_divisors, odd_part, prime_to_m_part,
is_square, is_squarefree, euler_phi, crt, CRT, CRT_list, CRT_basis,
CRT_vectors, multinomial, multinomial_coefficients,
binomial, factorial, kronecker_symbol, kronecker, legendre_symbol,
primitive_root, nth_prime, quadratic_residues, moebius,
continuant, number_of_divisors, hilbert_symbol, hilbert_conductor,
hilbert_conductor_inverse, falling_factorial, rising_factorial,
integer_ceil, integer_floor,
two_squares, three_squares, four_squares, sum_of_k_squares,
subfactorial, is_power_of_two, differences,
sort_complex_numbers_for_display,
fundamental_discriminant, squarefree_divisors,
Sigma, radical, Euler_Phi, binomial_coefficients, jacobi_symbol,
Moebius, dedekind_sum,
prime_factors, prime_range, valuation)
Loading

0 comments on commit 88f0d6f

Please sign in to comment.