[PKG-Openstack-devel] debian packaging of python-oslo.utils

Michal Arbet michal.arbet at ultimum.io
Tue Jul 25 15:12:21 UTC 2017


Dear Maintainers,

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.

I have the following questions:
1. what have to be done before?
2. can I update git repo myself?
3. or, is it possible to send you a patch and log from successfull build
and tests?
4. is this accetable for example now for python-oslo.utils?

git merge 3.22.1 --strategy-option theirs

+ diff between debian/ocata..my_branch


diff --git a/debian/changelog b/debian/changelog
index 953e547..78ae8ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-oslo.utils (3.22.1-1) unstable; urgency=medium
+
+  * New upstream version
+
+ -- Michal Arbet <michal.arbet at ultimum.io>  Tue, 25 Jul 2017 11:24:34 +0200
+
 python-oslo.utils (3.16.0-3) UNRELEASED; urgency=medium

   * Bumped debhelper compat version to 10
diff --git a/debian/control b/debian/control
index 417aec1..eba2bcf 100644
--- a/debian/control
+++ b/debian/control
@@ -24,13 +24,13 @@ Build-Depends-Indep: bandit,
                      python-iso8601,
                      python-mock (>= 2.0),
                      python-monotonic (>= 0.6),
-                     python-netaddr (>= 0.7.12),
+                     python-netaddr (>> 0.7.16),
                      python-netifaces (>= 0.10.4),
                      python-oslo.config (>= 1:3.12.0),
                      python-oslo.i18n (>= 2.1.0),
                      python-oslosphinx (>= 2.5.0),
                      python-oslotest (>= 1:1.10.0),
-                     python-pyparsing (>= 2.0.1),
+                     python-pyparsing (>= 2.1.0),
                      python-six (>= 1.9.0),
                      python-testscenarios,
                      python-testtools (>= 1.4.0),
@@ -42,12 +42,12 @@ Build-Depends-Indep: bandit,
                      python3-iso8601,
                      python3-mock (>= 2.0),
                      python3-monotonic (>= 0.6),
-                     python3-netaddr (>= 0.7.12),
+                     python3-netaddr (>> 0.7.16),
                      python3-netifaces (>= 0.10.4),
                      python3-oslo.config (>= 1:3.12.0),
                      python3-oslo.i18n (>= 2.1.0),
                      python3-oslotest (>= 1:1.10.0),
-                     python3-pyparsing (>= 2.0.1),
+                     python3-pyparsing (>= 2.1.0),
                      python3-six (>= 1.9.0),
                      python3-subunit (>= 0.0.18),
                      python3-testscenarios,
@@ -67,11 +67,11 @@ Depends: python-debtcollector (>= 1.2.0),
          python-funcsigs (>= 0.4),
          python-iso8601,
          python-monotonic (>= 0.6),
-         python-netaddr (>= 0.7.12),
+         python-netaddr (>> 0.7.16),
          python-netifaces (>= 0.10.4),
          python-oslo.i18n (>= 2.1.0),
          python-pbr (>= 1.8),
-         python-pyparsing (>= 2.0.1),
+         python-pyparsing (>= 2.1.0),
          python-six (>= 1.9.0),
          ${misc:Depends},
          ${python:Depends},
@@ -92,11 +92,11 @@ Depends: python3-debtcollector (>= 1.2.0),
          python3-funcsigs (>= 0.4),
          python3-iso8601,
          python3-monotonic (>= 0.6),
-         python3-netaddr (>= 0.7.12),
+         python3-netaddr (>> 0.7.16),
          python3-netifaces (>= 0.10.4),
          python3-oslo.i18n (>= 2.1.0),
          python3-pbr (>= 1.8),
-         python3-pyparsing (>= 2.0.1),
+         python3-pyparsing (>= 2.1.0),
          python3-six (>= 1.9.0),
          ${misc:Depends},
          ${python3:Depends},
diff --git a/debian/patches/allow-any-pytz-version.patch
b/debian/patches/allow-any-pytz-version.patch
index 9c8663c..d177d85 100644
--- a/debian/patches/allow-any-pytz-version.patch
+++ b/debian/patches/allow-any-pytz-version.patch
@@ -3,16 +3,17 @@ Description: Allow any version of pytz.
  no reason why we should require such a high version.
 Author: Thomas Goirand <zigo at debian.org>
 Forwarded: not-needed
-Last-Update: 2015-09-04
+Edited : Michal Arbet <michal.arbet at ultimum.io>
+Last-Update: 2017-07-24

---- a/requirements.txt
-+++ b/requirements.txt
+--- python-oslo.utils.orig/requirements.txt
++++ python-oslo.utils/requirements.txt
 @@ -13,7 +13,7 @@
  iso8601>=0.1.11 # MIT
  oslo.i18n>=2.1.0 # Apache-2.0
  monotonic>=0.6 # Apache-2.0
 -pytz>=2013.6 # MIT
 +pytz
