-
Notifications
You must be signed in to change notification settings - Fork 185
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1344 from dmach/build-from-git
Support building directly from git
- Loading branch information
Showing
10 changed files
with
254 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # Warning | ||
|
|
||
| This module provides EXPERIMENTAL and UNSTABLE support for git scm such as https://src.opensuse.org/. | ||
| The code may change or disappear without a prior notice! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| import sys | ||
|
|
||
| from .store import GitStore | ||
|
|
||
|
|
||
| def warn_experimental(): | ||
| print("WARNING: Using EXPERIMENTAL support for git scm. The functionality may change or disappear without a prior notice!", file=sys.stderr) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| import json | ||
| import os | ||
| import subprocess | ||
| import urllib.parse | ||
| from pathlib import Path | ||
|
|
||
| from .. import conf as osc_conf | ||
| from .. import oscerr | ||
|
|
||
|
|
||
| class GitStore: | ||
|
|
||
| @classmethod | ||
| def is_project_dir(cls, path): | ||
| try: | ||
| store = cls(path) | ||
| except oscerr.NoWorkingCopy: | ||
| return False | ||
| return store.is_project | ||
|
|
||
| @classmethod | ||
| def is_package_dir(cls, path): | ||
| try: | ||
| store = cls(path) | ||
| except oscerr.NoWorkingCopy: | ||
| return False | ||
| return store.is_package | ||
|
|
||
| def __init__(self, path, check=True): | ||
| self.path = path | ||
| self.abspath = os.path.abspath(self.path) | ||
|
|
||
| # TODO: how to determine if the current git repo contains a project or a package? | ||
| self.is_project = False | ||
| self.is_package = os.path.exists(os.path.join(self.abspath, ".git")) | ||
|
|
||
| self._package = None | ||
| self._project = None | ||
|
|
||
| if check and not any([self.is_project, self.is_package]): | ||
| msg = f"Directory '{self.path}' is not a GIT working copy" | ||
| raise oscerr.NoWorkingCopy(msg) | ||
|
|
||
| # TODO: decide if we need explicit 'git lfs pull' or not | ||
| # self._run_git(["lfs", "pull"]) | ||
|
|
||
| def assert_is_project(self): | ||
| if not self.is_project: | ||
| msg = f"Directory '{self.path}' is not a GIT working copy of a project" | ||
| raise oscerr.NoWorkingCopy(msg) | ||
|
|
||
| def assert_is_package(self): | ||
| if not self.is_package: | ||
| msg = f"Directory '{self.path}' is not a GIT working copy of a package" | ||
| raise oscerr.NoWorkingCopy(msg) | ||
|
|
||
| def _run_git(self, args): | ||
| return subprocess.check_output(["git"] + args, encoding="utf-8", cwd=self.abspath).strip() | ||
|
|
||
| @property | ||
| def apiurl(self): | ||
| # HACK: we're using the currently configured apiurl | ||
| return osc_conf.config["apiurl"] | ||
|
|
||
| @property | ||
| def project(self): | ||
| if self._project is None: | ||
| # get project from the branch name | ||
| branch = self._run_git(["branch", "--show-current"]) | ||
|
|
||
| # HACK: replace hard-coded mapping with metadata from git or the build service | ||
| if branch == "factory": | ||
| self._project = "openSUSE:Factory" | ||
| else: | ||
| raise RuntimeError(f"Couldn't map git branch '{branch}' to a project") | ||
| return self._project | ||
|
|
||
| @project.setter | ||
| def project(self, value): | ||
| self._project = value | ||
|
|
||
| @property | ||
| def package(self): | ||
| if self._package is None: | ||
| origin = self._run_git(["remote", "get-url", "origin"]) | ||
| self._package = Path(urllib.parse.urlsplit(origin).path).stem | ||
| return self._package | ||
|
|
||
| @package.setter | ||
| def package(self, value): | ||
| self._package = value | ||
|
|
||
| def _get_option(self, name): | ||
| try: | ||
| result = self._run_git(["config", "--local", "--get", f"osc.{name}"]) | ||
| except subprocess.CalledProcessError: | ||
| result = None | ||
| return result | ||
|
|
||
| def _check_type(self, name, value, expected_type): | ||
| if not isinstance(value, expected_type): | ||
| raise TypeError(f"The option '{name}' should be {expected_type.__name__}, not {type(value).__name__}") | ||
|
|
||
| def _set_option(self, name, value): | ||
| self._run_git(["config", "--local", f"osc.{name}", value]) | ||
|
|
||
| def _unset_option(self, name): | ||
| try: | ||
| self._run_git(["config", "--local", "--unset", f"osc.{name}"]) | ||
| except subprocess.CalledProcessError: | ||
| pass | ||
|
|
||
| def _get_dict_option(self, name): | ||
| result = self._get_option(name) | ||
| if result is None: | ||
| return None | ||
| result = json.loads(result) | ||
| self._check_type(name, result, dict) | ||
| return result | ||
|
|
||
| def _set_dict_option(self, name, value): | ||
| if value is None: | ||
| self._unset_option(name) | ||
| return | ||
| self._check_type(name, value, dict) | ||
| value = json.dumps(value) | ||
| self._set_option(name, value) | ||
|
|
||
| @property | ||
| def last_buildroot(self): | ||
| self.assert_is_package() | ||
| result = self._get_dict_option("last-buildroot") | ||
| if result is not None: | ||
| result = (result["repo"], result["arch"], result["vm_type"]) | ||
| return result | ||
|
|
||
| @last_buildroot.setter | ||
| def last_buildroot(self, value): | ||
| self.assert_is_package() | ||
| if len(value) != 3: | ||
| raise ValueError("A tuple with exactly 3 items is expected: (repo, arch, vm_type)") | ||
| value = { | ||
| "repo": value[0], | ||
| "arch": value[1], | ||
| "vm_type": value[2], | ||
| } | ||
| self._set_dict_option("last-buildroot", value) | ||
|
|
||
| @property | ||
| def scmurl(self): | ||
| return self._run_git(["remote", "get-url", "origin"]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,6 +35,7 @@ packages = | |
| osc | ||
| osc._private | ||
| osc.commands | ||
| osc.git_scm | ||
| osc.output | ||
| osc.util | ||
| install_requires = | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| import os | ||
| import shutil | ||
| import subprocess | ||
| import tempfile | ||
| import unittest | ||
|
|
||
| from osc.git_scm.store import GitStore | ||
|
|
||
|
|
||
| class TestGitStore(unittest.TestCase): | ||
| def setUp(self): | ||
| self.tmpdir = tempfile.mkdtemp(prefix="osc_test") | ||
| os.chdir(self.tmpdir) | ||
| subprocess.check_output(["git", "init", "-b", "factory"]) | ||
| subprocess.check_output(["git", "remote", "add", "origin", "https://example.com/packages/my-package.git"]) | ||
|
|
||
| def tearDown(self): | ||
| try: | ||
| shutil.rmtree(self.tmpdir) | ||
| except OSError: | ||
| pass | ||
|
|
||
| def test_package(self): | ||
| store = GitStore(self.tmpdir) | ||
| self.assertEqual(store.package, "my-package") | ||
|
|
||
| def test_project(self): | ||
| store = GitStore(self.tmpdir) | ||
| self.assertEqual(store.project, "openSUSE:Factory") | ||
|
|
||
| def test_last_buildroot(self): | ||
| store = GitStore(self.tmpdir) | ||
| self.assertEqual(store.last_buildroot, None) | ||
| store.last_buildroot = ("repo", "arch", "vm_type") | ||
|
|
||
| store = GitStore(self.tmpdir) | ||
| self.assertEqual(store.last_buildroot, ("repo", "arch", "vm_type")) | ||
|
|
||
| def test_scmurl(self): | ||
| store = GitStore(self.tmpdir) | ||
| self.assertEqual(store.scmurl, "https://example.com/packages/my-package.git") | ||
|
|
||
|
|
||
| if not shutil.which("git"): | ||
| TestGitStore = unittest.skip("The 'git' executable is not available")(TestGitStore) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| unittest.main() |