diff -Nru tryton-modules-stock-package-shipping-ups-5.0.1/CHANGELOG tryton-modules-stock-package-shipping-ups-5.0.2/CHANGELOG --- tryton-modules-stock-package-shipping-ups-5.0.1/CHANGELOG 2019-02-19 21:14:38.000000000 +0000 +++ tryton-modules-stock-package-shipping-ups-5.0.2/CHANGELOG 2019-06-10 16:39:00.000000000 +0000 @@ -1,3 +1,6 @@ +Version 5.0.2 - 2019-06-10 +* Bug fixes (see mercurial logs for details) + Version 5.0.1 - 2019-02-19 * Bug fixes (see mercurial logs for details) diff -Nru tryton-modules-stock-package-shipping-ups-5.0.1/debian/changelog tryton-modules-stock-package-shipping-ups-5.0.2/debian/changelog --- tryton-modules-stock-package-shipping-ups-5.0.1/debian/changelog 2019-07-22 10:17:34.000000000 +0000 +++ tryton-modules-stock-package-shipping-ups-5.0.2/debian/changelog 2019-07-25 07:46:25.000000000 +0000 @@ -1,3 +1,15 @@ +tryton-modules-stock-package-shipping-ups (5.0.2-2) unstable; urgency=medium + + * Remove 01-skip-non-idempotent-tests.patch, patch went upstream. + + -- Mathias Behrle Thu, 25 Jul 2019 09:46:25 +0200 + +tryton-modules-stock-package-shipping-ups (5.0.2-1) unstable; urgency=medium + + * Merging upstream version 5.0.2. + + -- Mathias Behrle Tue, 23 Jul 2019 19:51:29 +0200 + tryton-modules-stock-package-shipping-ups (5.0.1-2) unstable; urgency=medium * Add the actual upstream maintainer key to signing-key.asc. diff -Nru tryton-modules-stock-package-shipping-ups-5.0.1/debian/patches/01-skip-non-idempotent-tests.patch tryton-modules-stock-package-shipping-ups-5.0.2/debian/patches/01-skip-non-idempotent-tests.patch --- tryton-modules-stock-package-shipping-ups-5.0.1/debian/patches/01-skip-non-idempotent-tests.patch 2019-07-20 11:47:07.000000000 +0000 +++ tryton-modules-stock-package-shipping-ups-5.0.2/debian/patches/01-skip-non-idempotent-tests.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -Description: Skip tests requiring UPS configuration. -Bug: https://bugs.tryton.org/issue7965 -Forwarded: https://bugs.tryton.org/issue7965 - ---- tryton-modules-stock-package-shipping-ups-5.0.0.orig/tests/test_shipping_ups.py -+++ tryton-modules-stock-package-shipping-ups-5.0.0/tests/test_shipping_ups.py -@@ -1,8 +1,9 @@ - # This file is part of Tryton. The COPYRIGHT file at the top level of - # this repository contains the full copyright notices and license terms. - --import unittest - import doctest -+import os -+import unittest - - from trytond.tests.test_tryton import ModuleTestCase - from trytond.tests.test_tryton import suite as test_suite -@@ -18,8 +19,12 @@ def suite(): - suite = test_suite() - suite.addTests(unittest.TestLoader().loadTestsFromTestCase( - ShippingUpsTestCase)) -- suite.addTests(doctest.DocFileSuite('scenario_shipping_ups.rst', -- tearDown=doctest_teardown, encoding='utf-8', -- optionflags=doctest.REPORT_ONLY_FIRST_FAILURE, -- checker=doctest_checker)) -+ if (os.getenv('UPS_USER_ID') -+ and os.getenv('UPS_PASSWORD') -+ and os.getenv('UPS_LICENSE') -+ and os.getenv('UPS_ACCOUNT_NUMBER')): -+ suite.addTests(doctest.DocFileSuite('scenario_shipping_ups.rst', -+ tearDown=doctest_teardown, encoding='utf-8', -+ optionflags=doctest.REPORT_ONLY_FIRST_FAILURE, -+ checker=doctest_checker)) - return suite diff -Nru tryton-modules-stock-package-shipping-ups-5.0.1/debian/patches/series tryton-modules-stock-package-shipping-ups-5.0.2/debian/patches/series --- tryton-modules-stock-package-shipping-ups-5.0.1/debian/patches/series 2019-07-20 11:47:07.000000000 +0000 +++ tryton-modules-stock-package-shipping-ups-5.0.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -01-skip-non-idempotent-tests.patch diff -Nru tryton-modules-stock-package-shipping-ups-5.0.1/.hgtags tryton-modules-stock-package-shipping-ups-5.0.2/.hgtags --- tryton-modules-stock-package-shipping-ups-5.0.1/.hgtags 2019-02-19 21:14:39.000000000 +0000 +++ tryton-modules-stock-package-shipping-ups-5.0.2/.hgtags 2019-06-10 16:39:01.000000000 +0000 @@ -4,3 +4,4 @@ 4437ebda9bc7470b4b98ee42370d12a6f942b1c3 4.8.0 3e4c032cdadea2e021de270022e212eadb23c9d8 5.0.0 823b0f8b3bc74dcebfdc281141cd788830e095d3 5.0.1 +41ffcca0bce3f962091144389acc74128ee90ddd 5.0.2 diff -Nru tryton-modules-stock-package-shipping-ups-5.0.1/PKG-INFO tryton-modules-stock-package-shipping-ups-5.0.2/PKG-INFO --- tryton-modules-stock-package-shipping-ups-5.0.1/PKG-INFO 2019-02-19 21:14:40.000000000 +0000 +++ tryton-modules-stock-package-shipping-ups-5.0.2/PKG-INFO 2019-06-10 16:39:02.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: trytond_stock_package_shipping_ups -Version: 5.0.1 +Version: 5.0.2 Summary: UPS connector for the Tryton application plateform Home-page: http://www.tryton.org/ Author: Tryton diff -Nru tryton-modules-stock-package-shipping-ups-5.0.1/tests/test_shipping_ups.py tryton-modules-stock-package-shipping-ups-5.0.2/tests/test_shipping_ups.py --- tryton-modules-stock-package-shipping-ups-5.0.1/tests/test_shipping_ups.py 2018-10-01 13:51:18.000000000 +0000 +++ tryton-modules-stock-package-shipping-ups-5.0.2/tests/test_shipping_ups.py 2019-05-28 16:23:10.000000000 +0000 @@ -1,8 +1,9 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. -import unittest import doctest +import os +import unittest from trytond.tests.test_tryton import ModuleTestCase from trytond.tests.test_tryton import suite as test_suite @@ -18,8 +19,12 @@ suite = test_suite() suite.addTests(unittest.TestLoader().loadTestsFromTestCase( ShippingUpsTestCase)) - suite.addTests(doctest.DocFileSuite('scenario_shipping_ups.rst', - tearDown=doctest_teardown, encoding='utf-8', - optionflags=doctest.REPORT_ONLY_FIRST_FAILURE, - checker=doctest_checker)) + if (os.getenv('UPS_USER_ID') + and os.getenv('UPS_PASSWORD') + and os.getenv('UPS_LICENSE') + and os.getenv('UPS_ACCOUNT_NUMBER')): + suite.addTests(doctest.DocFileSuite('scenario_shipping_ups.rst', + tearDown=doctest_teardown, encoding='utf-8', + optionflags=doctest.REPORT_ONLY_FIRST_FAILURE, + checker=doctest_checker)) return suite diff -Nru tryton-modules-stock-package-shipping-ups-5.0.1/tryton.cfg tryton-modules-stock-package-shipping-ups-5.0.2/tryton.cfg --- tryton-modules-stock-package-shipping-ups-5.0.1/tryton.cfg 2018-10-01 13:52:34.000000000 +0000 +++ tryton-modules-stock-package-shipping-ups-5.0.2/tryton.cfg 2019-05-28 16:23:14.000000000 +0000 @@ -1,5 +1,5 @@ [tryton] -version=5.0.1 +version=5.0.2 depends: ir res diff -Nru tryton-modules-stock-package-shipping-ups-5.0.1/trytond_stock_package_shipping_ups.egg-info/PKG-INFO tryton-modules-stock-package-shipping-ups-5.0.2/trytond_stock_package_shipping_ups.egg-info/PKG-INFO --- tryton-modules-stock-package-shipping-ups-5.0.1/trytond_stock_package_shipping_ups.egg-info/PKG-INFO 2019-02-19 21:14:40.000000000 +0000 +++ tryton-modules-stock-package-shipping-ups-5.0.2/trytond_stock_package_shipping_ups.egg-info/PKG-INFO 2019-06-10 16:39:01.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: trytond-stock-package-shipping-ups -Version: 5.0.1 +Version: 5.0.2 Summary: UPS connector for the Tryton application plateform Home-page: http://www.tryton.org/ Author: Tryton