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

Commit 834f6b0

Browse files
author
David Lucas
committed
Merged with rc3
2 parents 34d755f + c0f3e47 commit 834f6b0

25 files changed

+3535
-1182
lines changed

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Sage version 6.6.rc2, released 2015-04-02
1+
Sage version 6.6.rc3, released 2015-04-12

‎build/deps

+1-1
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ $(INST)/$(M4RIE): $(INST)/$(M4RI) $(INST)/$(GIVARO) $(INST)/$(NTL)
460460
$(INST)/$(ZNPOLY): $(INST)/$(SAGE_MP_LIBRARY) | $(INST)/$(PYTHON)
461461
+$(PIPE) "$(SAGE_SPKG) $(ZNPOLY) 2>&1" "tee -a $(SAGE_LOGS)/$(ZNPOLY).log"
462462

463-
$(INST)/$(SAGENB): $(INST)/$(PIP) $(INST)/$(PEXPECT) \
463+
$(INST)/$(SAGENB): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS) $(INST)/$(PEXPECT) \
464464
$(INST)/$(JINJA2) $(INST)/$(SPHINX) $(INST)/$(DOCUTILS)
465465
+$(PIPE) "$(SAGE_SPKG) $(SAGENB) 2>&1" "tee -a $(SAGE_LOGS)/$(SAGENB).log"
466466

‎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=6b6e8457815b8e910102b18d107563f2c38a6156
3-
md5=f430b72dfc9ee0bfeb75f16dbf5dfda7
4-
cksum=2088594908
2+
sha1=beac54655b8d0fbff44d578bcb2b4f676d40b3c9
3+
md5=ac8c8051aebfe3d45bf36bdf498c9b59
4+
cksum=3023873269

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
79
1+
81

‎build/pkgs/latte_int/checksums.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tarball=latte_int-VERSION.tar.bz2
2-
sha1=1a1b475d69697c45218b133df9b0519894ebce28
3-
md5=3a862e6a5d1b2e10b0bee342fc0f27a9
4-
cksum=3434585848
1+
tarball=latte_int-VERSION.tar.gz
2+
sha1=165c9173b13f4bc9cb825ef63c06d6fb20dc41b5
3+
md5=57b151f7bb49fe5154a5697b70d359f9
4+
cksum=1072837189

‎build/pkgs/openssl/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=openssl-VERSION.tar.gz
2-
sha1=2f264f7f6bb973af444cd9fc6ee65c8588f610cc
3-
md5=38373013fc85c790aabf8837969c5eba
4-
cksum=3003646357
2+
sha1=46ecd325b8e587fa491f6bb02ad4a9fb9f382f5f
3+
md5=a06c547dac9044161a477211049f60ef
4+
cksum=2688160626

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.2
1+
1.0.2a

‎build/pkgs/pip/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=pip-VERSION.tar.gz
2-
sha1=e6cd9e6f2fd8d28c9976313632ef8aa8ac31249e
3-
md5=01026f87978932060cc86c1dc527903e
4-
cksum=3140729302
2+
sha1=f649528990ba4c6b5a3f4811c63ced45405ec4d4
3+
md5=6b19e0a934d982a5a4b798e957cb6d45
4+
cksum=1921827206

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.6
1+
6.1.1

‎build/pkgs/sagenb/spkg-install

+26-5
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,37 @@ fi
3838
# delete old sagenb install, if any
3939
rm -rf "${SAGE_LOCAL}/lib/python/site-packages"/sagenb*
4040