- netaddr!=0.7.16,>=0.7.12 # BSD
+ netaddr!=0.7.16,>=0.7.13 # BSD
  netifaces>=0.10.4 # MIT
  debtcollector>=1.2.0 # Apache-2.0


Tests all OK :

pkgos-dh_auto_test
+ pyversions -vr
+ PYTHONS=2.7
+ py3versions -vr
+ PYTHON3S=3.6 3.5
+ echo 2.7
+ cut -d. -f1
+ PYMAJOR=2
+ echo ===> Testing with python (python2)
===> Testing with python (python2)
+ rm -rf .testrepository
+ testr-python2 init
+ mktemp -t
+ TEMP_REZ=/tmp/tmp.JzpXhoEz7r
+ tee /tmp/tmp.JzpXhoEz7r+
subunit2pyunit
+ pwd
+ PYTHONPATH=/opt/openstack/deb-python-oslo.utils PYTHON=python2.7
testr-python2 run --subunit
running=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
${PYTHON:-python} -m subunit.run discover -t ./ .
oslo_utils.tests.test_dictutils.DictUtilsTestCase.test_flatt
en_dict_to_keypairs
oslo_utils.tests.test_dictutils.DictUtilsTestCase.test_flatten_dict_to_keypairs
... ok
.
.
.
.
.
----------------------------------------------------------------------
Ran 8488 tests in 22.269s

OK
+ + + subunit-filter -s --no-passthrough
subunit-stats
cat /tmp/tmp.JzpXhoEz7r
Total tests:    8488
Passed tests:   8488
Failed tests:      0
Skipped tests:     0
Seen tags: worker-0
+ rm -f /tmp/tmp.JzpXhoEz7r
+ testr-python2 slowest
Test id

                                  Runtime (s)
------------------------------------------------------------
------------------------------------------------------------
-------------------------------------  -----------
oslo_utils.tests.test_timeutils.TimeUtilsTest.test_set_time_
override_using_default
                                       1.002
oslo_utils.tests.test_netutils.NetworkUtilsTest.test_get_my_
ipv4_address_without_default_route
                                       0.044
oslo_utils.tests.test_timeutils.StopWatchTest.test_context_m
anager_splits
                                       0.011
oslo_utils.tests.test_strutils.MaskPasswordTestCase.test_jso
n
                                       0.006
oslo_utils.tests.test_imageutils.ImageUtilsQemuTestCase.test
_qemu_img_info(disk_config,qcow2,2K,96K,no_garbage,one_
snapshots,65536,encrypted,no_backing_file)  0.006
oslo_utils.tests.test_strutils.MaskPasswordTestCase.test_mas
k_password
                                       0.005
oslo_utils.tests.test_specs_matcher.SpecsMatcherTestCase.tes
t_specs_fails_with_op_sneq
                                       0.004
oslo_utils.tests.test_netutils.NetworkUtilsTest.test_get_my_
ipv4_address_with_default_route
                                       0.004
oslo_utils.tests.test_specs_matcher.SpecsMatcherTestCase.tes
t_specs_fails_all_with_op_allin
                                       0.003
oslo_utils.tests.test_timeutils.TimeUtilsTest.test_parse_str
time
                                       0.003

===> Testing with python (python3)
+ rm -rf .testrepository
+ testr-python3 init
+ mktemp -t
+ TEMP_REZ=/tmp/tmp.GMk5NBUyHw
+ tee /tmp/tmp.GMk5NBUyHw
+ pwd
+ subunit2pyunit+ PYTHONPATH=/opt/openstack/deb-python-oslo.utils
PYTHON=python3.6
 testr-python3 run --subunit
oslo_utils.tests.test_dictutils.DictUtilsTestCase.test_flatt
en_dict_to_keypairs
oslo_utils.tests.test_dictutils.DictUtilsTestCase.test_flatten_dict_to_keypairs
... ok
.
.
.
.
.

----------------------------------------------------------------------
Ran 8491 tests in 21.302s

OK (skipped=4)
+ cat /tmp/tmp.GMk5NBUyHw
+ subunit-filter -s --no-passthrough
+ subunit-stats
Total tests:    8491
Passed tests:   8487
Failed tests:      0
Skipped tests:     4
Seen tags: worker-0
+ rm -f /tmp/tmp.GMk5NBUyHw
+ testr-python3 slowest
Test id

