Hello community, here is the log from the commit of package python-msk for openSUSE:Factory checked in at 2018-11-06 14:30:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-msk (Old) and /work/SRC/openSUSE:Factory/.python-msk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-msk" Tue Nov 6 14:30:09 2018 rev:2 rq:646020 version:0.3.11 Changes: -------- --- /work/SRC/openSUSE:Factory/python-msk/python-msk.changes 2018-08-02 14:58:13.932286446 +0200 +++ /work/SRC/openSUSE:Factory/.python-msk.new/python-msk.changes 2018-11-06 14:30:44.849344489 +0100 @@ -1,0 +2,11 @@ +Thu Nov 1 18:52:45 UTC 2018 - Antonio Larrosa <[email protected]> + +- Update to msk 0.3.11 + * Support changing msk branch via command line + * Add alternative upgrade example + * Add titles to README sections for permalinking + * Change skill branch naming convention to not use slashes + * Support git injector with token + * Support token authentication + +------------------------------------------------------------------- Old: ---- msk-0.3.10.tar.gz New: ---- msk-0.3.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-msk.spec ++++++ --- /var/tmp/diff_new_pack.sAo0bp/_old 2018-11-06 14:30:52.445334178 +0100 +++ /var/tmp/diff_new_pack.sAo0bp/_new 2018-11-06 14:30:52.449334172 +0100 @@ -12,14 +12,14 @@ # 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-msk -Version: 0.3.10 +Version: 0.3.11 Release: 0 Summary: Mycroft Skills Kit License: Apache-2.0 ++++++ fix-dependencies.patch ++++++ --- /var/tmp/diff_new_pack.sAo0bp/_old 2018-11-06 14:30:52.493334112 +0100 +++ /var/tmp/diff_new_pack.sAo0bp/_new 2018-11-06 14:30:52.497334107 +0100 @@ -4,7 +4,7 @@ +++ msk-0.3.10/setup.py @@ -25,7 +25,7 @@ setup( name='msk', - version='0.3.10', # Also update in msk/__init__.py + version='0.3.11', # Also update in msk/__init__.py packages=['msk', 'msk.actions'], - install_requires=['GitPython', 'typing', 'msm>=0.5.13', 'pygithub'], + install_requires=['GitPython', 'msm>=0.5.13', 'pygithub'], ++++++ msk-0.3.10.tar.gz -> msk-0.3.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msk-0.3.10/PKG-INFO new/msk-0.3.11/PKG-INFO --- old/msk-0.3.10/PKG-INFO 2018-06-11 18:21:15.000000000 +0200 +++ new/msk-0.3.11/PKG-INFO 2018-08-28 15:43:05.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: msk -Version: 0.3.10 +Version: 0.3.11 Summary: Mycroft Skills Kit Home-page: https://github.com/MycroftAI/mycroft-skills-kit Author: Mycroft AI diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msk-0.3.10/README.md new/msk-0.3.11/README.md --- old/msk-0.3.10/README.md 2018-06-01 22:36:00.000000000 +0200 +++ new/msk-0.3.11/README.md 2018-08-27 08:43:07.000000000 +0200 @@ -30,12 +30,33 @@ msk upload /opt/mycroft/skills/myskill msk upgrade /opt/mycroft/skills/myskill ``` +### Creating a New Skill -**`create-test`:** +`msk create`: + +[](https://asciinema.org/a/X5pWLPOpsMLUPYp5kgswNm5Zu?speed=1.5) + +### Creating Tests + +`msk create-test /opt/mycroft/skills/myskill`: [](https://asciinema.org/a/Ayzaj6QJbKGBfs2eIQWr11idH?speed=1.5) +## Uploading New Skill -**`upload`:** +`msk upload /opt/mycroft/skills/myskill`: [](https://asciinema.org/a/Bp1sORVnmVz9wYjZXfempTPoO?speed=1.5) + +## Upgrading an Existing Skill + +```bash +msk upgrade /opt/mycroft/skills/myskill +``` + + --or-- + +```bash +cd /opt/mycroft/skills/myskill +msk upgrade . +``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msk-0.3.10/msk/__main__.py new/msk-0.3.11/msk/__main__.py --- old/msk-0.3.10/msk/__main__.py 2018-06-01 21:16:34.000000000 +0200 +++ new/msk-0.3.11/msk/__main__.py 2018-08-28 13:15:50.000000000 +0200 @@ -46,6 +46,7 @@ parser.add_argument('-b', '--repo-branch', help='Branch of skills repo to upload to') parser.add_argument('-s', '--skills-dir', help='Directory to look for skills in') parser.add_argument('-c', '--repo-cache', help='Location to store local skills repo clone') + parser.add_argument('-t', '--use-token', action='store_true') subparsers = parser.add_subparsers(dest='action') subparsers.required = True @@ -59,6 +60,8 @@ context.msm = MycroftSkillsManager( skills_dir=args.skills_dir, repo=SkillRepo(url=args.repo_url, branch=args.repo_branch) ) + context.use_token = args.use_token + context.branch = context.msm.repo.branch try: return console_actions[args.action](args).perform() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msk-0.3.10/msk/actions/upgrade.py new/msk-0.3.11/msk/actions/upgrade.py --- old/msk-0.3.10/msk/actions/upgrade.py 2018-05-31 23:48:35.000000000 +0200 +++ new/msk-0.3.11/msk/actions/upgrade.py 2018-08-28 13:15:50.000000000 +0200 @@ -82,5 +82,5 @@ print('===', title, '===') print(body) print() - pull = create_or_edit_pr(title, body, self.repo.hub, self.user, upgrade_branch) + pull = create_or_edit_pr(title, body, self.repo.hub, self.user, upgrade_branch, self.branch) print('Created PR at:', pull.html_url) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msk-0.3.10/msk/actions/upload.py new/msk-0.3.11/msk/actions/upload.py --- old/msk-0.3.10/msk/actions/upload.py 2018-06-06 17:19:56.000000000 +0200 +++ new/msk-0.3.11/msk/actions/upload.py 2018-08-28 13:15:50.000000000 +0200 @@ -118,7 +118,8 @@ pull = create_or_edit_pr( title='Add {}'.format(self.entry.name), body=body_template.format( description=description, skill_name=self.entry.name, skill_url=skill_repo.html_url - ), user=self.user, branch=branch, skills_repo=self.repo.hub + ), user=self.user, branch=branch, skills_repo=self.repo.hub, + repo_branch=self.branch ) print('Created pull request: ', pull.html_url) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msk-0.3.10/msk/global_context.py new/msk-0.3.11/msk/global_context.py --- old/msk-0.3.10/msk/global_context.py 2018-06-01 21:15:52.000000000 +0200 +++ new/msk-0.3.11/msk/global_context.py 2018-08-28 13:15:50.000000000 +0200 @@ -30,5 +30,7 @@ class GlobalContext: lang = Lazy(unset) # type: str msm = Lazy(unset) # type: MycroftSkillsManager - github = Lazy(lambda s: ask_for_github_credentials()) # type: Github + use_token = Lazy(unset) # type: bool + branch = Lazy(unset) # type: str + github = Lazy(lambda s: ask_for_github_credentials(s.use_token)) # type: Github user = Lazy(lambda s: s.github.get_user()) # type: AuthenticatedUser diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msk-0.3.10/msk/repo_action.py new/msk-0.3.11/msk/repo_action.py --- old/msk-0.3.10/msk/repo_action.py 2018-06-01 21:44:32.000000000 +0200 +++ new/msk-0.3.11/msk/repo_action.py 2018-08-28 13:15:50.000000000 +0200 @@ -62,6 +62,7 @@ name = property(lambda self: self.entry.name) repo = Lazy(lambda s: RepoData()) # type: RepoData repo_git = Lazy(lambda s: Git(join(s.repo.msminfo.path, s.submodule_name))) # type: Git + repo_branch = Lazy(lambda s: s.repo_git.symbolic_ref('refs/remotes/origin/HEAD')) git = Lazy(lambda s: Git(s.entry.path)) # type: Git hub = Lazy(lambda s: s.github.get_repo(skill_repo_name(s.entry.url))) # type: Repository @@ -78,10 +79,9 @@ skill_module = self.submodule_name self.repo.msminfo.update() self.repo_git.fetch() - default_branch = self.repo_git.symbolic_ref('refs/remotes/origin/HEAD') - self.repo_git.reset(default_branch, hard=True) + self.repo_git.reset(self.repo_branch, hard=True) - upgrade_branch = 'upgrade/' + self.name + upgrade_branch = 'upgrade-' + self.name self.repo.checkout_branch(upgrade_branch) if not self.repo.git.diff(skill_module) and self.repo.git.ls_files(skill_module): @@ -103,10 +103,9 @@ # Upgrade skill in case it is outdated self.repo_git.fetch() - default_branch = self.repo_git.symbolic_ref('refs/remotes/origin/HEAD') - self.repo_git.reset(default_branch, hard=True) + self.repo_git.reset(self.repo_branch, hard=True) - branch_name = 'add/' + self.name + branch_name = 'add-' + self.name self.repo.checkout_branch(branch_name) self.repo.git.add(self.name) self.repo.git.commit(message='Add ' + self.name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msk-0.3.10/msk/util.py new/msk-0.3.11/msk/util.py --- old/msk-0.3.10/msk/util.py 2018-06-06 17:20:40.000000000 +0200 +++ new/msk-0.3.11/msk/util.py 2018-08-28 13:15:50.000000000 +0200 @@ -56,17 +56,21 @@ atexit.register(lambda: os.remove(tmp_path)) with os.fdopen(fd, 'w') as f: - f.write(ASKPASS.format(username=username, password=password)) + f.write(ASKPASS.format(username=username, password=password or '')) chmod(tmp_path, 0o700) os.environ['GIT_ASKPASS'] = tmp_path -def ask_for_github_credentials() -> Github: +def ask_for_github_credentials(use_token=False) -> Github: print('=== GitHub Credentials ===') while True: - username = input('Username: ') - password = getpass('Password: ') + if use_token: + username = getpass('Token: ') + password = None + else: + username = input('Username: ') + password = getpass('Password: ') github = Github(username, password) try: _ = github.get_user().login @@ -145,8 +149,8 @@ def create_or_edit_pr(title: str, body: str, skills_repo: Repository, - user, branch: str): - base = skills_repo.default_branch + user, branch: str, repo_branch: str): + base = repo_branch head = '{}:{}'.format(user.login, branch) pulls = list(skills_repo.get_pulls(base=base, head=head)) if pulls: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msk-0.3.10/msk.egg-info/PKG-INFO new/msk-0.3.11/msk.egg-info/PKG-INFO --- old/msk-0.3.10/msk.egg-info/PKG-INFO 2018-06-11 18:21:15.000000000 +0200 +++ new/msk-0.3.11/msk.egg-info/PKG-INFO 2018-08-28 15:43:04.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: msk -Version: 0.3.10 +Version: 0.3.11 Summary: Mycroft Skills Kit Home-page: https://github.com/MycroftAI/mycroft-skills-kit Author: Mycroft AI diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/msk-0.3.10/setup.py new/msk-0.3.11/setup.py --- old/msk-0.3.10/setup.py 2018-06-11 18:19:45.000000000 +0200 +++ new/msk-0.3.11/setup.py 2018-08-28 13:15:50.000000000 +0200 @@ -23,7 +23,7 @@ setup( name='msk', - version='0.3.10', # Also update in msk/__init__.py + version='0.3.11', # Also update in msk/__init__.py packages=['msk', 'msk.actions'], install_requires=['GitPython', 'typing', 'msm>=0.5.13', 'pygithub'], url='https://github.com/MycroftAI/mycroft-skills-kit',
