Merge branch 'develop' into t/21413/21413/class_ring_extension

Conflicts:
	src/sage/rings/morphism.pyx
	src/sage/rings/ring.pyx
	src/sage/structure/element.pxd
	src/sage/structure/element.pyx

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,3 @@
+Unfortunately we are not accepting issues on GitHub yet. To report an issue,
+please head over to https://trac.sagemath.org, log in with your GitHub account,
+and create a ticket there :)

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,8 @@
+Thanks for contributing to Sage! Unfortunately we are not accepting pull
+requests on GitHub yet. To propose a change to Sage, please log in with your
+GitHub account at https://trac.sagemath.org, create a ticket, and push your
+changes to that ticket as explained in our
+[Developer's Guide](https://doc.sagemath.org/html/en/developer/manual_git.html).
+
+Please make sure to also have a look at our
+[Code Style Conventions](https://doc.sagemath.org/html/en/developer/coding_basics.html).

COPYING.txt

@@ -54,6 +54,7 @@ extcode                     GPLv2+
 fflas_ffpack                LGPLv2.1+
 flint                       GPLv2+
 flintqs                     GPLv2+
+fplll                       LGPLv2.1+
 freetype                    FreeType License (similar to BSD; see below)
 gap                         GPLv2+
 gcc                         GPLv3+
@@ -72,7 +73,6 @@ jinja2                      Modified BSD
 jmol                        LGPLv2.1+
 jsonschema                  MIT License
 lcalc                       GPLv2+
-libfplll                    LGPLv2.1+
 libgap                      GPLv3+
 libpng                      Custom, very similar to zlib
 linbox                      LGPLv2.1+
@@ -105,7 +105,6 @@ planarity                   Modified BSD
 polybori                    GPLv2+
 polytopes_db                None (database)
 ppl                         GPLv3+
-pycrypto                    Public domain & Python License
 pygments                    Modified BSD
 pynac                       GPLv2+
 pyparsing                   MIT License
@@ -1169,76 +1168,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ================================================================================
 
-pycrypto:
-
-Previously, the copyright and/or licensing status of the Python
-Cryptography Toolkit ("PyCrypto") had been somewhat ambiguous.  The
-original intention of Andrew M. Kuchling and other contributors has
-been to dedicate PyCrypto to the public domain, but that intention was
-not necessarily made clear in the original disclaimer (see
-LEGAL/copy/LICENSE.orig).
-
-Additionally, some files within PyCrypto had specified their own
-licenses that differed from the PyCrypto license itself.  For example,
-the original RIPEMD.c module simply had a copyright statement and
-warranty disclaimer, without clearly specifying any license terms.
-(An updated version on the author's website came with a license that
-contained a GPL-incompatible advertising clause.)
-
-To rectify this situation for PyCrypto 2.1, the following steps have
-been taken:
-
- 1. Obtaining explicit permission from the original contributors to
-    dedicate their contributions to the public domain if they have not
-    already done so.  (See the "LEGAL/copy/stmts" directory for
-    contributors' statements.)
-
- 2. Replacing some modules with clearly-licensed code from other
-    sources (e.g. the DES and DES3 modules were replaced with new ones
-    based on Tom St. Denis's public-domain LibTomCrypt library.)
-
- 3. Replacing some modules with code written from scratch (e.g. the
-    RIPEMD and Blowfish modules were re-implemented from their
-    respective algorithm specifications without reference to the old
-    implementations).
-
- 4. Removing some modules altogether without replacing them.
-
-To the best of our knowledge, with the exceptions noted below or
-within the files themselves, the files that constitute PyCrypto are in
-the public domain.  Most are distributed with the following notice:
-
-  The contents of this file are dedicated to the public domain.  To
-  the extent that dedication to the public domain is not available,
-  everyone is granted a worldwide, perpetual, royalty-free,
-  non-exclusive license to exercise all rights associated with the
-  contents of this file for any purpose whatsoever.
-  No rights are reserved.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-
-Exception:
-
- - Portions of HMAC.py and setup.py are derived from Python 2.2, and
-   are therefore Copyright (c) 2001, 2002, 2003 Python Software
-   Foundation (All Rights Reserved).  They are licensed by the PSF
-   under the terms of the Python 2.2 license.  (See the file
-   LEGAL/copy/LICENSE.python-2.2 for details.)
-
-EXPORT RESTRICTIONS:
-
-Note that the export or re-export of cryptographic software and/or
-source code may be subject to regulation in your jurisdiction.
-
-================================================================================
-
 python:
 
 PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2

Makefile

@@ -9,12 +9,27 @@
 
 default: all
 
-build: all-build
+all: base-toolchain
+	$(MAKE) all-start
+
+build: base-toolchain
+	$(MAKE) all-build
+
+start: base-toolchain
+	$(MAKE) build-start
+
+sageruntime: base-toolchain
+	$(MAKE) all-sageruntime
+
+
+# The --stop flag below is just a random flag to induce graceful
+# breakage with non-GNU versions of make.
+# See https://trac.sagemath.org/ticket/24617
 
 # Defer unknown targets to build/make/Makefile
 %::
 	@if [ -x relocate-once.py ]; then ./relocate-once.py; fi
-	$(MAKE) build/make/Makefile
+	$(MAKE) build/make/Makefile --stop
 	+build/bin/sage-logger \
 		"cd build/make && ./install '$@'" logs/install.log
 
@@ -37,6 +52,13 @@ build/make/Makefile: configure build/make/deps build/pkgs/*/*
 			echo "Since 'SAGE_PORT' is set, we will try to build anyway."; \
 		fi; )
 
+# This is used to monitor progress towards Python 3 and prevent
+# regressions. The target "build" should be upgraded to reflect the
+# level of Python 3 support that is known to work.
+buildbot-python3: configure
+	./configure --with-python=3
+	$(MAKE) build
+
 # Preemptively download all standard upstream source tarballs.
 download:
 	export SAGE_ROOT=$$(pwd) && \
@@ -71,6 +93,7 @@ distclean: build-clean
 	$(MAKE) misc-clean
 	@echo "Deleting all remaining output from build system ..."
 	rm -rf local
+	rm -f src/bin/sage-env-config
 
 # Delete all auto-generated files which are distributed as part of the
 # source tarball
@@ -129,16 +152,21 @@ ptestoptionallong: all
 configure: configure.ac src/bin/sage-version.sh m4/*.m4
 	./bootstrap -d
 
-install:
+install: all
 	@echo "******************************************************************"
-	@echo "The '$@' target is no longer supported:"
-	@echo "either build SageMath in-place or use the binary packaging scripts"
+	@echo "The '$@' target is a no-op; 'make' already does 'make install'"
+	@echo "You can change the install prefix from its default"
+	@echo "(the subdirectory 'local') by using ./configure --prefix=PREFIX"
+	@echo "You can also consider using the binary packaging scripts"
 	@echo "from https://github.com/sagemath/binary-pkg"
 	@echo "******************************************************************"
-	@exit 1
 
+list:
+	@$(MAKE) --silent build/make/Makefile >&2
+	@$(MAKE) --silent -f build/make/Makefile SAGE_SPKG_INST=local $@
 
 .PHONY: default build install micro_release \
 	misc-clean bdist-clean distclean bootstrap-clean maintainer-clean \
 	test check testoptional testall testlong testoptionallong testallong \
-	ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong
+	ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong \
+	buildbot-python3 list