Merge branch 'develop' of https://github.com/sagemath/sage into HEAD

Author: Dicolevrai

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.0.rc0, Release Date: 2019-12-26
+SageMath version 9.0.rc1, Release Date: 2019-12-29

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=e7ff5e713229f17fe8323d3def8444c2ae04b3a7
-md5=4fc29cbebd3f969fffdb00caa0ad6423
-cksum=803325929
+sha1=ac323e7a24f9d8ebfcf4d5998ee09cff31e50877
+md5=7d43a45087d30296ff4c9b3ef77597ef
+cksum=1450157022

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-127f3664664edef63a333470fc68f24be9edfe68
+7f941838a69eb6bf2715b8217ec5570d780d3622

build/pkgs/psutil/patches/cygwin-support.patch

@@ -1267,7 +1267,7 @@ new file mode 100644
 index 0000000..e2f9e94
 --- /dev/null
 +++ b/psutil/_psutil_cygwin.c
-@@ -0,0 +1,2025 @@
+@@ -0,0 +1,2035 @@
 +#define WIN32_LEAN_AND_MEAN
 +
 +#include <windows.h>
@@ -1904,8 +1904,18 @@ index 0000000..e2f9e94
 +        return NULL;
 +
 +    num_handles = process->HandleCount;
-+    for (i = 0; i < process->NumberOfThreads; i++)
++    for (i = 0; i < process->NumberOfThreads; i++) {
++        // The updated headers in mingw-w64 appear to be using an older version
++        // of this API in which the ContextSwitches member is still called
++        // Reserved3
++#if __MINGW64_VERSION_MAJOR < 7
++        // Using the copy of this struct definition included in psutil
 +        ctx_switches += process->Threads[i].ContextSwitches;
++#else
++        // Using the definition from mingw-w64-w32api-headers
++        ctx_switches += process->Threads[i].Reserved3;
++#endif
++    }
 +    user_time = (double)process->UserTime.HighPart * 429.4967296 + \
 +                (double)process->UserTime.LowPart * 1e-7;
 +    kernel_time = (double)process->KernelTime.HighPart * 429.4967296 + \
@@ -3465,28 +3475,38 @@ index 1bbbf2a..0d50f5b 100644
  } KTHREAD_STATE, *PKTHREAD_STATE;
 
 
-+#ifndef __CYGWIN__
++#ifndef __MINGW64_VERSION_MAJOR
  typedef enum _KWAIT_REASON {
      Executive = 0,
      FreePage = 1,
-@@ -168,6 +169,8 @@ typedef struct _CLIENT_ID {
+@@ -168,7 +169,10 @@ typedef struct _CLIENT_ID {
      HANDLE UniqueThread;
  } CLIENT_ID, *PCLIENT_ID;
 
 +#endif
-+
 
++
++#if !defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 7
  typedef struct _SYSTEM_THREAD_INFORMATION {
      LARGE_INTEGER KernelTime;
-@@ -287,6 +290,7 @@ typedef NTSTATUS (NTAPI *_NtSetInformationProcess)(
+     LARGE_INTEGER UserTime;
+@@ -182,6 +186,7 @@ typedef struct _SYSTEM_THREAD_INFORMATION {
+     ULONG ThreadState;
+     KWAIT_REASON WaitReason;
+ } SYSTEM_THREAD_INFORMATION, *PSYSTEM_THREAD_INFORMATION;
++#endif
+ 
+ 
+ typedef struct _TEB *PTEB;
+@@ -287,6 +292,7 @@ typedef NTSTATUS (NTAPI *_NtSetInformationProcess)(
  );
 
 
 +#ifndef __CYGWIN__
  typedef enum _PROCESSINFOCLASS2 {
      _ProcessBasicInformation,
      ProcessQuotaLimits,
-@@ -338,4 +342,6 @@ typedef enum _PROCESSINFOCLASS2 {
+@@ -338,4 +344,6 @@ typedef enum _PROCESSINFOCLASS2 {
  #define ProcessImageFileName _ProcessImageFileName
  #define ProcessBreakOnTermination _ProcessBreakOnTermination
 

build/pkgs/singular/spkg-install

@@ -85,6 +85,7 @@ config()
                   --enable-factory \
                   --disable-doc \
                   --disable-polymake \
+                  --with-python=sage-python23 \
                   $SINGULAR_CONFIGURE
 }
 

docker/README.md

@@ -1,4 +1,4 @@
-[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://github.com/sagemath/sage/COPYING.txt) [![Maintained](https://img.shields.io/maintenance/yes/2019.svg)](https://github.com/sagemath/sage/commits/master)
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://github.com/sagemath/sage/COPYING.txt) [![Maintained](https://img.shields.io/maintenance/yes/2020.svg)](https://github.com/sagemath/sage/commits/master)
 
 # Supported tags
 

src/bin/sage-version.sh

@@ -1,5 +1,5 @@
 # Sage version information for shell scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='9.0.rc0'
-SAGE_RELEASE_DATE='2019-12-26'
-SAGE_VERSION_BANNER='SageMath version 9.0.rc0, Release Date: 2019-12-26'
+SAGE_VERSION='9.0.rc1'
+SAGE_RELEASE_DATE='2019-12-29'
+SAGE_VERSION_BANNER='SageMath version 9.0.rc1, Release Date: 2019-12-29'

src/sage/version.py

@@ -1,5 +1,5 @@
 # Sage version information for Python scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-version = '9.0.rc0'
-date = '2019-12-26'
-banner = 'SageMath version 9.0.rc0, Release Date: 2019-12-26'
+version = '9.0.rc1'
+date = '2019-12-29'
+banner = 'SageMath version 9.0.rc1, Release Date: 2019-12-29'