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

Commit

Permalink
Merge tag '7.5.rc1' into t/19580/asy/locals
Browse files Browse the repository at this point in the history 
SageMath version 7.5.rc1

* tag '7.5.rc1': (8201 commits)
  Updated SageMath version to 7.5.rc1
  amending coment and message in setup.py
  Move autogen to a more appropriate location.
  22095: better doctest
  run tests only in spkg-check. Also run spkg-check with the same options as spkg-install
  SAGERUNTIME requires psutil
  22095: zero should be zero
  Revert "Stronger C typing for Singular ring order."
  Remove backported patch as it needs further patching...
  Gracefully handle closing of stdin in Singular.
  Upstream patch for GB over rings.
  New name for QQ in singular.
  Backport new functions for ring name printing. Otherwise debug mode cries.
  Backport Singular 4-2-0 patch. Not needed now but we'll have to deal with this.
  Let new Singular act as old one for GB computations over ZZ.
  Mark some params as unused in xalloc.
  Stronger C typing for Singular ring order.
  22068: address reviewer's comments
  Updated SageMath version to 7.5.rc0
  #22063 better precision handling
  ...
  • Loading branch information
@dkrenn
dkrenn committed Jan 5, 2017
2 parents f396470 + e82c80c commit fc7434a
Show file tree
Hide file tree
Showing 4,240 changed files with 352,178 additions and 158,445 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
9 changes: 9 additions & 0 deletions .dir-locals.el
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
;;; Directory Local Variables
;;; For more information see (info "(emacs) Directory Variables")

((nil
;; Use space instead of tabs for indentation
(indent-tabs-mode . nil))
(makefile-mode
;; But use tabs in Makefiles
(indent-tabs-mode . t)))
9 changes: 7 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
/local
/logs
/upstream
/src/mac-app/build

#############################
# Autotools generated files #
Expand Down Expand Up @@ -75,4 +74,10 @@ $RECYCLE.BIN/
#################
*.sage-chat
*.sage-history
*.syncdoc*
*.syncdoc*

###########
# Jupyter #
###########
.ipynb_checkpoints
Untitled*.ipynb
7 changes: 6 additions & 1 deletion COPYING.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ free open source license as defined at http://www.opensource.org/.
The whole Sage software distribution is licensed under the General
Public License, version 3 (no other versions!).

All Sage documentation is licensed under Creative Commons 3.0 BY-SA
License.

Some of the code available in *optional* Sage packages (not included
in sage-*.tar) are licensed under more restrictive conditions.

Expand All @@ -28,6 +31,7 @@ the licenses of the components of Sage are included below as well.

SOFTWARE LICENSE
-----------------------------------------------------------------------
arb GPLv2+
atlas Modified BSD
boehm_gc MIT-like license (see below)
backports_ssl_match_hostname Python License
Expand Down Expand Up @@ -88,6 +92,7 @@ mpmath Modified BSD
networkx Modified BSD
ntl GPLv2+
numpy Modified BSD
openblas Modified BSD
palp GPLv3
pari GPLv2+
patch GPLv2+
Expand Down Expand Up @@ -799,7 +804,7 @@ at the notice in config.guess or ltmain.sh.)

The atomic_ops library contains some code that is covered by the GNU General
Public License, but is not needed by, nor linked into the collector library.
It is included here only becuase the atomic_ops distribution is, for
It is included here only because the atomic_ops distribution is, for
simplicity, included in its entirety.

================================================================================
Expand Down
52 changes: 24 additions & 28 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ build: all-build

# Defer unknown targets to build/make/Makefile
%::
@if [ -x relocate-once.py ]; then ./relocate-once.py; fi
$(MAKE) build/make/Makefile
+build/bin/sage-logger \
"cd build/make && ./install '$@'" logs/install.log

# If configure was run before, rerun it with the old arguments.
# Otherwise, run configure with argument $PREREQ_OPTIONS.
build/make/Makefile: configure
build/make/Makefile: configure build/make/deps build/pkgs/*/*
rm -f config.log
mkdir -p logs/pkgs
ln -s logs/pkgs/config.log config.log
Expand All @@ -42,6 +43,9 @@ download:
export PATH=$$SAGE_ROOT/src/bin:$$PATH && \
./src/bin/sage-download-upstream

dist: build/make/Makefile
./sage --sdist

# ssl: build Sage, and also install pyOpenSSL. This is necessary for
# running the secure notebook. This make target requires internet
# access. Note that this requires that your system have OpenSSL
Expand Down Expand Up @@ -90,56 +94,48 @@ test: all
check: test

testall: all
$(TESTALL) --optional=all --logfile=logs/testall.log
$(TESTALL) --optional=sage,optional,external --logfile=logs/testall.log

testlong: all
$(TESTALL) --long --logfile=logs/testlong.log

testalllong: all
$(TESTALL) --long --optional=all --logfile=logs/testalllong.log
$(TESTALL) --long --optional=sage,optional,external --logfile=logs/testalllong.log

ptest: all
$(PTESTALL) --logfile=logs/ptest.log

ptestall: all
$(PTESTALL) --optional=all --logfile=logs/ptestall.log
$(PTESTALL) --optional=sage,optional,external --logfile=logs/ptestall.log

ptestlong: all
$(PTESTALL) --long --logfile=logs/ptestlong.log

ptestalllong: all
$(PTESTALL) --long --optional=all --logfile=logs/ptestalllong.log

$(PTESTALL) --long --optional=sage,optional,external --logfile=logs/ptestalllong.log

testoptional: testall # just an alias
testoptional: all
$(TESTALL) --optional=sage,optional --logfile=logs/testoptional.log

testoptionallong: testalllong # just an alias
testoptionallong: all
$(TESTALL) --long --optional=sage,optional --logfile=logs/testoptionallong.log

ptestoptional: ptestall # just an alias
ptestoptional: all
$(PTESTALL) --optional=sage,optional --logfile=logs/ptestoptional.log

ptestoptionallong: ptestalllong # just an alias
ptestoptionallong: all
$(PTESTALL) --long --optional=sage,optional --logfile=logs/ptestoptionallong.log

configure: configure.ac src/bin/sage-version.sh \
m4/ax_c_check_flag.m4 m4/ax_gcc_option.m4 m4/ax_gcc_version.m4 m4/ax_gxx_option.m4 m4/ax_gxx_version.m4 m4/ax_prog_perl_version.m4
configure: configure.ac src/bin/sage-version.sh m4/*.m4
./bootstrap -d

install:
echo "Experimental use only!"
if [ "$(DESTDIR)" = "" ]; then \
echo >&2 "Set the environment variable DESTDIR to the install path."; \
exit 1; \
fi
# Make sure we remove only an existing directory. If $(DESTDIR)/sage is
# a file instead of a directory then the mkdir statement later will fail
if [ -d "$(DESTDIR)"/sage ]; then \
rm -rf "$(DESTDIR)"/sage; \
fi
mkdir -p "$(DESTDIR)"/sage
mkdir -p "$(DESTDIR)"/bin
cp -Rp * "$(DESTDIR)"/sage
rm -f "$(DESTDIR)"/bin/sage
ln -s ../sage/sage "$(DESTDIR)"/bin/sage
"$(DESTDIR)"/bin/sage -c # Run sage-location
@echo "******************************************************************"
@echo "The '$@' target is no longer supported:"
@echo "either build SageMath in-place or use the binary packaging scripts"
@echo "from https://github.com/sagemath/binary-pkg"
@echo "******************************************************************"
@exit 1


.PHONY: default build install micro_release \
Expand Down
Loading

0 comments on commit fc7434a

Please sign in to comment.