Runtime (s)
------------------------------------------------------------
-----------------------------------------------------------------------------
-----------
oslo_utils.tests.test_timeutils.TimeUtilsTest.test_set_time_
override_using_default
1.003
oslo_utils.tests.test_specs_matcher.SpecsMatcherTestCase.tes
t_specs_fails_with_op_or2
0.028
oslo_utils.tests.test_strutils.StringToBytesTest.test_string
_to_bytes(invalid_unit_system,positive,invalid_literal,Ti,B,return_dec)
0.018
oslo_utils.tests.test_timeutils.StopWatchTest.test_context_m
anager_splits
0.012
oslo_utils.tests.test_fnmatch.TestFnmatch.test_fnmatch

0.006
oslo_utils.tests.test_timeutils.TimeUtilsTest.test_parse_str
time
0.005
oslo_utils.tests.test_strutils.MaskPasswordTestCase.test_jso
n
0.005
oslo_utils.tests.test_strutils.StringToBytesTest.test_string
_to_bytes(invalid_unit_system,invalid_sign,invalid_literal,Ki,bit,return_dec)
0.004
oslo_utils.tests.test_strutils.StringToBytesTest.test_string
_to_bytes(iec,no_sign,decimal_point_start,no_unit_prefix,bit,return_int)
0.004
oslo_utils.tests.test_strutils.MaskPasswordTestCase.test_mas
k_password
0.004
+ rm -rf .testrepository
+ echo 3.5
+ cut -d. -f1
+ PYMAJOR=3
+ echo ===> Testing with python (python3)
===> Testing with python (python3)
+ rm -rf .testrepository
+ testr-python3 init
+ mktemp -t
+ TEMP_REZ=/tmp/tmp.YHXDOD2RgM
+ tee+  /tmp/tmp.YHXDOD2RgM+
subunit2pyunitpwd
+ PYTHONPATH=/opt/openstack/deb-python-oslo.utils PYTHON=python3.5
testr-python3 run --subunit
oslo_utils.tests.test_dictutils.DictUtilsTestCase.test_flatt
en_dict_to_keypairs
oslo_utils.tests.test_dictutils.DictUtilsTestCase.test_flatten_dict_to_keypairs
... ok
oslo_utils.tests.test_dictutils.DictUtilsTestCase.test_flatt
en_dict_to_keypairs_with_separator
oslo_utils.tests.test_dictutils.DictUtilsTestCase.test_flatt
en_dict_to_keypairs_with_separator ... ok
oslo_utils.tests.test_eventletutils.EventletUtilsTest.test_event_api_compat
oslo_utils.tests.test_eventletutils.EventletUtilsTest.test_event_api_compat
... ok

.
.
.
.
.
oslo_utils.tests.tests_encodeutils.ExceptionToUnicodeTest.test_unicode_or_str_exception
... skipped u'test specific to Python 2'
running=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
${PYTHON:-python} -m subunit.run discover -t ./ .

----------------------------------------------------------------------
Ran 8491 tests in 23.788s

OK (skipped=4)
+ + subunit-filtercat /tmp/tmp.YHXDOD2RgM
+ subunit-stats
 -s --no-passthrough
Total tests:    8491
Passed tests:   8487
Failed tests:      0
Skipped tests:     4
Seen tags: worker-0
+ rm -f /tmp/tmp.YHXDOD2RgM
+ testr-python3 slowest
Test id

Runtime (s)
------------------------------------------------------------
--------------------------------------------------------------------------------------
-----------
oslo_utils.tests.test_timeutils.TimeUtilsTest.test_set_time_
override_using_default
1.002
oslo_utils.tests.test_specs_matcher.SpecsMatcherTestCase.tes
t_specs_fails_with_op_sneq
0.041
oslo_utils.tests.test_strutils.StringToBytesTest.test_string
_to_bytes(invalid_unit_system,positive,garbage_value,k,
invalid_unit_suffix,return_int)  0.019
oslo_utils.tests.test_timeutils.StopWatchTest.test_context_m
anager_splits
0.012
oslo_utils.tests.tests_encodeutils.ExceptionToUnicodeTest.te
st_str_exception
0.005
oslo_utils.tests.test_strutils.MaskPasswordTestCase.test_jso
n
0.005
oslo_utils.tests.test_excutils.ForeverRetryUncaughtException
sTest.test_exc_retrier_same_10exc_2min_gives_2logs
0.004
oslo_utils.tests.test_strutils.MaskPasswordTestCase.test_mas
k_password
0.004
oslo_utils.tests.test_timeutils.TimeUtilsTest.test_parse_str
time
0.004
oslo_utils.tests.test_strutils.StringToBytesTest.test_string
_to_bytes(iec,invalid_sign,decimal,G,invalid_unit_suffix,return_dec)
0.004


Thanks,
Michal Arbet - Kevin
Ultimum Technologies
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/openstack-devel/attachments/20170725/05f218ff/attachment-0001.html>


More information about the Openstack-devel mailing list