From 65ab77b6392a0b4f0832a35fd9145ab13beb9acd Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Fri, 25 May 2018 18:26:47 +0200 Subject: [PATCH 1/4] Allow to override sitemap time in order to make builds reproducible. See https://reproducible-builds.org/ for why this is good and https://reproducible-builds.org/specs/source-date-epoch/ for the definition of this variable. --- doc/sitemap_gen.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/sitemap_gen.py b/doc/sitemap_gen.py index e270a39d..fa6a01f8 100755 --- a/doc/sitemap_gen.py +++ b/doc/sitemap_gen.py @@ -2020,6 +2020,9 @@ def OpenFileForRead(path, logtext): def TimestampISO8601(t): """Seconds since epoch (1970-01-01) --> ISO 8601 time string.""" + sde = int(os.environ.get('SOURCE_DATE_EPOCH', time.time())) + if t > sde: + t = sde return time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(t)) #end def TimestampISO8601 From 222f9326c77b3251bd623e91b618562550267b8c Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Sat, 26 May 2018 03:52:54 +0200 Subject: [PATCH 2/4] Fix travis was failing with no such option: --use-mirrors --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6bededb8..4d016458 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ python: - 2.7 install: - - pip install -r requirements_dev.txt --use-mirrors + - pip install -r requirements_dev.txt - python setup.py install script: python setup.py test From 139c5e9805a9dcff7238b644862a7ff6d9fd800f Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Sat, 26 May 2018 04:01:55 +0200 Subject: [PATCH 3/4] travis: replace unreachable logo URL travis said ERROR: tests.004-test-client.test_008 ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/travis/virtualenv/python2.7.14/lib/python2.7/site-packages/nose/case.py", line 197, in runTest self.test(*self.arg) File "/home/travis/virtualenv/python2.7.14/lib/python2.7/site-packages/nose/util.py", line 620, in newfunc return func(*arg, **kw) File "/home/travis/build/benoitc/restkit/tests/t.py", line 73, in run func(self.url, cli) File "/home/travis/build/benoitc/restkit/tests/004-test-client.py", line 129, in test_008 r = c.request(u) File "/home/travis/build/benoitc/restkit/restkit/client.py", line 416, in request return self.perform(request) File "/home/travis/build/benoitc/restkit/restkit/client.py", line 352, in perform raise RequestError(str(e)) RequestError: [Errno -2] Name or service not known -------------------- >> begin captured logging << -------------------- restkit.client: DEBUG: Start to perform request: e-engura.com GET /images/logo.gif $ host www.e-engura.com Host www.e-engura.com not found: 3(NXDOMAIN) $ host e-engura.com Host e-engura.com not found: 3(NXDOMAIN) --- tests/004-test-client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/004-test-client.py b/tests/004-test-client.py index bff92b1e..d75a1712 100644 --- a/tests/004-test-client.py +++ b/tests/004-test-client.py @@ -112,7 +112,7 @@ def test_006(u, c): t.eq(r.body_string(), "ok") -@t.client_request('http://e-engura.com/images/logo.gif') +@t.client_request('http://www.lsmod.de/~bernhard/mirror/e-engura.com/images/logo.gif') def test_007(u, c): r = c.request(u) print r.status @@ -124,7 +124,7 @@ def test_007(u, c): t.eq(imghdr.what(fname), 'gif') -@t.client_request('http://e-engura.com/images/logo.gif') +@t.client_request('http://www.lsmod.de/~bernhard/mirror/e-engura.com/images/logo.gif') def test_008(u, c): r = c.request(u) t.eq(r.status_int, 200) From d39da5209e6b663aa09f36098802cd23aa4e0b91 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Sat, 26 May 2018 04:15:57 +0200 Subject: [PATCH 4/4] travis: drop python-2.6 travis said DEPRECATION: Python 2.6 is no longer supported by the Python core team, please upgrade your Python. A future version of pip will drop support for Python 2.6 Sphinx requires Python '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*' but the running Python is 2.6.9 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4d016458..d5365b92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: python python: - - 2.6 - 2.7 install: