diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/ChangeLog murano-9.0.0~b3~git2020041013.564f9cf3/ChangeLog --- murano-9.0.0~b2~git2020020609.25ebd01d/ChangeLog 2020-02-06 09:58:07.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/ChangeLog 2020-04-10 17:16:02.000000000 +0000 @@ -1,6 +1,8 @@ CHANGES ======= +* Cleanup py27 support +* Update hacking for Python3 * Drop unittest2 usage * Imported Translations from Zanata * Eventlet monkey patching should be as early as possible diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/debian/changelog murano-9.0.0~b3~git2020041013.564f9cf3/debian/changelog --- murano-9.0.0~b2~git2020020609.25ebd01d/debian/changelog 2020-03-26 18:43:49.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/debian/changelog 2020-04-10 17:16:48.000000000 +0000 @@ -1,3 +1,11 @@ +murano (1:9.0.0~b3~git2020041013.564f9cf3-0ubuntu1) focal; urgency=medium + + * New upstream snapshot for OpenStack Ussuri. + * d/murano-common.postinst.in: Set ownership and permissions for all /var/lib + files and directories. + + -- Corey Bryant Fri, 10 Apr 2020 13:16:48 -0400 + murano (1:9.0.0~b2~git2020020609.25ebd01d-0ubuntu2) focal; urgency=medium * d/murano-common.postinst.in: Set default ownership and permissions diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/debian/murano-common.postinst.in murano-9.0.0~b3~git2020041013.564f9cf3/debian/murano-common.postinst.in --- murano-9.0.0~b2~git2020020609.25ebd01d/debian/murano-common.postinst.in 2020-03-26 18:43:49.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/debian/murano-common.postinst.in 2020-04-10 17:16:48.000000000 +0000 @@ -39,8 +39,8 @@ find /etc/murano -exec chown root:murano "{}" + find /etc/murano -type f -exec chmod 0640 "{}" + -o -type d -exec chmod 0750 "{}" + - chown murano:murano /var/lib/murano - chmod 0750 /var/lib/murano + find /var/lib/murano -exec chown murano:murano "{}" + + find /var/lib/murano -type f -exec chmod 0640 "{}" + -o -type d -exec chmod 0750 "{}" + fi #DEBHELPER# diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/doc/requirements.txt murano-9.0.0~b3~git2020041013.564f9cf3/doc/requirements.txt --- murano-9.0.0~b2~git2020020609.25ebd01d/doc/requirements.txt 2020-02-06 09:58:06.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/doc/requirements.txt 2020-04-10 17:15:56.000000000 +0000 @@ -1,5 +1,5 @@ # doc build requirements -sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD sphinxcontrib-httpdomain>=1.3.0 # BSD reno>=2.5.0 # Apache-2.0 openstackdocstheme>=1.20.0 # Apache-2.0 diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/murano/engine/system/workflowclient.py murano-9.0.0~b3~git2020041013.564f9cf3/murano/engine/system/workflowclient.py --- murano-9.0.0~b2~git2020020609.25ebd01d/murano/engine/system/workflowclient.py 2020-02-06 09:58:06.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/murano/engine/system/workflowclient.py 2020-04-10 17:15:56.000000000 +0000 @@ -19,7 +19,7 @@ import eventlet try: from mistralclient.api import client as mistralcli -except ImportError as mistral_import_error: +except ImportError: mistralcli = None from oslo_config import cfg from oslo_log import log as logging diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/murano/hacking/checks.py murano-9.0.0~b3~git2020041013.564f9cf3/murano/hacking/checks.py --- murano-9.0.0~b2~git2020020609.25ebd01d/murano/hacking/checks.py 2020-02-06 09:58:06.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/murano/hacking/checks.py 2020-04-10 17:15:56.000000000 +0000 @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import re """ Guidelines for writing new hacking checks @@ -28,6 +27,10 @@ - Add test cases for each new rule to /tests/unit/test_hacking.py """ +import re + +from hacking import core + mutable_default_args = re.compile(r"^\s*def .+\((.+=\{\}|.+=\[\])") assert_equal_end_with_none_re = re.compile( r"(.)*assertEqual\((\w|\.|\'|\"|\[|\])+, None\)") @@ -35,6 +38,7 @@ r"(.)*assertEqual\(None, (\w|\.|\'|\"|\[|\])+\)") +@core.flake8ext def assert_equal_none(logical_line): """Check for assertEqual(A, None) or assertEqual(None, A) sentences @@ -48,20 +52,16 @@ yield (0, msg) +@core.flake8ext def no_mutable_default_args(logical_line): msg = "M322: Method's default argument shouldn't be mutable!" if mutable_default_args.match(logical_line): yield (0, msg) +@core.flake8ext def check_no_basestring(logical_line): if re.search(r"\bbasestring\b", logical_line): msg = ("M326: basestring is not Python3-compatible, use " "six.string_types instead.") yield(0, msg) - - -def factory(register): - register(assert_equal_none) - register(no_mutable_default_args) - register(check_no_basestring) diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/murano/policy/model_policy_enforcer.py murano-9.0.0~b3~git2020041013.564f9cf3/murano/policy/model_policy_enforcer.py --- murano-9.0.0~b2~git2020020609.25ebd01d/murano/policy/model_policy_enforcer.py 2020-02-06 09:58:06.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/murano/policy/model_policy_enforcer.py 2020-04-10 17:15:56.000000000 +0000 @@ -18,7 +18,7 @@ try: # integration with congress is optional import congressclient.v1.client as congress_client -except ImportError as congress_client_import_error: +except ImportError: congress_client = None from oslo_log import log as logging diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/murano/tests/unit/engine/system/test_workflowclient.py murano-9.0.0~b3~git2020041013.564f9cf3/murano/tests/unit/engine/system/test_workflowclient.py --- murano-9.0.0~b2~git2020020609.25ebd01d/murano/tests/unit/engine/system/test_workflowclient.py 2020-02-06 09:58:06.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/murano/tests/unit/engine/system/test_workflowclient.py 2020-04-10 17:15:56.000000000 +0000 @@ -18,7 +18,7 @@ try: from mistralclient.api import client as mistralcli -except ImportError as mistral_import_error: +except ImportError: mistralcli = None import mock diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/murano/tests/unit/test_hacking.py murano-9.0.0~b3~git2020041013.564f9cf3/murano/tests/unit/test_hacking.py --- murano-9.0.0~b2~git2020020609.25ebd01d/murano/tests/unit/test_hacking.py 2020-02-06 09:58:06.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/murano/tests/unit/test_hacking.py 2020-04-10 17:15:56.000000000 +0000 @@ -104,11 +104,3 @@ self.assertEqual(0, len(list(checks.check_no_basestring( "isinstance('foo', six.string_types)")))) - - def test_factory(self): - mock_register = mock.MagicMock() - checks.factory(mock_register) - expected = [ - mock.call(checks.no_mutable_default_args), - mock.call(checks.check_no_basestring)] - mock_register.assert_has_calls(expected) diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/murano.egg-info/pbr.json murano-9.0.0~b3~git2020041013.564f9cf3/murano.egg-info/pbr.json --- murano-9.0.0~b2~git2020020609.25ebd01d/murano.egg-info/pbr.json 2020-02-06 09:58:08.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/murano.egg-info/pbr.json 2020-04-10 17:16:02.000000000 +0000 @@ -1 +1 @@ -{"git_version": "25ebd01d", "is_release": false} \ No newline at end of file +{"git_version": "564f9cf3", "is_release": false} \ No newline at end of file diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/murano.egg-info/PKG-INFO murano-9.0.0~b3~git2020041013.564f9cf3/murano.egg-info/PKG-INFO --- murano-9.0.0~b2~git2020020609.25ebd01d/murano.egg-info/PKG-INFO 2020-02-06 09:58:08.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/murano.egg-info/PKG-INFO 2020-04-10 17:16:02.000000000 +0000 @@ -1,6 +1,6 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: murano -Version: 8.1.0.dev7 +Version: 8.1.0.dev9 Summary: Murano API Home-page: https://www.openstack.org/software/releases/mitaka/components/murano Author: OpenStack @@ -58,6 +58,9 @@ Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: Implementation :: CPython +Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 +Requires-Python: >=3.6 diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/PKG-INFO murano-9.0.0~b3~git2020041013.564f9cf3/PKG-INFO --- murano-9.0.0~b2~git2020020609.25ebd01d/PKG-INFO 2020-02-06 09:58:08.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/PKG-INFO 2020-04-10 17:16:03.075533000 +0000 @@ -1,6 +1,6 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: murano -Version: 8.1.0.dev7 +Version: 8.1.0.dev9 Summary: Murano API Home-page: https://www.openstack.org/software/releases/mitaka/components/murano Author: OpenStack @@ -58,6 +58,9 @@ Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: Implementation :: CPython +Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 +Requires-Python: >=3.6 diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/setup.cfg murano-9.0.0~b3~git2020041013.564f9cf3/setup.cfg --- murano-9.0.0~b2~git2020020609.25ebd01d/setup.cfg 2020-02-06 09:58:08.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/setup.cfg 2020-04-10 17:16:03.075533000 +0000 @@ -7,6 +7,7 @@ author = OpenStack author-email = openstack-discuss@lists.openstack.org home-page = https://www.openstack.org/software/releases/mitaka/components/murano +python-requires = >=3.6 classifier = Development Status :: 5 - Production/Stable Environment :: OpenStack @@ -15,6 +16,8 @@ License :: OSI Approved :: Apache Software License Operating System :: OS Independent Programming Language :: Python + Programming Language :: Python :: Implementation :: CPython + Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 @@ -27,10 +30,6 @@ etc/murano/murano-cfapi-paste.ini etc/murano/murano-paste.ini -[global] -setup-hooks = - pbr.hooks.setup_hook - [entry_points] console_scripts = murano-api = murano.cmd.api:main @@ -51,8 +50,6 @@ oslo.config.opts.defaults = murano = murano.common.config:set_middleware_defaults oslo.policy.policies = - # With the move of default policy in code list_rules returns a list of - # the default defined polices. murano = murano.common.policies:list_rules murano_policy_modify_actions = remove-object = murano.policy.modify.actions.default_actions:RemoveObjectAction diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/setup.py murano-9.0.0~b3~git2020041013.564f9cf3/setup.py --- murano-9.0.0~b2~git2020020609.25ebd01d/setup.py 2020-02-06 09:58:06.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/setup.py 2020-04-10 17:15:56.000000000 +0000 @@ -13,17 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: http://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - setuptools.setup( setup_requires=['pbr>=2.0.0'], pbr=True) diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/test-requirements.txt murano-9.0.0~b3~git2020041013.564f9cf3/test-requirements.txt --- murano-9.0.0~b2~git2020020609.25ebd01d/test-requirements.txt 2020-02-06 09:58:06.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/test-requirements.txt 2020-04-10 17:15:56.000000000 +0000 @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=1.1.0,<1.2.0 # Apache-2.0 +hacking>=3.0,<4.0.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD diff -Nru murano-9.0.0~b2~git2020020609.25ebd01d/tox.ini murano-9.0.0~b3~git2020041013.564f9cf3/tox.ini --- murano-9.0.0~b2~git2020020609.25ebd01d/tox.ini 2020-02-06 09:58:06.000000000 +0000 +++ murano-9.0.0~b3~git2020041013.564f9cf3/tox.ini 2020-04-10 17:15:56.000000000 +0000 @@ -99,10 +99,16 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build [hacking] -local-check-factory = murano.hacking.checks.factory import_exceptions = oslo.db.sqlalchemy.test_base, murano.common.i18n +[flake8:local-plugins] +extension = + M318 = checks:assert_equal_none + M322 = checks:no_mutable_default_args + M326 = checks:check_no_basestring +paths = ./murano/hacking + [testenv:bindep] # Do not install any requirements. We want this to be fast and work even if # system dependencies are missing, since it's used to tell you what system