[Python-modules-commits] [python-mkdocs] 01/06: Remove git-dpm; unapply patches

[Brian May]

This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch debian/experimental
in repository python-mkdocs.

commit a9506ab91572c4680f1762d83034fc9a3810cc53
Author: Brian May <bam at debian.org>
Date:   Thu Mar 9 08:21:28 2017 +1100

    Remove git-dpm; unapply patches
---
 debian/.git-dpm                             | 11 -----------
 mkdocs/__init__.py                          |  2 --
 mkdocs/commands/build.py                    |  3 +--
 mkdocs/nav.py                               |  6 +-----
 mkdocs/tests/config/config_options_tests.py |  1 +
 mkdocs/tests/config/config_tests.py         |  1 +
 6 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index d6b494c..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-f37eb5e81c996800e2e69180fa225dfef3943c84
-f37eb5e81c996800e2e69180fa225dfef3943c84
-47dd578a2b91cacc50aec47aff24b7b75581e08a
-47dd578a2b91cacc50aec47aff24b7b75581e08a
-python-mkdocs_0.15.3.orig.tar.gz
-544760693a444da8f7b005ddc69b30e8ad69f3df
-1805972
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff --git a/mkdocs/__init__.py b/mkdocs/__init__.py
index 6fe2e34..170bf76 100644
--- a/mkdocs/__init__.py
+++ b/mkdocs/__init__.py
@@ -5,8 +5,6 @@ from __future__ import unicode_literals
 
 import sys
 
-sys.path.insert(1, "/usr/share/mkdocs/themes")
-
 if sys.version_info < (2, 7):
     sys.stderr.write(("WARNING: Support for Python 2.6 will be dropped in the "
                       "1.0.0 release of MkDocs\n\n"))
diff --git a/mkdocs/commands/build.py b/mkdocs/commands/build.py
index 66fef62..614173d 100644
--- a/mkdocs/commands/build.py
+++ b/mkdocs/commands/build.py
@@ -5,7 +5,6 @@ from datetime import datetime
 import io
 import logging
 import os
-import time
 
 from jinja2.exceptions import TemplateNotFound
 import jinja2
@@ -84,7 +83,7 @@ def get_global_context(nav, config):
         'google_analytics': config['google_analytics'],
 
         'mkdocs_version': mkdocs.__version__,
-        'build_date_utc': datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))),
+        'build_date_utc': datetime.utcnow(),
 
         'config': config
     }
diff --git a/mkdocs/nav.py b/mkdocs/nav.py
index 07f6505..b72e21f 100644
--- a/mkdocs/nav.py
+++ b/mkdocs/nav.py
@@ -137,11 +137,7 @@ class Page(object):
         self.abs_url = url
         self.active = False
         self.url_context = url_context
-
-        try:
-            self.update_date = datetime.datetime.utcfromtimestamp(int(os.environ['SOURCE_DATE_EPOCH']))
-        except KeyError:
-            self.update_date = datetime.datetime.now().strftime("%Y-%m-%d")
+        self.update_date = datetime.datetime.now().strftime("%Y-%m-%d")
 
         # Relative paths to the input markdown file and output html file.
         self.input_path = path
diff --git a/mkdocs/tests/config/config_options_tests.py b/mkdocs/tests/config/config_options_tests.py
index 9813334..d16f675 100644
--- a/mkdocs/tests/config/config_options_tests.py
+++ b/mkdocs/tests/config/config_options_tests.py
@@ -179,6 +179,7 @@ class SiteDirTest(unittest.TestCase):
             {'docs_dir': '.', 'site_dir': '.'},
             {'docs_dir': 'docs', 'site_dir': ''},
             {'docs_dir': '', 'site_dir': ''},
+            {'docs_dir': j('..', 'mkdocs', 'docs'), 'site_dir': 'docs'},
         )
 
         for test_config in test_configs:
diff --git a/mkdocs/tests/config/config_tests.py b/mkdocs/tests/config/config_tests.py
index 7c82535..04e51de 100644
--- a/mkdocs/tests/config/config_tests.py
+++ b/mkdocs/tests/config/config_tests.py
@@ -192,6 +192,7 @@ class ConfigTests(unittest.TestCase):
             {'docs_dir': '.', 'site_dir': '.'},
             {'docs_dir': 'docs', 'site_dir': ''},
             {'docs_dir': '', 'site_dir': ''},
+            {'docs_dir': j('..', 'mkdocs', 'docs'), 'site_dir': 'docs'},
         )
 
         conf = {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-mkdocs.git