Hello community,
here is the log from the commit of package python-oslo.concurrency for
openSUSE:Factory checked in at 2018-01-17 21:58:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oslo.concurrency (Old)
and /work/SRC/openSUSE:Factory/.python-oslo.concurrency.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.concurrency"
Wed Jan 17 21:58:27 2018 rev:9 rq:566504 version:3.24.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-oslo.concurrency/python-oslo.concurrency.changes
2017-08-28 15:31:25.684445935 +0200
+++
/work/SRC/openSUSE:Factory/.python-oslo.concurrency.new/python-oslo.concurrency.changes
2018-01-17 21:59:33.959685102 +0100
@@ -1,0 +2,29 @@
+Mon Jan 15 11:50:29 UTC 2018 - [email protected]
+
+- update to version 3.24.0
+ - Imported Translations from Zanata
+ - Remove setting of version/release from releasenotes
+ - Remove -U from pip install
+ - Updated from global requirements
+ - Avoid tox_install.sh for constraints support
+
+-------------------------------------------------------------------
+Fri Nov 24 23:01:53 UTC 2017 - [email protected]
+
+- update to version 3.23.0
+ - Add debug log to indicate when external lock is taken
+ - Update reno for stable/pike
+ - Minor correction to docstrings
+ - Windows: ensure exec calls don't block other greenthreads
+ - Updated from global requirements
+
+-------------------------------------------------------------------
+Thu Sep 28 06:57:11 UTC 2017 - [email protected]
+
+- update to version 3.21.1
+ - Update .gitreview for stable/pike
+ - Windows: ensure exec calls don't block other greenthreads
+ - Updated from global requirements
+ - Update UPPER_CONSTRAINTS_FILE for stable/pike
+
+-------------------------------------------------------------------
Old:
----
oslo.concurrency-3.21.0.tar.gz
New:
----
oslo.concurrency-3.24.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-oslo.concurrency.spec ++++++
--- /var/tmp/diff_new_pack.IVZkmJ/_old 2018-01-17 21:59:34.447662230 +0100
+++ /var/tmp/diff_new_pack.IVZkmJ/_new 2018-01-17 21:59:34.451662042 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-oslo.concurrency
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,65 +16,87 @@
#
-%global sname oslo.concurrency
Name: python-oslo.concurrency
-Version: 3.21.0
+Version: 3.24.0
Release: 0
Summary: OpenStack oslo.concurrency library
License: Apache-2.0
Group: Development/Languages/Python
-Url: https://launchpad.net/%{sname}
-Source0:
https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz
+Url: https://launchpad.net/oslo.concurrency
+Source0:
https://files.pythonhosted.org/packages/source/o/oslo.concurrency/oslo.concurrency-3.24.0.tar.gz
BuildRequires: openstack-macros
BuildRequires: python-devel
-BuildRequires: python-enum34
-BuildRequires: python-eventlet >= 0.18.2
-BuildRequires: python-fasteners >= 0.7
-BuildRequires: python-fixtures >= 3.0.0
-BuildRequires: python-futures >= 3.0
-BuildRequires: python-mock >= 2.0
-BuildRequires: python-oslo.config >= 4.0.0
-BuildRequires: python-oslo.i18n >= 2.1.0
-BuildRequires: python-oslo.utils >= 3.20.0
-BuildRequires: python-oslotest >= 1.10.0
-BuildRequires: python-pbr >= 2.0.0
-BuildRequires: python-testrepository >= 0.0.18
-BuildRequires: python-testscenarios >= 0.4
-BuildRequires: python-testtools >= 1.4.0
-Requires: python-enum34
-Requires: python-fasteners >= 0.7
+BuildRequires: python2-enum34 >= 1.0.4
+BuildRequires: python2-eventlet >= 0.18.2
+BuildRequires: python2-fasteners >= 0.7.0
+BuildRequires: python2-fixtures >= 3.0.0
+BuildRequires: python2-futures >= 3.0.0
+BuildRequires: python2-mock >= 2.0.0
+BuildRequires: python2-oslo.config >= 4.6.0
+BuildRequires: python2-oslo.i18n >= 3.15.3
+BuildRequires: python2-oslo.utils >= 3.31.0
+BuildRequires: python2-oslotest >= 1.10.0
+BuildRequires: python2-pbr >= 2.0.0
+BuildRequires: python2-testrepository >= 0.0.18
+BuildRequires: python2-testscenarios >= 0.4
+BuildRequires: python2-testtools >= 2.2.0
+BuildRequires: python3-eventlet >= 0.18.2
+BuildRequires: python3-fasteners >= 0.7.0
+BuildRequires: python3-fixtures >= 3.0.0
+BuildRequires: python3-mock >= 2.0.0
+BuildRequires: python3-oslo.config >= 4.6.0
+BuildRequires: python3-oslo.i18n >= 3.15.3
+BuildRequires: python3-oslo.utils >= 3.31.0
+BuildRequires: python3-oslotest >= 1.10.0
+BuildRequires: python3-pbr >= 2.0.0
+BuildRequires: python3-testrepository >= 0.0.18
+BuildRequires: python3-testscenarios >= 0.4
+BuildRequires: python3-testtools >= 2.2.0
+Requires: python-fasteners >= 0.7.0
Requires: python-iso8601 >= 0.1.11
-Requires: python-oslo.config >= 4.0.0
-Requires: python-oslo.i18n >= 2.1.0
-Requires: python-oslo.utils >= 3.20.0
+Requires: python-oslo.config >= 4.6.0
+Requires: python-oslo.i18n >= 3.15.3
+Requires: python-oslo.utils >= 3.31.0
Requires: python-retrying >= 1.2.3
-Requires: python-six >= 1.9.0
+Requires: python-six >= 1.10.0
BuildArch: noarch
+%ifpython2
+Requires: python-enum34 >= 1.0.4
+%endif
+%if 0%{?suse_version}
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+%else
+# on RDO, update-alternatives is in chkconfig
+Requires(post): chkconfig
+Requires(postun): chkconfig
+%endif
+%python_subpackages
%description
The oslo.concurrency library has utilities for safely running multi-thread,
multi-process applications using locking mechanisms and for running
external processes.
-%package doc
+%package -n python-oslo.concurrency-doc
Summary: Documentation for OpenStack concurrency library
Group: Development/Languages/Python
BuildRequires: python-Sphinx
-BuildRequires: python-openstackdocstheme >= 1.11.0
+BuildRequires: python-openstackdocstheme >= 1.17.0
-%description doc
+%description -n python-oslo.concurrency-doc
The oslo.concurrency library has utilities for safely running multi-thread,
multi-process applications using locking mechanisms and for running
external processes.
This package contains the documentation.
%prep
-%autosetup -n %{sname}-%{version}
+%autosetup -p1 -n oslo.concurrency-3.24.0
%py_req_cleanup
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
-%{py2_build}
+%{python_build}
# generate html docs
%{__python2} setup.py build_sphinx
@@ -82,23 +104,32 @@
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
-%{py2_install}
+%{python_install}
+%python_clone -a %{buildroot}%{_bindir}/lockutils-wrapper
+
+%post
+%python_install_alternative lockutils-wrapper
+
+%postun
+%python_uninstall_alternative lockutils-wrapper
%check
+%{python_expand rm -rf .testrepository
# Test suite fails on 32 bit platforms
# ifarch/ifnarch can not be used in noarch packages
if [ "%_lib" = "lib64" ]; then
-%{__python2} setup.py testr
+$python setup.py testr
fi
+}
-%files
+%files %{python_files}
%license LICENSE
%doc README.rst ChangeLog
-%_bindir/lockutils-wrapper
-%{python2_sitelib}/oslo_concurrency
-%{python2_sitelib}/*.egg-info
+%python_alternative %{_bindir}/lockutils-wrapper
+%{python_sitelib}/oslo_concurrency
+%{python_sitelib}/*.egg-info
-%files doc
+%files -n python-oslo.concurrency-doc
%license LICENSE
%doc doc/build/html
++++++ _service ++++++
--- /var/tmp/diff_new_pack.IVZkmJ/_old 2018-01-17 21:59:34.495659980 +0100
+++ /var/tmp/diff_new_pack.IVZkmJ/_new 2018-01-17 21:59:34.495659980 +0100
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/openstack/oslo.concurrency/oslo.concurrency.spec.j2</param>
+ <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/oslo.concurrency/oslo.concurrency.spec.j2</param>
<param name="output-name">python-oslo.concurrency.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/global-requirements.txt</param>
+ <param
name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/master/requirements.txt</param>
<param name="changelog-email">[email protected]</param>
<param name="changelog-provider">gh,openstack,oslo.concurrency</param>
</service>
++++++ oslo.concurrency-3.21.0.tar.gz -> oslo.concurrency-3.24.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.21.0/AUTHORS
new/oslo.concurrency-3.24.0/AUTHORS
--- old/oslo.concurrency-3.21.0/AUTHORS 2017-07-18 15:09:02.000000000 +0200
+++ new/oslo.concurrency-3.24.0/AUTHORS 2017-12-12 15:48:36.000000000 +0100
@@ -11,6 +11,7 @@
Brad Pokorny <[email protected]>
Brant Knudson <[email protected]>
Brian D. Elliott <[email protected]>
+Brian Rosmaita <[email protected]>
Chang Bo Guo <[email protected]>
ChangBo Guo(gcb) <[email protected]>
Christian Berendt <[email protected]>
@@ -31,6 +32,7 @@
Flaper Fesp <[email protected]>
Flavio Percoco <[email protected]>
Gary Kotton <[email protected]>
+Gary Kotton <[email protected]>
Gevorg Davoian <[email protected]>
IWAMOTO Toshihiro <[email protected]>
Ian Cordasco <[email protected]>
@@ -80,6 +82,7 @@
ZhiQiang Fan <[email protected]>
ZhongShengping <[email protected]>
Zhongyue Luo <[email protected]>
+Zuul <[email protected]>
gecong1973 <[email protected]>
gengchc2 <[email protected]>
howardlee <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.21.0/ChangeLog
new/oslo.concurrency-3.24.0/ChangeLog
--- old/oslo.concurrency-3.21.0/ChangeLog 2017-07-18 15:09:02.000000000
+0200
+++ new/oslo.concurrency-3.24.0/ChangeLog 2017-12-12 15:48:36.000000000
+0100
@@ -1,6 +1,36 @@
CHANGES
=======
+3.24.0
+------
+
+* Remove -U from pip install
+* Avoid tox\_install.sh for constraints support
+* Updated from global requirements
+* Remove setting of version/release from releasenotes
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Imported Translations from Zanata
+
+3.23.0
+------
+
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+
+3.22.0
+------
+
+* Minor correction to docstrings
+* Updated from global requirements
+* Updated from global requirements
+* Windows: ensure exec calls don't block other greenthreads
+* Update reno for stable/pike
+* Updated from global requirements
+* Add debug log to indicate when external lock is taken
+
3.21.0
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.21.0/PKG-INFO
new/oslo.concurrency-3.24.0/PKG-INFO
--- old/oslo.concurrency-3.21.0/PKG-INFO 2017-07-18 15:09:02.000000000
+0200
+++ new/oslo.concurrency-3.24.0/PKG-INFO 2017-12-12 15:48:37.000000000
+0100
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: oslo.concurrency
-Version: 3.21.0
+Version: 3.24.0
Summary: Oslo Concurrency library
Home-page: https://docs.openstack.org/oslo.concurrency/latest/
Author: OpenStack
Author-email: [email protected]
License: UNKNOWN
+Description-Content-Type: UNKNOWN
Description: ========================
Team and repository tags
========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.21.0/oslo.concurrency.egg-info/PKG-INFO
new/oslo.concurrency-3.24.0/oslo.concurrency.egg-info/PKG-INFO
--- old/oslo.concurrency-3.21.0/oslo.concurrency.egg-info/PKG-INFO
2017-07-18 15:09:02.000000000 +0200
+++ new/oslo.concurrency-3.24.0/oslo.concurrency.egg-info/PKG-INFO
2017-12-12 15:48:36.000000000 +0100
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: oslo.concurrency
-Version: 3.21.0
+Version: 3.24.0
Summary: Oslo Concurrency library
Home-page: https://docs.openstack.org/oslo.concurrency/latest/
Author: OpenStack
Author-email: [email protected]
License: UNKNOWN
+Description-Content-Type: UNKNOWN
Description: ========================
Team and repository tags
========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.21.0/oslo.concurrency.egg-info/SOURCES.txt
new/oslo.concurrency-3.24.0/oslo.concurrency.egg-info/SOURCES.txt
--- old/oslo.concurrency-3.21.0/oslo.concurrency.egg-info/SOURCES.txt
2017-07-18 15:09:02.000000000 +0200
+++ new/oslo.concurrency-3.24.0/oslo.concurrency.egg-info/SOURCES.txt
2017-12-12 15:48:37.000000000 +0100
@@ -59,9 +59,9 @@
releasenotes/source/index.rst
releasenotes/source/newton.rst
releasenotes/source/ocata.rst
+releasenotes/source/pike.rst
releasenotes/source/unreleased.rst
releasenotes/source/_static/.placeholder
releasenotes/source/_templates/.placeholder
releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
-releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po
-tools/tox_install.sh
\ No newline at end of file
+releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.21.0/oslo.concurrency.egg-info/pbr.json
new/oslo.concurrency-3.24.0/oslo.concurrency.egg-info/pbr.json
--- old/oslo.concurrency-3.21.0/oslo.concurrency.egg-info/pbr.json
2017-07-18 15:09:02.000000000 +0200
+++ new/oslo.concurrency-3.24.0/oslo.concurrency.egg-info/pbr.json
2017-12-12 15:48:36.000000000 +0100
@@ -1 +1 @@
-{"git_version": "88583ed", "is_release": true}
\ No newline at end of file
+{"git_version": "9584101", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.21.0/oslo.concurrency.egg-info/requires.txt
new/oslo.concurrency-3.24.0/oslo.concurrency.egg-info/requires.txt
--- old/oslo.concurrency-3.21.0/oslo.concurrency.egg-info/requires.txt
2017-07-18 15:09:02.000000000 +0200
+++ new/oslo.concurrency-3.24.0/oslo.concurrency.egg-info/requires.txt
2017-12-12 15:48:36.000000000 +0100
@@ -1,7 +1,7 @@
pbr!=2.1.0,>=2.0.0
-enum34
-oslo.config!=4.3.0,!=4.4.0,>=4.0.0
-oslo.i18n!=3.15.2,>=2.1.0
-oslo.utils>=3.20.0
-six>=1.9.0
-fasteners>=0.7
+enum34>=1.0.4
+oslo.config>=5.1.0
+oslo.i18n>=3.15.3
+oslo.utils>=3.31.0
+six>=1.10.0
+fasteners>=0.7.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.21.0/oslo_concurrency/lockutils.py
new/oslo.concurrency-3.24.0/oslo_concurrency/lockutils.py
--- old/oslo.concurrency-3.21.0/oslo_concurrency/lockutils.py 2017-07-18
15:07:25.000000000 +0200
+++ new/oslo.concurrency-3.24.0/oslo_concurrency/lockutils.py 2017-12-12
15:42:51.000000000 +0100
@@ -214,6 +214,9 @@
if external and not CONF.oslo_concurrency.disable_process_locking:
ext_lock = external_lock(name, lock_file_prefix, lock_path)
ext_lock.acquire(delay=delay)
+ if do_log:
+ LOG.debug('Acquired external semaphore "%(lock)s"',
+ {'lock': name})
try:
yield ext_lock
finally:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.21.0/oslo_concurrency/processutils.py
new/oslo.concurrency-3.24.0/oslo_concurrency/processutils.py
--- old/oslo.concurrency-3.21.0/oslo_concurrency/processutils.py
2017-07-18 15:07:25.000000000 +0200
+++ new/oslo.concurrency-3.24.0/oslo_concurrency/processutils.py
2017-12-12 15:42:51.000000000 +0100
@@ -42,8 +42,20 @@
# time module as the check because that's a monkey patched module we use
# in combination with subprocess below, so they need to match.
eventlet = importutils.try_import('eventlet')
-if eventlet and eventlet.patcher.is_monkey_patched(time):
- from eventlet.green import subprocess
+eventlet_patched = eventlet and eventlet.patcher.is_monkey_patched(time)
+if eventlet_patched:
+ if os.name == 'nt':
+ # subprocess.Popen.communicate will spawn two threads consuming
+ # stdout/stderr when passing data through stdin. We need to make
+ # sure that *native* threads will be used as pipes are blocking
+ # on Windows.
+ # Recent eventlet versions actually do patch subprocess.
+ subprocess = eventlet.patcher.original('subprocess')
+ subprocess.threading = eventlet.patcher.original('threading')
+ else:
+ from eventlet.green import subprocess
+
+ from eventlet import tpool
else:
import subprocess
@@ -377,7 +389,14 @@
on_execute(obj)
try:
- result = obj.communicate(process_input)
+ # eventlet.green.subprocess is not really greenthread friendly
+ # on Windows. In order to avoid blocking other greenthreads,
+ # we have to wrap this call using tpool.
+ if eventlet_patched and os.name == 'nt':
+ result = tpool.execute(obj.communicate,
+ process_input)
+ else:
+ result = obj.communicate(process_input)
obj.stdin.close() # pylint: disable=E1101
_returncode = obj.returncode # pylint: disable=E1101
@@ -455,8 +474,10 @@
the command's stdout and stderr. If 'err' is not empty then the
command can be considered to have failed.
- :discard_warnings True | False. Defaults to False. If set to True,
- then for succeeding commands, stderr is cleared
+ :param discard_warnings: True | False. Defaults to False. If set to True,
+ then for succeeding commands, stderr is cleared
+ :type discard_warnings: boolean
+ :returns: (out, err) from process execution
"""
discard_warnings = kwargs.pop('discard_warnings', False)
@@ -544,8 +565,8 @@
def get_worker_count():
"""Utility to get the default worker count.
- @return: The number of CPUs if that can be determined, else a default
- worker count of 1 is returned.
+ :returns: The number of CPUs if that can be determined, else a default
+ worker count of 1 is returned.
"""
try:
return multiprocessing.cpu_count()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.21.0/oslo_concurrency/tests/unit/test_processutils.py
new/oslo.concurrency-3.24.0/oslo_concurrency/tests/unit/test_processutils.py
---
old/oslo.concurrency-3.21.0/oslo_concurrency/tests/unit/test_processutils.py
2017-07-18 15:07:25.000000000 +0200
+++
new/oslo.concurrency-3.24.0/oslo_concurrency/tests/unit/test_processutils.py
2017-12-12 15:42:51.000000000 +0100
@@ -124,6 +124,45 @@
if type(e).__name__ != 'SubprocessError':
raise
+ @mock.patch.object(os, 'name', 'nt')
+ @mock.patch.object(processutils.subprocess, "Popen")
+ @mock.patch.object(processutils, 'tpool', create=True)
+ def _test_windows_execute(self, mock_tpool, mock_popen,
+ use_eventlet=False):
+ # We want to ensure that if eventlet is used on Windows,
+ # 'communicate' calls are wrapped with eventlet.tpool.execute.
+ mock_comm = mock_popen.return_value.communicate
+ mock_comm.return_value = None
+ mock_tpool.execute.return_value = mock_comm.return_value
+
+ fake_pinput = 'fake pinput'.encode('utf-8')
+
+ with mock.patch.object(processutils, 'eventlet_patched',
+ use_eventlet):
+ processutils.execute(
+ TRUE_UTILITY,
+ process_input=fake_pinput,
+ check_exit_code=False)
+
+ mock_popen.assert_called_once_with(
+ [TRUE_UTILITY],
+ stdin=mock.ANY, stdout=mock.ANY,
+ stderr=mock.ANY, close_fds=mock.ANY,
+ preexec_fn=mock.ANY, shell=mock.ANY,
+ cwd=mock.ANY, env=mock.ANY)
+
+ if use_eventlet:
+ mock_tpool.execute.assert_called_once_with(
+ mock_comm, fake_pinput)
+ else:
+ mock_comm.assert_called_once_with(fake_pinput)
+
+ def test_windows_execute_without_eventlet(self):
+ self._test_windows_execute()
+
+ def test_windows_execute_using_eventlet(self):
+ self._test_windows_execute(use_eventlet=True)
+
class ProcessExecutionErrorTest(test_base.BaseTestCase):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.21.0/releasenotes/source/conf.py
new/oslo.concurrency-3.24.0/releasenotes/source/conf.py
--- old/oslo.concurrency-3.21.0/releasenotes/source/conf.py 2017-07-18
15:07:25.000000000 +0200
+++ new/oslo.concurrency-3.24.0/releasenotes/source/conf.py 2017-12-12
15:42:51.000000000 +0100
@@ -61,16 +61,12 @@
project = u'oslo.concurrency Release Notes'
copyright = u'2016, oslo.concurrency Developers'
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-from oslo_concurrency.version import version_info as oslo_concurrency_version
+# Release notes do not need a version in the title, they span
+# multiple versions.
# The full version, including alpha/beta/rc tags.
-release = oslo_concurrency_version.version_string_with_vcs()
+release = ''
# The short X.Y version.
-version = oslo_concurrency_version.canonical_version_string()
+version = ''
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.21.0/releasenotes/source/index.rst
new/oslo.concurrency-3.24.0/releasenotes/source/index.rst
--- old/oslo.concurrency-3.21.0/releasenotes/source/index.rst 2017-07-18
15:07:25.000000000 +0200
+++ new/oslo.concurrency-3.24.0/releasenotes/source/index.rst 2017-12-12
15:42:51.000000000 +0100
@@ -6,5 +6,6 @@
:maxdepth: 1
unreleased
+ pike
ocata
newton
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.concurrency-3.21.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
new/oslo.concurrency-3.24.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
---
old/oslo.concurrency-3.21.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
2017-07-18 15:07:25.000000000 +0200
+++
new/oslo.concurrency-3.24.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
2017-12-12 15:42:51.000000000 +0100
@@ -2,13 +2,13 @@
# Andi Chandler <[email protected]>, 2017. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: oslo.concurrency Release Notes 3.20.1\n"
+"Project-Id-Version: oslo.concurrency Release Notes 3.22.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-12 00:36+0000\n"
+"POT-Creation-Date: 2017-09-20 20:45+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-07-11 05:04+0000\n"
+"PO-Revision-Date: 2017-10-04 11:49+0000\n"
"Last-Translator: Andi Chandler <[email protected]>\n"
"Language-Team: English (United Kingdom)\n"
"Language: en-GB\n"
@@ -27,6 +27,9 @@
msgid "Other Notes"
msgstr "Other Notes"
+msgid "Pike Series Release Notes"
+msgstr "Pike Series Release Notes"
+
msgid "Switch to reno for managing release notes."
msgstr "Switch to reno for managing release notes."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.21.0/releasenotes/source/pike.rst
new/oslo.concurrency-3.24.0/releasenotes/source/pike.rst
--- old/oslo.concurrency-3.21.0/releasenotes/source/pike.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/oslo.concurrency-3.24.0/releasenotes/source/pike.rst 2017-12-12
15:42:51.000000000 +0100
@@ -0,0 +1,6 @@
+===================================
+ Pike Series Release Notes
+===================================
+
+.. release-notes::
+ :branch: stable/pike
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.21.0/requirements.txt
new/oslo.concurrency-3.24.0/requirements.txt
--- old/oslo.concurrency-3.21.0/requirements.txt 2017-07-18
15:07:25.000000000 +0200
+++ new/oslo.concurrency-3.24.0/requirements.txt 2017-12-12
15:42:51.000000000 +0100
@@ -3,9 +3,9 @@
# process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0
-enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3'
# BSD
-oslo.config!=4.3.0,!=4.4.0,>=4.0.0 # Apache-2.0
-oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0
-oslo.utils>=3.20.0 # Apache-2.0
-six>=1.9.0 # MIT
-fasteners>=0.7 # Apache-2.0
+enum34>=1.0.4;python_version=='2.7' or python_version=='2.6' or
python_version=='3.3' # BSD
+oslo.config>=5.1.0 # Apache-2.0
+oslo.i18n>=3.15.3 # Apache-2.0
+oslo.utils>=3.31.0 # Apache-2.0
+six>=1.10.0 # MIT
+fasteners>=0.7.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.21.0/test-requirements.txt
new/oslo.concurrency-3.24.0/test-requirements.txt
--- old/oslo.concurrency-3.21.0/test-requirements.txt 2017-07-18
15:07:25.000000000 +0200
+++ new/oslo.concurrency-3.24.0/test-requirements.txt 2017-12-12
15:42:51.000000000 +0100
@@ -5,12 +5,12 @@
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
-futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD
+futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
fixtures>=3.0.0 # Apache-2.0/BSD
# These are needed for docs generation
-openstackdocstheme>=1.11.0 # Apache-2.0
+openstackdocstheme>=1.17.0 # Apache-2.0
sphinx>=1.6.2 # BSD
-reno!=2.3.1,>=1.8.0 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.21.0/tools/tox_install.sh
new/oslo.concurrency-3.24.0/tools/tox_install.sh
--- old/oslo.concurrency-3.21.0/tools/tox_install.sh 2017-07-18
15:07:25.000000000 +0200
+++ new/oslo.concurrency-3.24.0/tools/tox_install.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# Client constraint file contains this client version pin that is in conflict
-# with installing the client from source. We should remove the version pin in
-# the constraints file before applying it for from-source installation.
-
-CONSTRAINTS_FILE="$1"
-shift 1
-
-set -e
-
-# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
-# published to logs.openstack.org for easy debugging.
-localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
-
-if [[ "$CONSTRAINTS_FILE" != http* ]]; then
- CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE"
-fi
-# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
-curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile"
-
-pip install -c"$localfile" openstack-requirements
-
-# This is the main purpose of the script: Allow local installation of
-# the current repo. It is listed in constraints file and thus any
-# install will be constrained and we need to unconstrain it.
-edit-constraints "$localfile" -- "$CLIENT_NAME"
-
-pip install -c"$localfile" -U "$@"
-exit $?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.concurrency-3.21.0/tox.ini
new/oslo.concurrency-3.24.0/tox.ini
--- old/oslo.concurrency-3.21.0/tox.ini 2017-07-18 15:07:25.000000000 +0200
+++ new/oslo.concurrency-3.24.0/tox.ini 2017-12-12 15:42:51.000000000 +0100
@@ -3,12 +3,11 @@
envlist = py35,py27,pep8
[testenv]
-setenv =
- VIRTUAL_ENV={envdir}
- BRANCH_NAME=master
- CLIENT_NAME=oslo.concurrency
-install_command = {toxinidir}/tools/tox_install.sh
{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
{opts} {packages}
-deps = -r{toxinidir}/test-requirements.txt
+install_command = pip install {opts} {packages}
+deps =
+
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+ -r{toxinidir}/test-requirements.txt
+ -r{toxinidir}/requirements.txt
# We want to support both vanilla stdlib and eventlet monkey patched
commands =
lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}'
