<div dir="ltr"><div dir="ltr" style="font-size:12.8px"><span class="gmail-im"><div>Dear Maintainers,<br><br></div><div>I
would like to ask you what is the process of upgrading some package in
openstack, I understand that it's needed to merge new upstream tag of
component and update debian packaging.<br><br></div></span><div>I have the following questions:</div><div><span style="font-size:12.8px">1. </span><span style="font-size:12.8px">what have to be done before? </span></div><div>2. can I update git repo myself? <br></div><div>3. or, is it possible to send you a patch and log from successfull build and tests?<br></div><div><span style="font-size:12.8px">4. is this accetable for example now for python-oslo.utils?</span><br></div><div><div class="gmail-im"><div><br></div><div>git merge 3.22.1 --strategy-option theirs<br><br></div><div>+ diff between debian/ocata..my_branch<br></div><div><br><br>diff --git a/debian/changelog b/debian/changelog<br>index 953e547..78ae8ba 100644<br>--- a/debian/changelog<br>+++ b/debian/changelog<br>@@ -1,3 +1,9 @@<br>+python-oslo.utils (3.22.1-1) unstable; urgency=medium<br>+<br>+ * New upstream version<br>+<br>+ -- Michal Arbet <<a href="mailto:michal.arbet@ultimum.io" target="_blank">michal.arbet@ultimum.io</a>> Tue, 25 Jul 2017 11:24:34 +0200<br>+<br> python-oslo.utils (3.16.0-3) UNRELEASED; urgency=medium<br> <br> * Bumped debhelper compat version to 10<br>diff --git a/debian/control b/debian/control<br>index 417aec1..eba2bcf 100644<br>--- a/debian/control<br>+++ b/debian/control<br>@@ -24,13 +24,13 @@ Build-Depends-Indep: bandit,<br> python-iso8601,<br> python-mock (>= 2.0),<br> python-monotonic (>= 0.6),<br>- python-netaddr (>= 0.7.12),<br>+ python-netaddr (>> 0.7.16),<br> python-netifaces (>= 0.10.4),<br> python-oslo.config (>= 1:3.12.0),<br> python-oslo.i18n (>= 2.1.0),<br> python-oslosphinx (>= 2.5.0),<br> python-oslotest (>= 1:1.10.0),<br>- python-pyparsing (>= 2.0.1),<br>+ python-pyparsing (>= 2.1.0),<br> python-six (>= 1.9.0),<br> python-testscenarios,<br> python-testtools (>= 1.4.0),<br>@@ -42,12 +42,12 @@ Build-Depends-Indep: bandit,<br> python3-iso8601,<br> python3-mock (>= 2.0),<br> python3-monotonic (>= 0.6),<br>- python3-netaddr (>= 0.7.12),<br>+ python3-netaddr (>> 0.7.16),<br> python3-netifaces (>= 0.10.4),<br> python3-oslo.config (>= 1:3.12.0),<br> python3-oslo.i18n (>= 2.1.0),<br> python3-oslotest (>= 1:1.10.0),<br>- python3-pyparsing (>= 2.0.1),<br>+ python3-pyparsing (>= 2.1.0),<br> python3-six (>= 1.9.0),<br> python3-subunit (>= 0.0.18),<br> python3-testscenarios,<br>@@ -67,11 +67,11 @@ Depends: python-debtcollector (>= 1.2.0),<br> python-funcsigs (>= 0.4),<br> python-iso8601,<br> python-monotonic (>= 0.6),<br>- python-netaddr (>= 0.7.12),<br>+ python-netaddr (>> 0.7.16),<br> python-netifaces (>= 0.10.4),<br> python-oslo.i18n (>= 2.1.0),<br> python-pbr (>= 1.8),<br>- python-pyparsing (>= 2.0.1),<br>+ python-pyparsing (>= 2.1.0),<br> python-six (>= 1.9.0),<br> ${misc:Depends},<br> ${python:Depends},<br>@@ -92,11 +92,11 @@ Depends: python3-debtcollector (>= 1.2.0),<br> python3-funcsigs (>= 0.4),<br> python3-iso8601,<br> python3-monotonic (>= 0.6),<br>- python3-netaddr (>= 0.7.12),<br>+ python3-netaddr (>> 0.7.16),<br> python3-netifaces (>= 0.10.4),<br> python3-oslo.i18n (>= 2.1.0),<br> python3-pbr (>= 1.8),<br>- python3-pyparsing (>= 2.0.1),<br>+ python3-pyparsing (>= 2.1.0),<br> python3-six (>= 1.9.0),<br> ${misc:Depends},<br> ${python3:Depends},<br>diff --git a/debian/patches/allow-any-pyt<wbr>z-version.patch b/debian/patches/allow-any-pyt<wbr>z-version.patch<br>index 9c8663c..d177d85 100644<br>--- a/debian/patches/allow-any-pyt<wbr>z-version.patch<br>+++ b/debian/patches/allow-any-pyt<wbr>z-version.patch<br>@@ -3,16 +3,17 @@ Description: Allow any version of pytz.<br> no reason why we should require such a high version.<br> Author: Thomas Goirand <<a href="mailto:zigo@debian.org" target="_blank">zigo@debian.org</a>><br> Forwarded: not-needed<br>-Last-Update: 2015-09-04<br>+Edited : Michal Arbet <<a href="mailto:michal.arbet@ultimum.io" target="_blank">michal.arbet@ultimum.io</a>><br>+Last-Update: 2017-07-24<br> <br>---- a/requirements.txt<br>-+++ b/requirements.txt<br>+--- python-oslo.utils.orig/require<wbr>ments.txt<br>++++ python-oslo.utils/requirements<wbr>.txt<br> @@ -13,7 +13,7 @@<br> iso8601>=0.1.11 # MIT<br> oslo.i18n>=2.1.0 # Apache-2.0<br> monotonic>=0.6 # Apache-2.0<br> -pytz>=2013.6 # MIT<br> +pytz<br>- netaddr!=0.7.16,>=0.7.12 # BSD<br>+ netaddr!=0.7.16,>=0.7.13 # BSD<br> netifaces>=0.10.4 # MIT<br> debtcollector>=1.2.0 # Apache-2.0<br><br><br></div><div>Tests all OK : <br><br>pkgos-dh_auto_test<br>+ pyversions -vr<br>+ PYTHONS=2.7<br>+ py3versions -vr<br>+ PYTHON3S=3.6 3.5<br>+ echo 2.7<br>+ cut -d. -f1<br>+ PYMAJOR=2<br>+ echo ===> Testing with python (python2)<br>===> Testing with python (python2)<br>+ rm -rf .testrepository<br>+ testr-python2 init<br>+ mktemp -t<br>+ TEMP_REZ=/tmp/tmp.JzpXhoEz7r<br>+ tee /tmp/tmp.JzpXhoEz7r+ <br>subunit2pyunit<br>+ pwd<br>+ PYTHONPATH=/opt/openstack/deb-<wbr>python-oslo.utils PYTHON=python2.7 testr-python2 run --subunit<br>running=OS_STDOUT_CAPTURE=${OS<wbr>_STDOUT_CAPTURE:-1} \<br>OS_STDERR_CAPTURE=${OS_STDERR_<wbr>CAPTURE:-1} \<br>OS_TEST_TIMEOUT=${OS_TEST_TIME<wbr>OUT:-60} \<br>${PYTHON:-python} -m subunit.run discover -t ./ . <br>oslo_utils.tests.test_dictutil<wbr>s.DictUtilsTestCase.test_flatt<wbr>en_dict_to_keypairs<br>oslo_utils.tests.test_dictutil<wbr>s.DictUtilsTestCase.test_flatt<wbr>en_dict_to_keypairs ... ok<br>.<br>.<br>.<br>.<br>.<br>------------------------------<wbr>------------------------------<wbr>----------<br>Ran 8488 tests in 22.269s<br><br>OK<br>+ + + subunit-filter -s --no-passthrough<br>subunit-stats<br>cat /tmp/tmp.JzpXhoEz7r<br>Total tests: 8488<br>Passed tests: 8488<br>Failed tests: 0<br>Skipped tests: 0<br>Seen tags: worker-0<br>+ rm -f /tmp/tmp.JzpXhoEz7r<br>+ testr-python2 slowest<br>Test id <wbr> <wbr> <wbr> <wbr> <wbr> Runtime (s)<br>------------------------------<wbr>------------------------------<wbr>------------------------------<wbr>------------------------------<wbr>------------------------------<wbr>------- -----------<br>oslo_utils.tests.test_timeutil<wbr>s.TimeUtilsTest.test_set_time_<wbr>override_using_default <wbr> <wbr> <wbr> 1.002<br>oslo_utils.tests.test_netutils<wbr>.NetworkUtilsTest.test_get_my_<wbr>ipv4_address_without_default_r<wbr>oute <wbr> <wbr> 0.044<br>oslo_utils.tests.test_timeutil<wbr>s.StopWatchTest.test_context_m<wbr>anager_splits <wbr> <wbr> <wbr> 0.011<br>oslo_utils.tests.test_strutils<wbr>.MaskPasswordTestCase.test_jso<wbr>n <wbr> <wbr> <wbr> 0.006<br>oslo_utils.tests.test_imageuti<wbr>ls.ImageUtilsQemuTestCase.test<wbr>_qemu_img_info(disk_config,<wbr>qcow2,2K,96K,no_garbage,one_<wbr>snapshots,65536,encrypted,no_<wbr>backing_file) 0.006<br>oslo_utils.tests.test_strutils<wbr>.MaskPasswordTestCase.test_mas<wbr>k_password <wbr> <wbr> <wbr> 0.005<br>oslo_utils.tests.test_specs_ma<wbr>tcher.SpecsMatcherTestCase.tes<wbr>t_specs_fails_with_op_sneq <wbr> <wbr> <wbr> 0.004<br>oslo_utils.tests.test_netutils<wbr>.NetworkUtilsTest.test_get_my_<wbr>ipv4_address_with_default_rout<wbr>e <wbr> <wbr> 0.004<br>oslo_utils.tests.test_specs_ma<wbr>tcher.SpecsMatcherTestCase.tes<wbr>t_specs_fails_all_with_op_alli<wbr>n <wbr> <wbr> 0.003<br>oslo_utils.tests.test_timeutil<wbr>s.TimeUtilsTest.test_parse_str<wbr>time <wbr> <wbr> <wbr> 0.003<br><br>===> Testing with python (python3)<br>+ rm -rf .testrepository<br>+ testr-python3 init<br>+ mktemp -t<br>+ TEMP_REZ=/tmp/tmp.GMk5NBUyHw<br>+ tee /tmp/tmp.GMk5NBUyHw<br>+ pwd<br>+ subunit2pyunit+ PYTHONPATH=/opt/openstack/deb-<wbr>python-oslo.utils PYTHON=python3.6<br> testr-python3 run --subunit<br>oslo_utils.tests.test_dictutil<wbr>s.DictUtilsTestCase.test_flatt<wbr>en_dict_to_keypairs<br>oslo_utils.tests.test_dictutil<wbr>s.DictUtilsTestCase.test_flatt<wbr>en_dict_to_keypairs ... ok<br>.<br>.<br>.<br>.<br>.<br><br>------------------------------<wbr>------------------------------<wbr>----------<br>Ran 8491 tests in 21.302s<br><br>OK (skipped=4)<br>+ cat /tmp/tmp.GMk5NBUyHw<br>+ subunit-filter -s --no-passthrough<br>+ subunit-stats<br>Total tests: 8491<br>Passed tests: 8487<br>Failed tests: 0<br>Skipped tests: 4<br>Seen tags: worker-0<br>+ rm -f /tmp/tmp.GMk5NBUyHw<br>+ testr-python3 slowest<br>Test id <wbr> <wbr> <wbr> <wbr> Runtime (s)<br>------------------------------<wbr>------------------------------<wbr>------------------------------<wbr>------------------------------<wbr>----------------- -----------<br>oslo_utils.tests.test_timeutil<wbr>s.TimeUtilsTest.test_set_time_<wbr>override_using_default <wbr> <wbr> 1.003<br>oslo_utils.tests.test_specs_ma<wbr>tcher.SpecsMatcherTestCase.tes<wbr>t_specs_fails_with_op_or2 <wbr> <wbr> 0.028<br>oslo_utils.tests.test_strutils<wbr>.StringToBytesTest.test_string<wbr>_to_bytes(invalid_unit_system,<wbr>positive,invalid_literal,Ti,B,<wbr>return_dec) 0.018<br>oslo_utils.tests.test_timeutil<wbr>s.StopWatchTest.test_context_m<wbr>anager_splits <wbr> <wbr> 0.012<br>oslo_utils.tests.test_fnmatch.<wbr>TestFnmatch.test_fnmatch <wbr> <wbr> <wbr> 0.006<br>oslo_utils.tests.test_timeutil<wbr>s.TimeUtilsTest.test_parse_str<wbr>time <wbr> <wbr> 0.005<br>oslo_utils.tests.test_strutils<wbr>.MaskPasswordTestCase.test_jso<wbr>n <wbr> <wbr> 0.005<br>oslo_utils.tests.test_strutils<wbr>.StringToBytesTest.test_string<wbr>_to_bytes(invalid_unit_system,<wbr>invalid_sign,invalid_literal,<wbr>Ki,bit,return_dec) 0.004<br>oslo_utils.tests.test_strutils<wbr>.StringToBytesTest.test_string<wbr>_to_bytes(iec,no_sign,decimal_<wbr>point_start,no_unit_prefix,<wbr>bit,return_int) 0.004<br>oslo_utils.tests.test_strutils<wbr>.MaskPasswordTestCase.test_mas<wbr>k_password <wbr> <wbr> 0.004<br>+ rm -rf .testrepository<br>+ echo 3.5<br>+ cut -d. -f1<br>+ PYMAJOR=3<br>+ echo ===> Testing with python (python3)<br>===> Testing with python (python3)<br>+ rm -rf .testrepository<br>+ testr-python3 init<br>+ mktemp -t<br>+ TEMP_REZ=/tmp/tmp.YHXDOD2RgM<br>+ tee+ /tmp/tmp.YHXDOD2RgM+ <br>subunit2pyunitpwd<br>+ PYTHONPATH=/opt/openstack/deb-<wbr>python-oslo.utils PYTHON=python3.5 testr-python3 run --subunit<br>oslo_utils.tests.test_dictutil<wbr>s.DictUtilsTestCase.test_flatt<wbr>en_dict_to_keypairs<br>oslo_utils.tests.test_dictutil<wbr>s.DictUtilsTestCase.test_flatt<wbr>en_dict_to_keypairs ... ok<br>oslo_utils.tests.test_dictutil<wbr>s.DictUtilsTestCase.test_flatt<wbr>en_dict_to_keypairs_with_separ<wbr>ator<br>oslo_utils.tests.test_dictutil<wbr>s.DictUtilsTestCase.test_flatt<wbr>en_dict_to_keypairs_with_separ<wbr>ator ... ok<br>oslo_utils.tests.test_eventlet<wbr>utils.EventletUtilsTest.test_e<wbr>vent_api_compat<br>oslo_utils.tests.test_eventlet<wbr>utils.EventletUtilsTest.test_e<wbr>vent_api_compat ... ok<br><br>.<br>.<br>.<br>.<br>.<br>oslo_utils.tests.tests_encodeu<wbr>tils.ExceptionToUnicodeTest.te<wbr>st_unicode_or_str_exception ... skipped u'test specific to Python 2'<br>running=OS_STDOUT_CAPTURE=${OS<wbr>_STDOUT_CAPTURE:-1} \<br>OS_STDERR_CAPTURE=${OS_STDERR_<wbr>CAPTURE:-1} \<br>OS_TEST_TIMEOUT=${OS_TEST_TIME<wbr>OUT:-60} \<br>${PYTHON:-python} -m subunit.run discover -t ./ . <br><br>------------------------------<wbr>------------------------------<wbr>----------<br>Ran 8491 tests in 23.788s<br><br>OK (skipped=4)<br>+ + subunit-filtercat /tmp/tmp.YHXDOD2RgM<br>+ subunit-stats<br> -s --no-passthrough<br>Total tests: 8491<br>Passed tests: 8487<br>Failed tests: 0<br>Skipped tests: 4<br>Seen tags: worker-0<br>+ rm -f /tmp/tmp.YHXDOD2RgM<br>+ testr-python3 slowest<br>Test id <wbr> <wbr> <wbr> <wbr> Runtime (s)<br>------------------------------<wbr>------------------------------<wbr>------------------------------<wbr>------------------------------<wbr>-------------------------- -----------<br>oslo_utils.tests.test_timeutil<wbr>s.TimeUtilsTest.test_set_time_<wbr>override_using_default <wbr> <wbr> 1.002<br>oslo_utils.tests.test_specs_ma<wbr>tcher.SpecsMatcherTestCase.tes<wbr>t_specs_fails_with_op_sneq <wbr> <wbr> 0.041<br>oslo_utils.tests.test_strutils<wbr>.StringToBytesTest.test_string<wbr>_to_bytes(invalid_unit_system,<wbr>positive,garbage_value,k,<wbr>invalid_unit_suffix,return_int<wbr>) 0.019<br>oslo_utils.tests.test_timeutil<wbr>s.StopWatchTest.test_context_m<wbr>anager_splits <wbr> <wbr> 0.012<br>oslo_utils.tests.tests_encodeu<wbr>tils.ExceptionToUnicodeTest.te<wbr>st_str_exception <wbr> <wbr> 0.005<br>oslo_utils.tests.test_strutils<wbr>.MaskPasswordTestCase.test_jso<wbr>n <wbr> <wbr> 0.005<br>oslo_utils.tests.test_excutils<wbr>.ForeverRetryUncaughtException<wbr>sTest.test_exc_retrier_same_10<wbr>exc_2min_gives_2logs <wbr> 0.004<br>oslo_utils.tests.test_strutils<wbr>.MaskPasswordTestCase.test_mas<wbr>k_password <wbr> <wbr> 0.004<br>oslo_utils.tests.test_timeutil<wbr>s.TimeUtilsTest.test_parse_str<wbr>time <wbr> <wbr> 0.004<br>oslo_utils.tests.test_strutils<wbr>.StringToBytesTest.test_string<wbr>_to_bytes(iec,invalid_sign,<wbr>decimal,G,invalid_unit_suffix,<wbr>return_dec) 0.004<br><br><br></div><div>Thanks,<br></div><div>Michal Arbet - Kevin<br></div><div>Ultimum Technologies<br></div></div></div></div></div>