diff --git a/debian/changelog b/debian/changelog index 03fe832..248dda6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ patroni (1.6.3-2) UNRELEASED; urgency=medium * debian/patches/requirements_setuptools.patch: New patch, add setuptools to requirements, so that python3-pkg-resources is picked up as package dependency by dh_python3. + * debian/patches/offline_intersphinx.patch: New patch, force usage of offline + objects.inv from python-doc package instead of downloading it. + * debian/control (Build-Depends): Added python3-doc. -- Debian PostgreSQL Maintainers Tue, 10 Dec 2019 22:36:02 +0100 diff --git a/debian/control b/debian/control index 401300f..bfd1f35 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: python3-consul (>= 0.7.0), python3-dateutil, python3-dnspython, + python3-doc, python3-etcd (>= 0.4.3), python3-flake8, python3-kazoo, diff --git a/debian/patches/offline_intersphinx.patch b/debian/patches/offline_intersphinx.patch new file mode 100644 index 0000000..9a37e1e --- /dev/null +++ b/debian/patches/offline_intersphinx.patch @@ -0,0 +1,21 @@ +--- ./docs/conf.py.orig 2020-01-23 18:12:00.026645214 +0100 ++++ ./docs/conf.py 2020-01-23 18:13:43.635004952 +0100 +@@ -189,7 +189,17 @@ + + + # Example configuration for intersphinx: refer to the Python standard library. +-intersphinx_mapping = {'https://docs.python.org/': None} ++def check_object_path(key, url, path): ++ if os.path.isfile(path): ++ return {key: (url, path)} ++ return {} ++ ++intersphinx_mapping = {} ++intersphinx_mapping.update(check_object_path('python', ++ 'http://docs.python.org/', ++ '/usr/share/doc/python' ++ + '.'.join([str(x) for x in sys.version_info[0:2]]) ++ + '/html/objects.inv')) + + # A possibility to have an own stylesheet, to add new rules or override existing ones + # For the latter case, the CSS specificity of the rules should be higher than the default ones diff --git a/debian/patches/series b/debian/patches/series index 88c94a2..61e9f5f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ acceptance_tests_system_patroni.patch v12_fix_recovery.conf_parameters.patch skip_failing_tests.patch requirements_setuptools.patch +offline_intersphinx.patch