diff options
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | setup.py | 11 |
2 files changed, 7 insertions, 10 deletions
diff --git a/.gitmodules b/.gitmodules index 5a2e0655f..0fb37bae5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "sources/pyside2"] path = sources/pyside2 - url=https://github.com/PySide/pyside2.git + url=https://code.qt.io/pyside/pyside [submodule "sources/shiboken2"] path = sources/shiboken2 - url=https://github.com/PySide/shiboken2.git + url=https://code.qt.io/pyside/shiboken [submodule "sources/pyside2-tools"] path = sources/pyside2-tools - url=https://github.com/PySide/pyside2-tools.git + url=https://code.qt.io/pyside/pyside-tools [submodule "sources/pyside2-examples"] path = sources/pyside2-examples url=https://github.com/PySide/pyside2-examples.git @@ -30,9 +30,9 @@ __version__ = "2.0.0.dev0" submodules = { '2.0.0.dev0': [ - ["shiboken2", "master"], - ["pyside2", "master"], - ["pyside2-tools", "master"], + ["shiboken2", "dev"], + ["pyside2", "dev"], + ["pyside2-tools", "dev"], ["pyside2-examples", "master"], ], } @@ -257,10 +257,7 @@ if os.path.isdir(".git") and not OPTION_IGNOREGIT and not OPTION_ONLYPACKAGE: git_update_cmd = ["git", "submodule", "update", "--init"] if run_process(git_update_cmd) != 0: raise DistutilsSetupError("Failed to initialize the git submodules") - git_pull_cmd = ["git", "submodule", "foreach", "git", "fetch", "origin"] - if run_process(git_pull_cmd) != 0: - raise DistutilsSetupError("Failed to initialize the git submodules") - git_pull_cmd = ["git", "submodule", "foreach", "git", "pull", "origin", "master"] + git_pull_cmd = ["git", "submodule", "foreach", "git", "fetch", "--all"] if run_process(git_pull_cmd) != 0: raise DistutilsSetupError("Failed to initialize the git submodules") submodules_dir = os.path.join(script_dir, "sources") |