Hello community, here is the log from the commit of package python-msm for openSUSE:Factory checked in at 2018-11-06 14:30:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-msm (Old) and /work/SRC/openSUSE:Factory/.python-msm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-msm" Tue Nov 6 14:30:54 2018 rev:5 rq:646021 version:0.5.19 Changes: -------- --- /work/SRC/openSUSE:Factory/python-msm/python-msm.changes 2018-08-28 09:24:56.156920051 +0200 +++ /work/SRC/openSUSE:Factory/.python-msm.new/python-msm.changes 2018-11-06 14:31:44.305263738 +0100 @@ -1,0 +2,11 @@ +Thu Nov 1 19:16:42 UTC 2018 - [email protected] + +- Update to python-msm 0.5.19 + * Add optional skill and author args to update + * Add LICENSE to package + * Normalize license headers + * Change default branch to 18.08 + * Remove python2 support +- Rebase add-local-patch-support.patch and fix-skills-directories.patch + +------------------------------------------------------------------- Old: ---- LICENSE msm-0.5.18.tar.gz New: ---- msm-0.5.19.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-msm.spec ++++++ --- /var/tmp/diff_new_pack.ij96tw/_old 2018-11-06 14:31:50.721255018 +0100 +++ /var/tmp/diff_new_pack.ij96tw/_new 2018-11-06 14:31:50.725255013 +0100 @@ -12,21 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-msm -Version: 0.5.18 +Version: 0.5.19 Release: 0 Summary: Mycroft Skills Manager License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/MycroftAI/mycroft-skills-manager Source: https://files.pythonhosted.org/packages/source/m/msm/msm-%{version}.tar.gz -Source99: https://raw.githubusercontent.com/MycroftAI/mycroft-skills-manager/master/LICENSE Patch0: fix-skills-directories.patch Patch1: do-not-run-pip-or-requirements-script.patch Patch2: add-local-patch-support.patch @@ -48,8 +47,8 @@ %patch1 -p1 %patch2 -p1 sed -i -e "s/install_requires=\['GitPython', 'typing'\]/install_requires=['GitPython']/" setup.py - -cp %{SOURCE99} . +sed -i -e "s/data_files=\[('msm', \['LICENSE'\])\]//" setup.py +chmod -x LICENSE %build %python_build ++++++ add-local-patch-support.patch ++++++ --- /var/tmp/diff_new_pack.ij96tw/_old 2018-11-06 14:31:50.761254964 +0100 +++ /var/tmp/diff_new_pack.ij96tw/_new 2018-11-06 14:31:50.765254959 +0100 @@ -4,7 +4,7 @@ +++ msm-0.5.17/msm/skill_entry.py @@ -39,6 +39,8 @@ from msm.exceptions import PipRequiremen SystemRequirementsException, AlreadyInstalled, SkillModified, \ - AlreadyRemoved, RemoveException, CloneException + AlreadyRemoved, RemoveException, CloneException, NotInstalled from msm.util import Git +from msm.local_patches_utils import apply_skill_patch, \ + reverse_skill_patch, remove_applied_skill_patch ++++++ fix-skills-directories.patch ++++++ --- /var/tmp/diff_new_pack.ij96tw/_old 2018-11-06 14:31:50.777254942 +0100 +++ /var/tmp/diff_new_pack.ij96tw/_new 2018-11-06 14:31:50.777254942 +0100 @@ -178,5 +178,5 @@ - self.path = path or "/opt/mycroft/.skills-repo" + self.path = path or get_skills_repo_directory() self.url = url or "https://github.com/MycroftAI/mycroft-skills"; - self.branch = branch or "18.02" + self.branch = branch or "18.08" self.repo_info = {} ++++++ msm-0.5.18.tar.gz -> msm-0.5.19.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msm-0.5.18/LICENSE new/msm-0.5.19/LICENSE --- old/msm-0.5.18/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/msm-0.5.19/LICENSE 2018-08-14 09:59:47.000000000 +0200 @@ -0,0 +1,176 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msm-0.5.18/PKG-INFO new/msm-0.5.19/PKG-INFO --- old/msm-0.5.18/PKG-INFO 2018-08-14 22:49:45.000000000 +0200 +++ new/msm-0.5.19/PKG-INFO 2018-08-28 13:37:00.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: msm -Version: 0.5.18 +Version: 0.5.19 Summary: Mycroft Skills Manager Home-page: https://github.com/MycroftAI/mycroft-skills-manager Author: jarbasAI, Matthew Scholefield diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msm-0.5.18/msm/__init__.py new/msm-0.5.19/msm/__init__.py --- old/msm-0.5.18/msm/__init__.py 2018-07-05 22:00:36.000000000 +0200 +++ new/msm-0.5.19/msm/__init__.py 2018-08-28 13:22:08.000000000 +0200 @@ -1,6 +1,6 @@ # Copyright (c) 2018 Mycroft AI, Inc. # -# This file is part of Mycroft Light +# This file is part of Mycroft Skills Manager # (see https://github.com/MatthewScholefield/mycroft-light). # # Licensed to the Apache Software Foundation (ASF) under one diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msm-0.5.18/msm/__main__.py new/msm-0.5.19/msm/__main__.py --- old/msm-0.5.18/msm/__main__.py 2018-07-05 22:00:36.000000000 +0200 +++ new/msm-0.5.19/msm/__main__.py 2018-08-28 13:22:08.000000000 +0200 @@ -1,6 +1,6 @@ # Copyright (c) 2018 Mycroft AI, Inc. # -# This file is part of Mycroft Light +# This file is part of Mycroft Skills Manager # (see https://github.com/MatthewScholefield/mycroft-light). # # Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from __future__ import print_function import logging import sys @@ -64,8 +63,11 @@ subparsers = parser.add_subparsers(dest='action') subparsers.required = True - def add_search_args(subparser): - subparser.add_argument('skill') + def add_search_args(subparser, skill_is_optional=False): + if skill_is_optional: + subparser.add_argument('skill', nargs='?') + else: + subparser.add_argument('skill') subparser.add_argument('author', nargs='?') add_search_args(subparsers.add_parser('install')) @@ -74,7 +76,7 @@ add_search_args(subparsers.add_parser('info')) subparsers.add_parser('list').add_argument('-i', '--installed', action='store_true') - subparsers.add_parser('update') + add_search_args(subparsers.add_parser('update'), skill_is_optional=True) subparsers.add_parser('default') args = parser.parse_args(args or sys.argv[1:]) @@ -97,7 +99,7 @@ for skill in msm.list() if not args.installed or skill.is_local ), - 'update': msm.update, + 'update': lambda: msm.update(args.skill, args.author), 'default': msm.install_defaults, 'search': lambda: '\n'.join( skill.name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msm-0.5.18/msm/exceptions.py new/msm-0.5.19/msm/exceptions.py --- old/msm-0.5.18/msm/exceptions.py 2018-07-05 22:00:36.000000000 +0200 +++ new/msm-0.5.19/msm/exceptions.py 2018-08-28 13:22:08.000000000 +0200 @@ -1,6 +1,6 @@ # Copyright (c) 2018 Mycroft AI, Inc. # -# This file is part of Mycroft Light +# This file is part of Mycroft Skills Manager # (see https://github.com/MatthewScholefield/mycroft-light). # # Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,6 @@ # under the License. from contextlib import contextmanager -from future.utils import raise_from from git import GitError @@ -73,6 +72,10 @@ pass +class NotInstalled(MsmException): + pass + + class SystemRequirementsException(InstallException): pass @@ -100,4 +103,4 @@ try: yield except GitError as e: - raise_from(GitException('Git command failed: {}'.format(repr(e))), e) + raise GitException('Git command failed: {}'.format(repr(e))) from e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msm-0.5.18/msm/mycroft_skills_manager.py new/msm-0.5.19/msm/mycroft_skills_manager.py --- old/msm-0.5.18/msm/mycroft_skills_manager.py 2018-08-14 22:48:36.000000000 +0200 +++ new/msm-0.5.19/msm/mycroft_skills_manager.py 2018-08-28 13:22:08.000000000 +0200 @@ -1,6 +1,6 @@ # Copyright (c) 2018 Mycroft AI, Inc. # -# This file is part of Mycroft Light +# This file is part of Mycroft Skills Manager # (see https://github.com/MatthewScholefield/mycroft-light). # # Licensed to the Apache Software Foundation (ASF) under one @@ -55,8 +55,7 @@ """Remove by url or name""" self.find_skill(param, author).remove() - def update(self): - """Update all downloaded skills""" + def update_all(self): local_skills = [skill for skill in self.list() if skill.is_local] def update_skill(skill): @@ -64,6 +63,13 @@ return self.apply(update_skill, local_skills) + def update(self, skill=None, author=None): + """Update all downloaded skills or one specified skill.""" + if skill is None: + return self.update_all() + else: + return self.find_skill(skill, author).update() + def apply(self, func, skills): """Run a function on all skills in parallel""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msm-0.5.18/msm/skill_entry.py new/msm-0.5.19/msm/skill_entry.py --- old/msm-0.5.18/msm/skill_entry.py 2018-08-03 19:13:37.000000000 +0200 +++ new/msm-0.5.19/msm/skill_entry.py 2018-08-28 13:22:08.000000000 +0200 @@ -1,6 +1,6 @@ # Copyright (c) 2018 Mycroft AI, Inc. # -# This file is part of Mycroft Light +# This file is part of Mycroft Skills Manager # (see https://github.com/MatthewScholefield/mycroft-light). # # Licensed to the Apache Software Foundation (ASF) under one @@ -37,7 +37,7 @@ from msm import SkillRequirementsException, git_to_msm_exceptions from msm.exceptions import PipRequirementsException, \ SystemRequirementsException, AlreadyInstalled, SkillModified, \ - AlreadyRemoved, RemoveException, CloneException + AlreadyRemoved, RemoveException, CloneException, NotInstalled from msm.util import Git LOG = logging.getLogger(__name__) @@ -265,6 +265,8 @@ return sha_branch def update(self): + if not self.is_local: + raise NotInstalled('{} is not installed'.format(self.name)) git = Git(self.path) with git_to_msm_exceptions(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msm-0.5.18/msm/skill_repo.py new/msm-0.5.19/msm/skill_repo.py --- old/msm-0.5.18/msm/skill_repo.py 2018-07-21 00:33:44.000000000 +0200 +++ new/msm-0.5.19/msm/skill_repo.py 2018-08-28 13:22:08.000000000 +0200 @@ -1,6 +1,6 @@ # Copyright (c) 2018 Mycroft AI, Inc. # -# This file is part of Mycroft Light +# This file is part of Mycroft Skills Manager # (see https://github.com/MatthewScholefield/mycroft-light). # # Licensed to the Apache Software Foundation (ASF) under one @@ -38,7 +38,7 @@ def __init__(self, path=None, url=None, branch=None): self.path = path or "/opt/mycroft/.skills-repo" self.url = url or "https://github.com/MycroftAI/mycroft-skills"; - self.branch = branch or "18.02" + self.branch = branch or "18.08" self.repo_info = {} def read_file(self, filename): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msm-0.5.18/msm/util.py new/msm-0.5.19/msm/util.py --- old/msm-0.5.18/msm/util.py 2018-07-05 22:00:36.000000000 +0200 +++ new/msm-0.5.19/msm/util.py 2018-08-28 13:22:08.000000000 +0200 @@ -1,3 +1,24 @@ +# Copyright (c) 2018 Mycroft AI, Inc. +# +# This file is part of Mycroft Skills Manager +# (see https://github.com/MatthewScholefield/mycroft-light). +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. import git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msm-0.5.18/msm.egg-info/PKG-INFO new/msm-0.5.19/msm.egg-info/PKG-INFO --- old/msm-0.5.18/msm.egg-info/PKG-INFO 2018-08-14 22:49:45.000000000 +0200 +++ new/msm-0.5.19/msm.egg-info/PKG-INFO 2018-08-28 13:37:00.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: msm -Version: 0.5.18 +Version: 0.5.19 Summary: Mycroft Skills Manager Home-page: https://github.com/MycroftAI/mycroft-skills-manager Author: jarbasAI, Matthew Scholefield diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msm-0.5.18/msm.egg-info/SOURCES.txt new/msm-0.5.19/msm.egg-info/SOURCES.txt --- old/msm-0.5.18/msm.egg-info/SOURCES.txt 2018-08-14 22:49:45.000000000 +0200 +++ new/msm-0.5.19/msm.egg-info/SOURCES.txt 2018-08-28 13:37:00.000000000 +0200 @@ -1,3 +1,4 @@ +LICENSE setup.py msm/__init__.py msm/__main__.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msm-0.5.18/setup.py new/msm-0.5.19/setup.py --- old/msm-0.5.18/setup.py 2018-08-14 22:48:36.000000000 +0200 +++ new/msm-0.5.19/setup.py 2018-08-28 13:22:08.000000000 +0200 @@ -1,6 +1,6 @@ # Copyright (c) 2018 Mycroft AI, Inc. # -# This file is part of Mycroft Light +# This file is part of Mycroft Skills Manager # (see https://github.com/MatthewScholefield/mycroft-light). # # Licensed to the Apache Software Foundation (ASF) under one @@ -23,7 +23,7 @@ setup( name='msm', - version='0.5.18', + version='0.5.19', packages=['msm'], install_requires=['GitPython', 'typing'], url='https://github.com/MycroftAI/mycroft-skills-manager', @@ -35,5 +35,6 @@ 'console_scripts': { 'msm=msm.__main__:main' } - } + }, + data_files=[('msm', ['LICENSE'])] )