41-
# install new sagenb
42-
pip install --no-index \
43-
--find-links="file://$(pwd)/src/" sagenb
41+
42+
# TODO: clean up this crap
43+
# * dependencies should not be part of the sagenb tarball at all
44+
# * get rid of easy_install
45+
# * note that pip currently depends on ssl
46+
47+
# Install dependencies
48+
for PKG in $(cat src/install_order); do
49+
easy_install -Z -H None "src/$PKG"
50+
if [ $? -ne 0 ]; then
51+
echo >&2 "Error: Installing $PKG failed."
52+
exit 1
53+
fi
54+
done
55+
56+
57+
# Install sagenb into site-packages
58+
PKG=$(ls -1 src | GREP_OPTIONS= grep sagenb-)
59+
easy_install -Z -H None "src/$PKG"
4460
if [ $? -ne 0 ]; then
4561
echo >&2 "Error: Installing SageNB failed."
4662
exit 1
4763
fi
4864

65+
4966
# let sagenb use mathjax spkg
50-
cd "${SAGE_LOCAL}/lib/python/site-packages/sagenb/data"
67+
cd "${SAGE_LOCAL}/lib/python/site-packages"/sagenb-*.egg/sagenb/data
68+
if [ $? -ne 0 ]; then
69+
echo >&2 "Error: Cannot find SageNB data directory."
70+
exit 1
71+
fi
5172
# the following line can be removed once sagenb does not ship mathjax anymore.
5273
rm -rf mathjax
53-
ln -s ../../../../../share/mathjax/ mathjax
74+
ln -s ../../../../../../share/mathjax/ mathjax

‎src/bin/sage-banner

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
┌────────────────────────────────────────────────────────────────────┐
2-
│ SageMath Version 6.6.rc2, Release Date: 2015-04-02 │
2+
│ SageMath Version 6.6.rc3, Release Date: 2015-04-12 │
33
│ Type "notebook()" for the browser-based notebook interface. │
44
│ Type "help()" for help. │
55
└────────────────────────────────────────────────────────────────────┘

‎src/bin/sage-version.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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='6.6.rc2'
4-
SAGE_RELEASE_DATE='2015-04-02'
3+
SAGE_VERSION='6.6.rc3'
4+
SAGE_RELEASE_DATE='2015-04-12'

‎src/sage/algebras/weyl_algebra.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
from sage.sets.family import Family
2626
from sage.combinat.dict_addition import dict_addition, dict_linear_combination
2727
from sage.combinat.free_module import _divide_if_possible
28-
from sage.combinat.integer_list import IntegerListsLex
29-
from sage.sets.non_negative_integers import NonNegativeIntegers
3028
from sage.rings.ring import Algebra
3129
from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
3230
from sage.rings.polynomial.multi_polynomial_ring_generic import MPolynomialRing_generic
@@ -697,7 +695,9 @@ def basis(self):
697695
dx^2, dx*dy, dy^2, x^3, x^2*y, x^2*dx, x^2*dy, x*y^2]
698696
"""
699697
n = self._n
700-
I = IntegerListsLex(NonNegativeIntegers(), length=n*2)
698+
# TODO in #17927: use IntegerVectors(length=2*n)
699+
from sage.combinat.integer_list import IntegerListsNN
700+
I = IntegerListsNN(length=n*2)
701701
one = self.base_ring().one()
702702
f = lambda x: self.element_class(self, {(tuple(x[:n]),tuple(x[n:])): one})
703703
return Family(I, f, name="basis map")

‎src/sage/combinat/all.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
# Integer lists lex
5050

51-
from integer_list import IntegerListsLexPublic as IntegerListsLex
51+
from integer_list import IntegerListsLex as IntegerListsLex
5252

5353
#Compositions
5454
from composition import Composition, Compositions

‎src/sage/combinat/enumerated_sets.py

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
(see also: :ref:`sage.combinat.catalog_partitions`)
2525
- :ref:`sage.combinat.composition`
2626
- :class:`~sage.combinat.composition_signed.SignedCompositions`
27+
- :class:`IntegerListsLex`
2728
2829
- :class:`~sage.combinat.integer_vector.IntegerVectors`
2930
- :func:`~sage.combinat.integer_vector_weighted.WeightedIntegerVectors`

0 commit comments

Comments
 (0)