Merge branch 'master' into master

Author: mauritsvanrees

.github/workflows/tests.yml

@@ -0,0 +1,42 @@
+name: Run Tox Tests
+
+on:
+  push:
+    branches:
+      - master
+      - main
+      - subpath
+  pull_request:
+    branches:
+      - master
+      - main
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+
+    steps:
+    - uses: actions/checkout@v3
+    
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install depenencies (Ubuntu)
+      if: runner.os == 'Linux'
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y mercurial subversion
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox tox-gh-actions
+        
+    - name: Test with tox
+      run: tox

.gitignore

@@ -16,4 +16,5 @@
 /include/
 /.installed.cfg
 /lib/
-/parts/
+/parts/
+/.python-version

CHANGES.rst

@@ -12,6 +12,8 @@ Changelog
   <https://github.com/fschulze/mr.developer/issues/125>`_.
   [janjaapdriessen]
 
+-  Add ``subpath`` option to specify a subdirectory of a repository. [mamico]
+
 
 2.0.4 (2025-07-17)
 ------------------

README.rst

@@ -127,6 +127,9 @@ Common options
   those which start with the prefix.
   These two options currently only work for ``cvs`` and ``hg``.
 
+  The ``subpath`` option allows you to specify a subdirectory of a repository
+  as the source for the Python package, ideal for monorepos.
+
 ``svn``
   The ``url`` is one of the urls supported by subversion.
 

setup.cfg

@@ -7,6 +7,9 @@ version-levels = 2
 [devpi:upload]
 formats = sdist.tgz,bdist_wheel
 
+[flake8]
+extend-ignore = E501
+
 [check-manifest]
 ignore =
     build_git.sh

src/mr/developer/extension.py

@@ -209,6 +209,8 @@ def get_develop_info(self):
             source = sources[name]
             if source.get('egg', True) and name not in develeggs:
                 path = sources[name]['path']
+                if sources[name].get("subpath"):
+                    path = os.path.join(path, sources[name]["subpath"])
                 status = config_develop.get(name, name in auto_checkout)
                 if os.path.exists(path) and status:
                     if name in auto_checkout:

src/mr/developer/tests/conftest.py

@@ -8,6 +8,9 @@ class Path(str):
     def __getitem__(self, name):
         return Path(os.path.join(self, name))
 
+    def create_dir(self):
+        os.makedirs(str(self))
+
     def create_file(self, *content):
         f = open(self, 'w')
         f.write('\n'.join(content))

src/mr/developer/tests/test_extension.py

@@ -300,6 +300,38 @@ def testDevelopSourcesMix(self, buildout, extension):
             _exists.__exit__(None, None, None)
         assert develop == ['/normal/develop', '/develop/with/slash/', 'src/pkg.bar']
 
+    def testDevelopMonorepo(self, buildout, extension):
+        buildout['sources'].update({
+            'pkg.bar': 'git dummy://foo subpath=bar'})
+        buildout['buildout']['auto-checkout'] = 'pkg.bar'
+        _exists = patch('os.path.exists')
+        exists = _exists.__enter__()
+        try:
+            exists().return_value = True
+            (develop, develeggs, versions) = extension.get_develop_info()
+        finally:
+            _exists.__exit__(None, None, None)
+        assert develop == ['src/pkg.bar/bar']
+        assert develeggs == {'pkg.bar': '/buildout/src/pkg.bar/bar'}
+        assert versions == {'pkg.bar': ''}
+
+    def testDevelopMonorepoTwoRepos(self, buildout, extension):
+        buildout['sources'].update({
+            'pkg.bar': 'git dummy://monorepo subpath=bar',
+            'pkg.foo': 'git dummy://monorepo subpath=foo',
+        })
+        buildout['buildout']['auto-checkout'] = 'pkg.bar\npkg.foo'
+        _exists = patch('os.path.exists')
+        exists = _exists.__enter__()
+        try:
+            exists().return_value = True
+            (develop, develeggs, versions) = extension.get_develop_info()
+        finally:
+            _exists.__exit__(None, None, None)
+        assert develop == ['src/pkg.bar/bar', 'src/pkg.foo/foo']
+        assert develeggs == {'pkg.bar': '/buildout/src/pkg.bar/bar', 'pkg.foo': '/buildout/src/pkg.foo/foo'}
+        assert versions == {'pkg.bar': '', 'pkg.foo': ''}
+
     def testMissingSourceSection(self, buildout, extension):
         del buildout['sources']
         assert extension.get_sources() == {}

src/mr/developer/tests/test_git.py

@@ -29,7 +29,6 @@ def createDefaultContent(self, repository):
     def testUpdateWithRevisionPin(self, develop, mkgitrepo, src):
         from mr.developer.commands import CmdCheckout
         from mr.developer.commands import CmdUpdate
-        from mr.developer.commands import CmdStatus
         repository = mkgitrepo('repository')
         rev = self.createDefaultContent(repository)
 
@@ -48,6 +47,13 @@ def testUpdateWithRevisionPin(self, develop, mkgitrepo, src):
 
         shutil.rmtree(src['egg'])
 
