From 879c401a54a4c4cb9e0d77fadd1f010c44d9b2a8 Mon Sep 17 00:00:00 2001 From: Jeroen Demeyer Date: Wed, 25 Jan 2017 12:16:23 +0100 Subject: [PATCH] Upgrade to Sphinx 1.5.3 --- build/pkgs/requests/SPKG.txt | 6 ++++++ build/pkgs/requests/checksums.ini | 4 ++++ build/pkgs/requests/dependencies | 5 +++++ build/pkgs/requests/package-version.txt | 1 + build/pkgs/requests/spkg-install | 3 +++ build/pkgs/requests/type | 1 + build/pkgs/sphinx/checksums.ini | 6 +++--- build/pkgs/sphinx/dependencies | 2 +- build/pkgs/sphinx/package-version.txt | 2 +- build/pkgs/sphinx/patches/Makefile.patch | 21 --------------------- build/pkgs/sphinx/patches/environment.patch | 18 ------------------ 11 files changed, 25 insertions(+), 44 deletions(-) create mode 100644 build/pkgs/requests/SPKG.txt create mode 100644 build/pkgs/requests/checksums.ini create mode 100644 build/pkgs/requests/dependencies create mode 100644 build/pkgs/requests/package-version.txt create mode 100755 build/pkgs/requests/spkg-install create mode 100644 build/pkgs/requests/type delete mode 100644 build/pkgs/sphinx/patches/Makefile.patch delete mode 100644 build/pkgs/sphinx/patches/environment.patch diff --git a/build/pkgs/requests/SPKG.txt b/build/pkgs/requests/SPKG.txt new file mode 100644 index 00000000000..5f5a73a5fc2 --- /dev/null +++ b/build/pkgs/requests/SPKG.txt @@ -0,0 +1,6 @@ += requests = + +== Description == + +Requests is the only Non-GMO HTTP library for Python, safe for human +consumption. diff --git a/build/pkgs/requests/checksums.ini b/build/pkgs/requests/checksums.ini new file mode 100644 index 00000000000..2eb73f76df9 --- /dev/null +++ b/build/pkgs/requests/checksums.ini @@ -0,0 +1,4 @@ +tarball=requests-VERSION.tar.gz +sha1=827f7c8abb5a57d980d9870908724613b8b120c1 +md5=921ec6b48f2ddafc8bb6160957baf444 +cksum=3618433743 diff --git a/build/pkgs/requests/dependencies b/build/pkgs/requests/dependencies new file mode 100644 index 00000000000..d5dab729e18 --- /dev/null +++ b/build/pkgs/requests/dependencies @@ -0,0 +1,5 @@ +$(PYTHON) | pip + +---------- +All lines of this file are ignored except the first. +It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile. diff --git a/build/pkgs/requests/package-version.txt b/build/pkgs/requests/package-version.txt new file mode 100644 index 00000000000..fb2c0766b7c --- /dev/null +++ b/build/pkgs/requests/package-version.txt @@ -0,0 +1 @@ +2.13.0 diff --git a/build/pkgs/requests/spkg-install b/build/pkgs/requests/spkg-install new file mode 100755 index 00000000000..c1a2289ade0 --- /dev/null +++ b/build/pkgs/requests/spkg-install @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +cd src && $PIP_INSTALL . diff --git a/build/pkgs/requests/type b/build/pkgs/requests/type new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/requests/type @@ -0,0 +1 @@ +standard diff --git a/build/pkgs/sphinx/checksums.ini b/build/pkgs/sphinx/checksums.ini index 6b5bf7ccd4c..a353d48c696 100644 --- a/build/pkgs/sphinx/checksums.ini +++ b/build/pkgs/sphinx/checksums.ini @@ -1,4 +1,4 @@ tarball=Sphinx-VERSION.tar.gz -sha1=87ef31c2ce8c556a1644c53d21526eac7ad45f38 -md5=64ce2ec08d37ed56313a98232cbe2aee -cksum=759415183 +sha1=e296be1f697ba5eda7941570d718544df8182648 +md5=6a9522761bde569a3d50cc4509e313d9 +cksum=549728909 diff --git a/build/pkgs/sphinx/dependencies b/build/pkgs/sphinx/dependencies index cc85f403234..02e5fd48e2a 100644 --- a/build/pkgs/sphinx/dependencies +++ b/build/pkgs/sphinx/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | setuptools pip docutils jinja2 pygments six snowballstemmer imagesize babel alabaster +$(PYTHON) | setuptools pip docutils jinja2 pygments six snowballstemmer imagesize babel alabaster requests ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/sphinx/package-version.txt b/build/pkgs/sphinx/package-version.txt index 6bcecfc82d3..5c7efb1863a 100644 --- a/build/pkgs/sphinx/package-version.txt +++ b/build/pkgs/sphinx/package-version.txt @@ -1 +1 @@ -1.4.4.p0 +1.5.3.p0 diff --git a/build/pkgs/sphinx/patches/Makefile.patch b/build/pkgs/sphinx/patches/Makefile.patch deleted file mode 100644 index 8b695e32a57..00000000000 --- a/build/pkgs/sphinx/patches/Makefile.patch +++ /dev/null @@ -1,21 +0,0 @@ -Increase the memory sizes for LaTeX - -These increased stack sizes should be sufficient for LaTeX to handle the -huge index of the Sage PDF reference manual. - -diff -ru a/sphinx/texinputs/Makefile b/sphinx/texinputs/Makefile ---- a/sphinx/texinputs/Makefile 2016-03-06 06:25:30.000000000 +0100 -+++ b/sphinx/texinputs/Makefile 2016-04-06 19:33:07.248103397 +0200 -@@ -11,8 +11,10 @@ - # format: pdf or dvi - FMT = pdf - --LATEX = latex --PDFLATEX = pdflatex -+LATEXENV = env pool_size=4000000 save_size=50000 extra_mem_top=2000000 -+ -+LATEX = $(LATEXENV) latex -+PDFLATEX = $(LATEXENV) pdflatex - MAKEINDEX = makeindex - - all: $(ALLPDF) diff --git a/build/pkgs/sphinx/patches/environment.patch b/build/pkgs/sphinx/patches/environment.patch deleted file mode 100644 index d14ae5d7920..00000000000 --- a/build/pkgs/sphinx/patches/environment.patch +++ /dev/null @@ -1,18 +0,0 @@ -Prevent Sphinx from rebuilding documentation that is already built - ---- Sphinx-1.2.2/sphinx/environment.py.orig 2014-03-02 20:38:09.000000000 +1300 -+++ Sphinx-1.2.2/sphinx/environment.py 2014-10-19 23:31:15.000000000 +1300 -@@ -540,10 +540,13 @@ - else: - # check if a config value was changed that affects how - # doctrees are read -+ import inspect - for key, descr in iteritems(config.values): - if descr[1] != 'env': - continue - if self.config[key] != config[key]: -+ if inspect.isfunction(config[key]): -+ continue - msg = '[config changed] ' - config_changed = True - break