Hello community,
here is the log from the commit of package python-openstackdocstheme for
openSUSE:Factory checked in at 2020-05-28 09:05:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-openstackdocstheme (Old)
and /work/SRC/openSUSE:Factory/.python-openstackdocstheme.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-openstackdocstheme"
Thu May 28 09:05:06 2020 rev:11 rq:803580 version:1.31.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-openstackdocstheme/python-openstackdocstheme.changes
2020-04-19 21:39:24.434869407 +0200
+++
/work/SRC/openSUSE:Factory/.python-openstackdocstheme.new.3606/python-openstackdocstheme.changes
2020-05-28 09:05:10.227312435 +0200
@@ -1,0 +2,10 @@
+Tue May 12 12:34:22 UTC 2020 - cloud-de...@suse.de
+
+- removed 0001-Catch-any-exception-when-trying-to-call-git.patch
+- update to version 1.31.2
+ - Catch any exception when trying to call "git"
+ - Improve docs title style
+ - Move version dropdown to title line
+ - Fetch generated PDF files correctly
+
+-------------------------------------------------------------------
Old:
----
0001-Catch-any-exception-when-trying-to-call-git.patch
openstackdocstheme-1.31.1.tar.gz
New:
----
openstackdocstheme-1.31.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-openstackdocstheme.spec ++++++
--- /var/tmp/diff_new_pack.XdD9Tm/_old 2020-05-28 09:05:11.095315037 +0200
+++ /var/tmp/diff_new_pack.XdD9Tm/_new 2020-05-28 09:05:11.095315037 +0200
@@ -17,15 +17,13 @@
Name: python-openstackdocstheme
-Version: 1.31.1
+Version: 1.31.2
Release: 0
Summary: OpenStack Docs Theme
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/%{sname}
-Source0:
https://files.pythonhosted.org/packages/source/o/openstackdocstheme/openstackdocstheme-1.31.1.tar.gz
-# https://review.opendev.org/677868
-Patch0: 0001-Catch-any-exception-when-trying-to-call-git.patch
+Source0:
https://files.pythonhosted.org/packages/source/o/openstackdocstheme/openstackdocstheme-1.31.2.tar.gz
BuildRequires: openstack-macros
BuildRequires: python3-Sphinx
BuildRequires: python3-dulwich >= 0.15.0
@@ -48,7 +46,7 @@
to docs.openstack.org. Intended for use by OpenStack projects.
%prep
-%autosetup -p1 -n openstackdocstheme-1.31.1
+%autosetup -p1 -n openstackdocstheme-1.31.2
# we dont need hacking
sed -i '/^hacking.*/d' test-requirements.txt
++++++ _service ++++++
--- /var/tmp/diff_new_pack.XdD9Tm/_old 2020-05-28 09:05:11.139315169 +0200
+++ /var/tmp/diff_new_pack.XdD9Tm/_new 2020-05-28 09:05:11.143315181 +0200
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/train/openstack/openstackdocstheme/openstackdocstheme.spec.j2</param>
+ <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/ussuri/openstack/openstackdocstheme/openstackdocstheme.spec.j2</param>
<param name="output-name">python-openstackdocstheme.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/openstackdocstheme/master/requirements.txt</param>
+ <param
name="requirements">https://opendev.org/openstack/openstackdocstheme/raw/branch/master/requirements.txt</param>
<param name="changelog-email">cloud-de...@suse.de</param>
<param name="changelog-provider">gh,openstack,openstackdocstheme</param>
</service>
++++++ openstackdocstheme-1.31.1.tar.gz -> openstackdocstheme-1.31.2.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openstackdocstheme-1.31.1/.zuul.yaml
new/openstackdocstheme-1.31.2/.zuul.yaml
--- old/openstackdocstheme-1.31.1/.zuul.yaml 2019-08-21 23:34:54.000000000
+0200
+++ new/openstackdocstheme-1.31.2/.zuul.yaml 2019-12-12 11:00:48.000000000
+0100
@@ -1,21 +1,9 @@
-# parent job is defined in openstack-manuals
-- job:
- name: openstackdocsstheme-tox-manuals-buildpdf
- parent: build-tox-manuals-base
- vars:
- tox_envlist: buildpdf
-
-- job:
- name: openstackdocsstheme-tox-manuals-buildpdf-starlingxpdf
- parent: build-tox-manuals-base
- vars:
- tox_envlist: buildpdf-starlingxdocs
-
- job:
name: openstack-tox-docs-starlingxdocs
parent: openstack-tox-docs
vars:
tox_envlist: docs-starlingxdocs
+ tox_pdf_envlist: pdf-docs-starlingxdocs
- project:
templates:
@@ -24,8 +12,6 @@
- release-notes-jobs-python3
check:
jobs:
- - openstackdocsstheme-tox-manuals-buildpdf
- - openstackdocsstheme-tox-manuals-buildpdf-starlingxpdf
- openstack-tox-pep8
- build-openstack-api-ref:
# Override files section of the job so that this builds
@@ -41,8 +27,6 @@
- openstack-tox-docs-starlingxdocs
gate:
jobs:
- - openstackdocsstheme-tox-manuals-buildpdf
- - openstackdocsstheme-tox-manuals-buildpdf-starlingxpdf
- openstack-tox-pep8
- build-openstack-api-ref:
files:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openstackdocstheme-1.31.1/ChangeLog
new/openstackdocstheme-1.31.2/ChangeLog
--- old/openstackdocstheme-1.31.1/ChangeLog 2019-08-21 23:37:41.000000000
+0200
+++ new/openstackdocstheme-1.31.2/ChangeLog 2019-12-12 11:04:41.000000000
+0100
@@ -1,6 +1,14 @@
CHANGES
=======
+1.31.2
+------
+
+* Move version dropdown to title line
+* Improve docs title style
+* Fetch generated PDF files correctly
+* Catch any exception when trying to call "git"
+
1.31.1
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openstackdocstheme-1.31.1/PKG-INFO
new/openstackdocstheme-1.31.2/PKG-INFO
--- old/openstackdocstheme-1.31.1/PKG-INFO 2019-08-21 23:37:41.000000000
+0200
+++ new/openstackdocstheme-1.31.2/PKG-INFO 2019-12-12 11:04:41.000000000
+0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: openstackdocstheme
-Version: 1.31.1
+Version: 1.31.2
Summary: OpenStack Docs Theme
Home-page: https://docs.openstack.org/openstackdocstheme/latest/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openstackdocstheme-1.31.1/doc/source/conf.py
new/openstackdocstheme-1.31.2/doc/source/conf.py
--- old/openstackdocstheme-1.31.1/doc/source/conf.py 2019-08-21
23:34:54.000000000 +0200
+++ new/openstackdocstheme-1.31.2/doc/source/conf.py 2019-12-12
11:00:48.000000000 +0100
@@ -62,6 +62,7 @@
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
- ('index', 'os-doc-demo.tex', u'os-doc-demo Documentation',
+ ('index', 'doc-openstackdocstheme.tex',
+ u'OpenStack Docs Theme Documentation',
u'OpenStack Contributors', 'manual'),
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstackdocstheme-1.31.1/openstackdocstheme/page_context.py
new/openstackdocstheme-1.31.2/openstackdocstheme/page_context.py
--- old/openstackdocstheme-1.31.1/openstackdocstheme/page_context.py
2019-08-21 23:34:54.000000000 +0200
+++ new/openstackdocstheme-1.31.2/openstackdocstheme/page_context.py
2019-12-12 11:00:48.000000000 +0100
@@ -35,7 +35,11 @@
'--', src_file,
]
).decode('utf-8').strip()
- except (subprocess.CalledProcessError, OSError) as err:
+ # NOTE: we catch any exception here (instead of
+ # subprocess.CalledProcessError and OSError) because some projects (eg.
+ # neutron) do import eventlet in docs/source/conf.py which will patch
+ # the subprocess module and with that, the exception is not catched
+ except Exception as err:
LOG.info(
'[openstackdocstheme] Could not get modification time of %s: %s',
src_file, err)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstackdocstheme-1.31.1/openstackdocstheme/theme/openstackdocs/layout.html
new/openstackdocstheme-1.31.2/openstackdocstheme/theme/openstackdocs/layout.html
---
old/openstackdocstheme-1.31.1/openstackdocstheme/theme/openstackdocs/layout.html
2019-08-21 23:34:54.000000000 +0200
+++
new/openstackdocstheme-1.31.2/openstackdocstheme/theme/openstackdocs/layout.html
2019-12-12 11:00:48.000000000 +0100
@@ -39,21 +39,6 @@
<div class="row">
<div class="col-lg-9 col-md-8 col-sm-8 col-lg-push-3 col-md-push-4
col-sm-push-4">
{% include 'titlerow.html' %}
- <div class="row docs-byline">
- <div class="docs-updated">this page last updated: {{ last_updated
}}</div>
- {%- block otherversions %}
- {%- if other_versions %}
- <div class="version-dropdown">
- <span>{{ _('version') }}</span>
- <div class="version-dropdown-content">
- {%- for ver in other_versions: %}
- <p><a href="../{{pathto(ver, 1) }}" rel="nofollow">{{ ver
}}</a></p>
- {%- endfor %}
- </div>
- </div>
- {%- endif %}
- {%- endblock %}
- </div>
<div class="row">
<div class="col-lg-12">
<div class="docs-body" role="main">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstackdocstheme-1.31.1/openstackdocstheme/theme/openstackdocs/static/css/combined.css
new/openstackdocstheme-1.31.2/openstackdocstheme/theme/openstackdocs/static/css/combined.css
---
old/openstackdocstheme-1.31.1/openstackdocstheme/theme/openstackdocs/static/css/combined.css
2019-08-21 23:34:54.000000000 +0200
+++
new/openstackdocstheme-1.31.2/openstackdocstheme/theme/openstackdocs/static/css/combined.css
2019-12-12 11:00:48.000000000 +0100
@@ -374,14 +374,20 @@
/*Docs Version Dropdown*/
.version-dropdown {
+ font-size: 10px;
+ color: #9eb5c3;
+ text-transform: uppercase;
position: relative;
- float: right;
display: inline-block;
+ vertical-align: middle;
+ margin-right: 8px;
+ margin-bottom: 6px;
border: solid 1px;
- padding: 5px; }
+ padding: 3px 5px 3px 5px; }
.version-dropdown-content {
display: none;
+ text-align: left;
position: absolute;
background-color: #f9f9f9;
min-width: 160px;
@@ -647,7 +653,7 @@
.docs-actions .fa-angle-double-left {
border-left: 1px solid #dae5ee;
color: #DA422F;
- padding: 0 10px; }
+ padding: 0 8px 0 10px; }
.docs-actions .fa-angle-double-left:hover {
color: #9A201D; }
@@ -655,7 +661,7 @@
.docs-actions .fa-angle-double-right {
border-left: 1px solid #dae5ee;
color: #DA422F;
- padding: 0 10px; }
+ padding: 0 8px 0 10px; }
.docs-actions .fa-angle-double-right:hover {
color: #9A201D; }
@@ -666,6 +672,11 @@
background: none;
white-space: nowrap; }
+.docs-title {
+ border-bottom: 1px solid #edf2f7;
+ margin-bottom: 30px;
+}
+
.docs-byline {
border-top: 1px solid #edf2f7;
border-bottom: 1px solid #edf2f7;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstackdocstheme-1.31.1/openstackdocstheme/theme/openstackdocs/titlerow.html
new/openstackdocstheme-1.31.2/openstackdocstheme/theme/openstackdocs/titlerow.html
---
old/openstackdocstheme-1.31.1/openstackdocstheme/theme/openstackdocs/titlerow.html
2019-08-21 23:34:54.000000000 +0200
+++
new/openstackdocstheme-1.31.2/openstackdocstheme/theme/openstackdocs/titlerow.html
2019-12-12 11:00:48.000000000 +0100
@@ -1,12 +1,24 @@
-<div class="row">
+<div class="row docs-title">
<div class="col-lg-8">
{%- if theme_sidebar_dropdown == 'os_docs' %}
- <h2>{{ title }}</h2>
+ <h1>{{ title }}</h1>
{% else %}
- <h2>OpenStack API Documentation</h2>
+ <h1>OpenStack API Documentation</h1>
{%- endif %}
</div>
<div class="docs-actions">
+ {%- block otherversions %}
+ {%- if other_versions %}
+ <div class="version-dropdown">
+ <span>{{ _('version') }}</span>
+ <div class="version-dropdown-content">
+ {%- for ver in other_versions: %}
+ <p><a href="../{{pathto(ver, 1) }}" rel="nofollow">{{ ver
}}</a></p>
+ {%- endfor %}
+ </div>
+ </div>
+ {%- endif %}
+ {%- endblock %}
{% if prev %}
<a href="{{ prev.link|e }}"><i class="fa fa-angle-double-left"
data-toggle="tooltip" data-placement="top" title="Previous: {{
prev.title|striptags }}"></i></a>
{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstackdocstheme-1.31.1/openstackdocstheme/theme/starlingxdocs/static/css/combined.css
new/openstackdocstheme-1.31.2/openstackdocstheme/theme/starlingxdocs/static/css/combined.css
---
old/openstackdocstheme-1.31.1/openstackdocstheme/theme/starlingxdocs/static/css/combined.css
2019-08-21 23:34:54.000000000 +0200
+++
new/openstackdocstheme-1.31.2/openstackdocstheme/theme/starlingxdocs/static/css/combined.css
2019-12-12 11:00:48.000000000 +0100
@@ -374,14 +374,20 @@
/*Docs Version Dropdown*/
.version-dropdown {
+ font-size: 10px;
+ color: #9eb5c3;
+ text-transform: uppercase;
position: relative;
- float: right;
display: inline-block;
+ vertical-align: middle;
+ margin-right: 8px;
+ margin-bottom: 6px;
border: solid 1px;
- padding: 5px; }
+ padding: 3px 5px 3px 5px; }
.version-dropdown-content {
display: none;
+ text-align: left;
position: absolute;
background-color: #f9f9f9;
min-width: 160px;
@@ -647,7 +653,7 @@
.docs-actions .fa-angle-double-left {
border-left: 1px solid #dae5ee;
color: #DA422F;
- padding: 0 10px; }
+ padding: 0 8px 0 10px; }
.docs-actions .fa-angle-double-left:hover {
color: #9A201D; }
@@ -655,7 +661,7 @@
.docs-actions .fa-angle-double-right {
border-left: 1px solid #dae5ee;
color: #DA422F;
- padding: 0 10px; }
+ padding: 0 8px 0 10px; }
.docs-actions .fa-angle-double-right:hover {
color: #9A201D; }
@@ -666,6 +672,11 @@
background: none;
white-space: nowrap; }
+.docs-title {
+ border-bottom: 1px solid #edf2f7;
+ margin-bottom: 30px;
+}
+
.docs-byline {
border-top: 1px solid #edf2f7;
border-bottom: 1px solid #edf2f7;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstackdocstheme-1.31.1/openstackdocstheme.egg-info/PKG-INFO
new/openstackdocstheme-1.31.2/openstackdocstheme.egg-info/PKG-INFO
--- old/openstackdocstheme-1.31.1/openstackdocstheme.egg-info/PKG-INFO
2019-08-21 23:37:41.000000000 +0200
+++ new/openstackdocstheme-1.31.2/openstackdocstheme.egg-info/PKG-INFO
2019-12-12 11:04:41.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: openstackdocstheme
-Version: 1.31.1
+Version: 1.31.2
Summary: OpenStack Docs Theme
Home-page: https://docs.openstack.org/openstackdocstheme/latest/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstackdocstheme-1.31.1/openstackdocstheme.egg-info/pbr.json
new/openstackdocstheme-1.31.2/openstackdocstheme.egg-info/pbr.json
--- old/openstackdocstheme-1.31.1/openstackdocstheme.egg-info/pbr.json
2019-08-21 23:37:41.000000000 +0200
+++ new/openstackdocstheme-1.31.2/openstackdocstheme.egg-info/pbr.json
2019-12-12 11:04:41.000000000 +0100
@@ -1 +1 @@
-{"git_version": "ceb0abf", "is_release": true}
\ No newline at end of file
+{"git_version": "a4dbd76", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openstackdocstheme-1.31.1/tox.ini
new/openstackdocstheme-1.31.2/tox.ini
--- old/openstackdocstheme-1.31.1/tox.ini 2019-08-21 23:34:54.000000000
+0200
+++ new/openstackdocstheme-1.31.2/tox.ini 2019-12-12 11:00:48.000000000
+0100
@@ -27,18 +27,19 @@
[testenv:docs]
basepython = python3
commands =
- rm -rf doc/build api-ref/build
+ rm -rf doc/build/html doc/build/doctrees
sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
[testenv:docs-starlingxdocs]
basepython = python3
+envdir = {toxworkdir}/docs
commands =
- rm -rf doc/build api-ref/build
+ rm -rf doc/build/html doc/build/doctrees
sphinx-build -a -E -W -d doc/build/doctrees -b html -D
html_theme=starlingxdocs doc/source doc/build/html
[testenv:html]
commands =
- rm -rf doc/build api-ref/build
+ rm -rf doc/build/html doc/build/doctrees api-ref/build
sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
sphinx-build -a -E -W -d api-ref/build/doctrees -b html api-ref/source
api-ref/build/html
@@ -66,31 +67,21 @@
rm -rf api-ref/build
sphinx-build -a -E -W -d api-ref/build/doctrees -b html -D
html_theme=starlingxdocs api-ref/source api-ref/build/html
-[testenv:buildpdf]
-# Only build PDF and push it to publish-docs folder so that OpenStack
-# CI jobs will publish it.
-whitelist_externals =
- make
- cp
- mkdir
+[testenv:pdf-docs]
+basepython = python3
+envdir = {toxworkdir}/docs
commands =
- sphinx-build -a -E -W -d doc/build/doctrees -b latex doc/source doc/build/pdf
+ rm -rf doc/build/pdf
+ sphinx-build -a -E -W -b latex doc/source doc/build/pdf
make -C doc/build/pdf
- mkdir -p publish-docs
- cp doc/build/pdf/os-doc-demo.pdf publish-docs
-[testenv:buildpdf-starlingxdocs]
-# Only build PDF and push it to publish-docs folder so that OpenStack
-# CI jobs will publish it.
-whitelist_externals =
- make
- cp
- mkdir
+[testenv:pdf-docs-starlingxdocs]
+basepython = python3
+envdir = {toxworkdir}/docs
commands =
- sphinx-build -a -E -W -d doc/build/doctrees -b latex -D
html_theme=starlingxdocs doc/source doc/build/pdf
+ rm -rf doc/build/pdf
+ sphinx-build -a -E -W -b latex -D html_theme=starlingxdocs doc/source
doc/build/pdf
make -C doc/build/pdf
- mkdir -p publish-docs
- cp doc/build/pdf/os-doc-demo.pdf publish-docs
[testenv:bindep]
# Do not install any requirements. We want this to be fast and work even if