+    def testUpdateWithBranch(self, develop, mkgitrepo, src):
+        from mr.developer.commands import CmdCheckout
+        from mr.developer.commands import CmdUpdate
+        from mr.developer.commands import CmdStatus
+        repository = mkgitrepo('repository')
+        self.createDefaultContent(repository)
+
         # check branch
         develop.sources = {
             'egg': Source(
@@ -62,37 +68,26 @@ def testUpdateWithRevisionPin(self, develop, mkgitrepo, src):
         assert set(os.listdir(src['egg'])) == set(('.git', 'foo', 'foo2'))
         CmdStatus(develop)(develop.parser.parse_args(['status']))
 
-        # switch implicitly to master branch
+    def testUpdateWithMain(self, develop, mkgitrepo, src):
+        from mr.developer.commands import CmdCheckout
+        from mr.developer.commands import CmdUpdate
+        repository = mkgitrepo('repository')
+        self.createDefaultContent(repository)
         develop.sources = {
             'egg': Source(
                 kind='git',
                 name='egg',
                 url='%s' % repository.base,
                 path=src['egg'])}
-        CmdUpdate(develop)(develop.parser.parse_args(['up', 'egg']))
+        CmdCheckout(develop)(develop.parser.parse_args(['co', 'egg']))
         assert set(os.listdir(src['egg'])) == set(('.git', 'bar', 'foo'))
-
-        # Switch to specific revision, then switch back to master branch.
-        develop.sources = {
-            'egg': Source(
-                kind='git',
-                name='egg',
-                rev=rev,
-                url='%s' % repository.base,
-                path=src['egg'])}
-        CmdUpdate(develop)(develop.parser.parse_args(['up', 'egg']))
-        assert set(os.listdir(src['egg'])) == set(('.git', 'foo', 'foo2'))
-        develop.sources = {
-            'egg': Source(
-                kind='git',
-                name='egg',
-                url='%s' % repository.base,
-                path=src['egg'])}
         CmdUpdate(develop)(develop.parser.parse_args(['up', 'egg']))
         assert set(os.listdir(src['egg'])) == set(('.git', 'bar', 'foo'))
 
-        CmdStatus(develop)(develop.parser.parse_args(['status']))
-
+    def testRaiseExceptionUpdateWithRevisionAndBranch(self, develop, mkgitrepo, src):
+        from mr.developer.commands import CmdCheckout
+        repository = mkgitrepo('repository')
+        rev = self.createDefaultContent(repository)
         # we can't use both rev and branch
         with pytest.raises(SystemExit):
             develop.sources = {
@@ -169,7 +164,13 @@ def testUpdateVerbose(self, develop, mkgitrepo, src, capsys):
                 ('info', ("Updated 'egg' with git.",), {}),
                 ('info', ("Switching to remote branch 'remotes/origin/master'.",), {})]
             captured = capsys.readouterr()
-            assert "set up to track" in captured.out
+            # git output varies between versions...
+            git_outputs = [
+                "* develop\n  remotes/origin/HEAD -> origin/develop\n  remotes/origin/develop\n  remotes/origin/master\nBranch master set up to track remote branch master from origin.\n  develop\n* master\n  remotes/origin/HEAD -> origin/develop\n  remotes/origin/develop\n  remotes/origin/master\nAlready up-to-date.\n\n",
+                "* develop\n  remotes/origin/HEAD -> origin/develop\n  remotes/origin/develop\n  remotes/origin/master\nBranch 'master' set up to track remote branch 'master' from 'origin'.\n  develop\n* master\n  remotes/origin/HEAD -> origin/develop\n  remotes/origin/develop\n  remotes/origin/master\nAlready up to date.\n\n",
+                "* develop\n  remotes/origin/HEAD -> origin/develop\n  remotes/origin/develop\n  remotes/origin/master\nbranch 'master' set up to track 'origin/master'.\n  develop\n* master\n  remotes/origin/HEAD -> origin/develop\n  remotes/origin/develop\n  remotes/origin/master\nAlready up to date.\n\n",
+            ]
+            assert captured.out in git_outputs
             CmdStatus(develop)(develop.parser.parse_args(['status', '-v']))
             captured = capsys.readouterr()
             assert captured.out == "~   A egg\n      ## master...origin/master\n\n"

src/mr/developer/tests/test_mercurial.py

@@ -91,6 +91,19 @@ def testUpdateWithRevisionPin(self, develop, src, tempdir):
         CmdUpdate(develop)(develop.parser.parse_args(['up', 'egg']))
         assert set(os.listdir(os.path.join(src, 'egg'))) == set(('.hg', 'foo'))
 
+    def testUpdateWithBranch(self, develop, src, tempdir):
+        from mr.developer.commands import CmdCheckout
+        from mr.developer.commands import CmdUpdate
+        repository = tempdir['repository']
+        os.mkdir(repository)
+        process = Process(cwd=repository)
+        process.check_call("hg init %s" % repository)
+        foo = repository['foo']
+        foo.create_file('foo')
+        process.check_call("hg add %s" % foo, echo=False)
+        process.check_call("hg branch test", echo=False)
+        process.check_call("hg commit %s -m foo -u test" % foo, echo=False)
+
         # check branch
         develop.sources = {
             'egg': Source(
@@ -104,6 +117,26 @@ def testUpdateWithRevisionPin(self, develop, src, tempdir):
         CmdUpdate(develop)(develop.parser.parse_args(['up', 'egg']))
         assert set(os.listdir(os.path.join(src, 'egg'))) == set(('.hg', 'foo'))
 
+    def testUpdateRaiseWithRevAndBranch(self, develop, src, tempdir):
+        from mr.developer.commands import CmdCheckout
+        repository = tempdir['repository']
+        os.mkdir(repository)
+        process = Process(cwd=repository)
+        process.check_call("hg init %s" % repository)
+        foo = repository['foo']
+        foo.create_file('foo')
+        process.check_call("hg add %s" % foo, echo=False)
+        process.check_call("hg branch test", echo=False)
+        process.check_call("hg commit %s -m foo -u test" % foo, echo=False)
+
+        # get comitted rev
+        lines = process.check_call("hg log %s" % foo, echo=False)
+        try:
+            # XXX older version
+            rev = lines[0].split()[1].split(b(':'))[1]
+        except Exception:
+            rev = lines[0].split()[1]
+
         # we can't use both rev and branch
         with pytest.raises(SystemExit):
             develop.sources = {