dev-shell 0.8.0__tar.gz → 0.9.0__tar.gz

dev_shell-0.9.0/.editorconfig

@@ -0,0 +1,20 @@
+# see https://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.py]
+max_line_length = 119
+
+[{Makefile,**.mk}]
+indent_style = tab
+insert_final_newline = false
+
+[{*.yaml,*.yml}]
+indent_size = 2

dev_shell-0.9.0/.flake8

@@ -0,0 +1,7 @@
+#
+# Move to pyproject.toml after: https://github.com/PyCQA/flake8/issues/234
+#
+[flake8]
+exclude = .*, dist, htmlcov
+#ignore = E402
+max-line-length = 119

dev_shell-0.9.0/.github/workflows/tests.yml

@@ -0,0 +1,57 @@
+
+name: tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  schedule:
+    - cron: '0 8 * * *'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.13", "3.12", "3.11"]
+    steps:
+    - name: Checkout
+      run: |
+        echo $GITHUB_REF $GITHUB_SHA
+        git clone https://github.com/$GITHUB_REPOSITORY.git .
+        git fetch origin $GITHUB_SHA:temporary-ci-branch
+        git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
+
+    - name: 'Set up Python ${{ matrix.python-version }}'
+      uses: actions/setup-python@v5
+      # https://github.com/marketplace/actions/setup-python
+      with:
+        python-version: '${{ matrix.python-version }}'
+        cache: 'pip' # caching pip dependencies
+        cache-dependency-path: '**/requirements.*.txt'
+
+    - name: 'Bootstrap app venv'
+      # The first CLI call will create the .venv
+      run: |
+        ./devshell.py version
+
+    - name: 'app CLI help'
+      run: |
+        ./devshell.py --help
+
+    - name: 'Run tests with Python v${{ matrix.python-version }}'
+      env:
+        PYTHONUNBUFFERED: 1
+        PYTHONWARNINGS: always
+      run: |
+        ./devshell.py coverage
+
+    - name: 'Upload coverage report'
+      uses: codecov/codecov-action@v4
+      # https://github.com/marketplace/actions/codecov
+      with:
+        fail_ci_if_error: false
+        verbose: true
+

dev_shell-0.9.0/.gitignore

@@ -0,0 +1,13 @@
+.*
+*.egg-info
+__pycache__
+/dist/
+/build/
+/coverage.*
+*.orig
+
+!.github
+!.editorconfig
+!.flake8
+!.gitignore
+!.gitkeep

{dev_shell-0.8.0 → dev_shell-0.9.0}/PKG-INFO

@@ -1,28 +1,25 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: dev-shell
-Version: 0.8.0
+Version: 0.9.0
 Summary: Developer shell for easy startup...
-Home-page: https://github.com/jedie/dev-shell
-License: GNU General Public License v3.0
-Author: Jens Diemer
-Author-email: python@jensdiemer.de
-Requires-Python: >=3.9,<4.0
-Classifier: License :: Other/Proprietary License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: cmd2
+Author-email: Jens Diemer <dev-shell@jensdiemer.de>
+License: GPL-3.0-or-later
+Project-URL: Documentation, https://github.com/jedie/dev-shell
+Project-URL: Source, https://github.com/jedie/dev-shell
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: cmd2
+Requires-Dist: cli-base-utilities
 
 # A "dev-shell" for Python projects ;)
 
-[![Test](https://github.com/jedie/dev-shell/actions/workflows/test.yml/badge.svg?branch=bugfix-path)](https://github.com/jedie/dev-shell/actions/workflows/test.yml)
-[![codecov](https://codecov.io/gh/jedie/dev-shell/branch/main/graph/badge.svg)](https://codecov.io/gh/jedie/dev-shell)
+[![tests](https://github.com/jedie/dev-shell/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/jedie/dev-shell/actions/workflows/tests.yml)
+[![codecov](https://codecov.io/github/jedie/dev_shell/branch/main/graph/badge.svg)](https://app.codecov.io/github/jedie/dev_shell)
+[![dev_shell @ PyPi](https://img.shields.io/pypi/v/dev_shell?label=dev_shell%20%40%20PyPi)](https://pypi.org/project/dev_shell/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/dev_shell)](https://github.com/jedie/dev-shell/blob/main/pyproject.toml)
+[![License GPL-3.0-or-later](https://img.shields.io/pypi/l/dev_shell)](https://github.com/jedie/dev-shell/blob/main/LICENSE)
 
-[![ddev-shell @ PyPi](https://img.shields.io/pypi/v/dev-shell?label=dev-shell%20%40%20PyPi)
-![Python Versions](https://img.shields.io/pypi/pyversions/dev-shell)
-![License GPL V3+](https://img.shields.io/pypi/l/dev-shell)](https://pypi.org/project/dev-shell/)
 
 This small project is intended to improve the start-up for collaborators.
 
@@ -37,7 +34,7 @@ The "dev-shell" is the base to create a CLI and a shell. It also shows how to ma
 ```bash
 ~$ git clone https://github.com/jedie/dev-shell.git
 ~$ cd dev-shell
-~/dev-shell$ ./devshell.py pytest
+~/dev-shell$ ./devshell.py test
 ```
 
 
@@ -78,7 +75,7 @@ Documented commands (use 'help -v' for verbose/'help <topic>' for details):
 
 dev-shell commands
 ==================
-fix_code_style  linting  list_venv_packages  publish  pytest  update
+fix_code_style  linting  list_venv_packages  publish  test  update
 
 ...
 
@@ -96,7 +93,7 @@ Developer shell - dev_shell - v0.2.0
 (dev_shell) help
 ```
 
-Info: The `.venv` will be automatically updated via `poetry install` call if the `poetry.lock` file has been changed.
+Info: The `.venv` will be automatically updated via `poetry install` call if the `uv.lock` file has been changed.
 
 A call with `--update` will force to call some create/update steps, e.g.:
 
@@ -123,6 +120,8 @@ See also github test configuration: [.github/workflows/test.yml](https://github.
 
 * [*dev*](https://github.com/jedie/dev-shell/compare/v0.8.0...main)
   * TBC
+* [0.9.0 - 2025-03-11](https://github.com/jedie/dev-shell/compare/v0.8.0...v0.9.0)
+  * Replace `poetry` with `uv`
 * [0.8.0 - 2024-04-09](https://github.com/jedie/dev-shell/compare/v0.7.0...v0.8.0)
   * Remove "gnureadline" as dependency
   * update boot script
@@ -174,4 +173,3 @@ See also github test configuration: [.github/workflows/test.yml](https://github.
 
 * Github: https://github.com/jedie/dev-shell/
 * PyPi: https://pypi.org/project/dev-shell/
-

{dev_shell-0.8.0 → dev_shell-0.9.0}/README.md

@@ -1,11 +1,11 @@
 # A "dev-shell" for Python projects ;)
 
-[![Test](https://github.com/jedie/dev-shell/actions/workflows/test.yml/badge.svg?branch=bugfix-path)](https://github.com/jedie/dev-shell/actions/workflows/test.yml)
-[![codecov](https://codecov.io/gh/jedie/dev-shell/branch/main/graph/badge.svg)](https://codecov.io/gh/jedie/dev-shell)
+[![tests](https://github.com/jedie/dev-shell/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/jedie/dev-shell/actions/workflows/tests.yml)
+[![codecov](https://codecov.io/github/jedie/dev_shell/branch/main/graph/badge.svg)](https://app.codecov.io/github/jedie/dev_shell)
+[![dev_shell @ PyPi](https://img.shields.io/pypi/v/dev_shell?label=dev_shell%20%40%20PyPi)](https://pypi.org/project/dev_shell/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/dev_shell)](https://github.com/jedie/dev-shell/blob/main/pyproject.toml)
+[![License GPL-3.0-or-later](https://img.shields.io/pypi/l/dev_shell)](https://github.com/jedie/dev-shell/blob/main/LICENSE)
 
-[![ddev-shell @ PyPi](https://img.shields.io/pypi/v/dev-shell?label=dev-shell%20%40%20PyPi)
-![Python Versions](https://img.shields.io/pypi/pyversions/dev-shell)
-![License GPL V3+](https://img.shields.io/pypi/l/dev-shell)](https://pypi.org/project/dev-shell/)
 
 This small project is intended to improve the start-up for collaborators.
 
@@ -20,7 +20,7 @@ The "dev-shell" is the base to create a CLI and a shell. It also shows how to ma
 ```bash
 ~$ git clone https://github.com/jedie/dev-shell.git
 ~$ cd dev-shell
-~/dev-shell$ ./devshell.py pytest
+~/dev-shell$ ./devshell.py test
 ```
 
 
@@ -61,7 +61,7 @@ Documented commands (use 'help -v' for verbose/'help <topic>' for details):
 
 dev-shell commands
 ==================
-fix_code_style  linting  list_venv_packages  publish  pytest  update
+fix_code_style  linting  list_venv_packages  publish  test  update
 
 ...
 
@@ -79,7 +79,7 @@ Developer shell - dev_shell - v0.2.0
 (dev_shell) help
 ```
 
-Info: The `.venv` will be automatically updated via `poetry install` call if the `poetry.lock` file has been changed.
+Info: The `.venv` will be automatically updated via `poetry install` call if the `uv.lock` file has been changed.
 
 A call with `--update` will force to call some create/update steps, e.g.:
 
@@ -106,6 +106,8 @@ See also github test configuration: [.github/workflows/test.yml](https://github.
 
 * [*dev*](https://github.com/jedie/dev-shell/compare/v0.8.0...main)
   * TBC
+* [0.9.0 - 2025-03-11](https://github.com/jedie/dev-shell/compare/v0.8.0...v0.9.0)
+  * Replace `poetry` with `uv`
 * [0.8.0 - 2024-04-09](https://github.com/jedie/dev-shell/compare/v0.7.0...v0.8.0)
   * Remove "gnureadline" as dependency
   * update boot script

dev_shell-0.9.0/dev_shell/__init__.py

@@ -0,0 +1,8 @@
+"""
+dev_shell
+Developer shell for easy startup...
+"""
+
+# See https://packaging.python.org/en/latest/specifications/version-specifiers/
+__version__ = '0.9.0'
+__author__ = 'Jens Diemer <dev-shell@jensdiemer.de>'

dev_shell-0.9.0/dev_shell/__main__.py

@@ -0,0 +1,10 @@
+"""
+Allow dev_shell to be executable
+through `python -m dev_shell`.
+"""
+
+from dev_shell.dev_shell_app import devshell_cmdloop
+
+
+if __name__ == '__main__':
+    devshell_cmdloop()

{dev_shell-0.8.0 → dev_shell-0.9.0}/dev_shell/bootstrap-source.py

@@ -40,7 +40,7 @@ else:
         sys.exit(-1)
 
 
-assert sys.version_info >= (3, 9), f'Python version {sys.version_info} is too old!'
+assert sys.version_info >= (3, 11), f'Python version {sys.version_info} is too old!'
 
 
 if sys.platform == 'win32':  # wtf
@@ -48,21 +48,21 @@ if sys.platform == 'win32':  # wtf
     BIN_NAME = 'Scripts'
     FILE_EXT = '.exe'
 else:
-    # Files under Linux/Mac and all other than Windows, e.g.: .../.venv/bin/python
+    # Files under Linux/Mac and all other than Windows, e.g.: .../.venv/bin/python3
     BIN_NAME = 'bin'
     FILE_EXT = ''
 
 BASE_PATH = Path(__file__).parent
 VENV_PATH = BASE_PATH / '.venv'
 BIN_PATH = VENV_PATH / BIN_NAME
-PYTHON_PATH = BIN_PATH / f'python{FILE_EXT}'
+PYTHON_PATH = BIN_PATH / f'python3{FILE_EXT}'
 PIP_PATH = BIN_PATH / f'pip{FILE_EXT}'
-POETRY_PATH = BIN_PATH / f'poetry{FILE_EXT}'
+UV_PATH = BIN_PATH / f'uv{FILE_EXT}'
 
-DEP_LOCK_PATH = BASE_PATH / 'poetry.lock'
+DEP_LOCK_PATH = BASE_PATH / 'uv.lock'
 DEP_HASH_PATH = VENV_PATH / '.dep_hash'
 
-# script file defined in pyproject.toml as [tool.poetry.scripts]
+# script file defined in pyproject.toml as [console_scripts]
 # (Under Windows: ".exe" not added!)
 PROJECT_SHELL_SCRIPT = BIN_PATH / 'devshell'
 
@@ -120,35 +120,32 @@ def main(argv):
         force_update = False
         extra_args = argv[1:]
 
-    # Create virtual env in ".../.venv/":
+    # Create virtual env in ".venv/":
     if not PYTHON_PATH.is_file() or force_update:
-        print('Create virtual env here:', VENV_PATH.absolute())
+        print(f'Create virtual env here: {VENV_PATH.absolute()}')
         builder = venv.EnvBuilder(symlinks=True, upgrade=True, with_pip=True)
         builder.create(env_dir=VENV_PATH)
+
+    if not PROJECT_SHELL_SCRIPT.is_file() or not venv_up2date() or force_update:
         # Update pip
         verbose_check_call(PYTHON_PATH, '-m', 'pip', 'install', '-U', 'pip')
 
-    # install/update "pip" and "poetry":
-    if not POETRY_PATH.is_file() or force_update:
-        # Note: Under Windows pip.exe can't replace this own .exe file, so use the module way:
-        verbose_check_call(PYTHON_PATH, '-m', 'pip', 'install', '-U', 'pip', 'setuptools')
-        verbose_check_call(PIP_PATH, 'install', 'poetry')
-
-    # install via poetry, if:
-    #   1. .venv not exists
-    #   2. "--update" used
-    #   3. poetry.lock file was changed
-    if not PROJECT_SHELL_SCRIPT.is_file() or force_update or not venv_up2date():
-        verbose_check_call(POETRY_PATH, 'install')
+        # Install uv
+        verbose_check_call(PYTHON_PATH, '-m', 'pip', 'install', '-U', 'uv')
+
+        # install requirements
+        verbose_check_call(UV_PATH, 'sync')
+
+        # install project
+        verbose_check_call(PIP_PATH, 'install', '--no-deps', '-e', '.')
         store_dep_hash()
 
     # The cmd2 shell should not abort on Ctrl-C => ignore "Interrupt from keyboard" signal:
     signal.signal(signal.SIGINT, noop_signal_handler)
 
-    # Run project cmd shell via "setup.py" entrypoint:
-    # (Call it via python, because Windows sucks calling the file direct)
+    # Call our entry point CLI:
     try:
-        verbose_check_call(PYTHON_PATH, PROJECT_SHELL_SCRIPT, *extra_args)
+        verbose_check_call(PROJECT_SHELL_SCRIPT, *extra_args)
     except subprocess.CalledProcessError as err:
         sys.exit(err.returncode)
 

{dev_shell-0.8.0 → dev_shell-0.9.0}/dev_shell/command_sets/dev_shell_commands.py

@@ -3,13 +3,26 @@ import sys
 from pathlib import Path
 
 import cmd2
+from cli_base.cli_tools import code_style
+from cli_base.cli_tools.dev_tools import run_coverage, run_unittest_cli
+from cli_base.cli_tools.subprocess_utils import ToolsExecutor
+from cli_base.run_pip_audit import run_pip_audit
 from cmd2 import Cmd2ArgumentParser, with_argparser
 
+import dev_shell
+from dev_shell import __version__
 from dev_shell.command_sets import DevShellBaseCommandSet
+from dev_shell.constants import PACKAGE_ROOT
 from dev_shell.utils.colorful import bright_green
 from dev_shell.utils.subprocess_utils import verbose_check_call
 
 
+try:
+    from manageprojects.utilities.publish import publish_package  # dev dependency
+except ModuleNotFoundError:
+    publish_package = None
+
+
 @cmd2.with_default_category('dev-shell commands')
 class DevShellCommandSet(DevShellBaseCommandSet):
     """
@@ -17,7 +30,7 @@ class DevShellCommandSet(DevShellBaseCommandSet):
     """
 
     MIN_PY_MAJOR_VERSION = 3
-    MIN_PY_MINOR_VERSION = 7
+    MIN_PY_MINOR_VERSION = 11
 
     pyupgrade_argparser = Cmd2ArgumentParser()
     pyupgrade_argparser.add_argument('--exit-zero-even-if-changed', action='store_true')
@@ -57,42 +70,33 @@ class DevShellCommandSet(DevShellBaseCommandSet):
                 change_count += 1
         print(f'Out of {total_count} files, {change_count} have been updated.')
 
-    def do_pytest(self, statement: cmd2.Statement):
+    def do_test(self, statement: cmd2.Statement):
         """
-        Run dev-shell tests via pytest
+        Run the project's test suite using the unittest runner.
         """
-        verbose_check_call(
-            'pytest', *statement.arg_list, cwd=self.config.base_path, exit_on_error=True
-        )
+        run_unittest_cli(argv=statement.arg_list)
 
-    def do_tox(self, statement: cmd2.Statement):
+    def do_coverage(self, statement: cmd2.Statement):
         """
-        Call tox and pass all given arguments to it.
+        Run the project's test suite using the unittest runner and create a coverage report.
         """
-        verbose_check_call(
-            'tox', *statement.arg_list, cwd=self.config.base_path, exit_on_error=True
-        )
-
-    def do_poetry(self, statement: cmd2.Statement):
-        """
-        Call poetry and pass all given arguments to it.
-        """
-        verbose_check_call(
-            'poetry', *statement.arg_list, cwd=self.config.base_path, exit_on_error=True
-        )
+        run_coverage()
 
     def do_update(self, statement: cmd2.Statement):
         """
         Call "poetry update" to update all dependencies in .venv
         """
-        verbose_check_call(
-            'poetry',
-            'update',
-            '-v',
-            *statement.arg_list,
-            cwd=self.config.base_path,
-            exit_on_error=True
-        )
+        tools_executor = ToolsExecutor(cwd=PACKAGE_ROOT)
+
+        tools_executor.verbose_check_call('pip', 'install', '-U', 'pip')
+        tools_executor.verbose_check_call('pip', 'install', '-U', 'uv')
+        tools_executor.verbose_check_call('uv', 'lock', '--upgrade')
+
+        run_pip_audit(base_path=PACKAGE_ROOT)
+
+        # Install new dependencies in current .venv:
+        tools_executor.verbose_check_call('uv', 'sync')
+
         script_name = Path(sys.argv[0]).name
         print(bright_green(f'\n\nPlease restart "{script_name}" !\n'))
         sys.exit(0)  # Stop cmd
@@ -101,7 +105,13 @@ class DevShellCommandSet(DevShellBaseCommandSet):
         """
         Fix code style by running darker
         """
-        verbose_check_call('darker', cwd=self.config.base_path)
+        code_style.fix(package_root=self.config.base_path)
+
+    def do_check_code_style(self, statement: cmd2.Statement):
+        """
+        Check code style by running darker
+        """
+        code_style.check(package_root=self.config.base_path)
 
     def do_list_venv_packages(self, statement: cmd2.Statement):
         """
@@ -116,22 +126,15 @@ class DevShellCommandSet(DevShellBaseCommandSet):
         """
         Publish "dev-shell" to PyPi
         """
-        # Maybe a project that use dev-shell doesn't use poetry-publish, too!
-        # So import it here to make this dependency "optional"
-        from poetry_publish.publish import poetry_publish  # noqa
+        run_unittest_cli(verbose=False, exit_after_run=False)  # Don't publish a broken state
 
-        # Don't publish if test failed or code linting wrong:
-        self.do_pytest(statement)
+        publish_package(module=dev_shell, package_path=PACKAGE_ROOT, distribution_name='dev-shell')
 
-        poetry_publish(
-            package_root=self.config.base_path,
-            version=self.config.version,
-        )
+    def do_version(self, statement: cmd2.Statement):
+        print(__version__)
+        sys.exit(0)  # Stop cmd
 
 
-# Maybe a project that use dev-shell doesn't use poetry-publish:
-try:
-    import poetry_publish  # noqa
-except ModuleNotFoundError:
+if publish_package is None:
     # Remove the "publish" command
     del DevShellCommandSet.do_publish

dev_shell-0.9.0/dev_shell/constants.py

@@ -0,0 +1,21 @@
+import sys
+from pathlib import Path
+
+
+PACKAGE_ROOT = Path(__file__).parent.parent.resolve()
+assert Path(PACKAGE_ROOT / 'dev_shell').is_dir(), f'Path wrong: {PACKAGE_ROOT}'
+
+
+if sys.platform == 'win32':  # wtf
+    BIN_NAME = 'Scripts'
+else:
+    BIN_NAME = 'bin'
+
+VENV_PATH = PACKAGE_ROOT / '.venv'
+
+BIN_PATH = VENV_PATH / BIN_NAME
+assert BIN_PATH.is_dir()
+
+
+# The source file path for external projects:
+BOOTSTRAP_SOURCE_FILE = PACKAGE_ROOT / 'dev_shell' / 'bootstrap-source.py'

{dev_shell-0.8.0 → dev_shell-0.9.0}/dev_shell/dev_shell_app.py

@@ -35,7 +35,7 @@ def get_devshell_app_kwargs():
 def devshell_cmdloop():
     """
     Entry point to start the "dev-shell" cmd2 app.
-    Used in: [tool.poetry.scripts]
+    Used in: [project.scripts]
     """
     app = DevShellApp(**get_devshell_app_kwargs())
     run_cmd2_app(app)  # Run a cmd2 App as CLI or shell

{dev_shell-0.8.0 → dev_shell-0.9.0}/dev_shell/tests/fixtures.py

@@ -1,5 +1,4 @@
 from unittest.case import TestCase
-
 from cmd2 import CommandResult
 from cmd2.ansi import strip_style
 from cmd2_ext_test import ExternalTestMixin

{dev_shell-0.8.0 → dev_shell-0.9.0}/dev_shell/tests/test_bootstrap.py

@@ -10,14 +10,6 @@ from pathlib import Path
 from unittest import TestCase, mock
 
 import devshell
-from dev_shell.constants import VENV_PATH
-from dev_shell.tests.constants import (
-    DEVSHELL_CALL,
-    VENV_DEVSHELL,
-    VENV_PIP,
-    VENV_POETRY,
-    VENV_PYTHON,
-)
 from dev_shell.tests.utils import call_mocked_subprocess
 from dev_shell.utils.assertion import assert_is_dir, assert_is_file
 
@@ -42,39 +34,34 @@ def call_devsetup_main(*args, catch_sys_exit=False):
 
 class BootstrapTestCase(TestCase):
     def test_up2date_bootstrap(self):
-        # .dep_hash is up-to-date -> no "poetry install" call:
+        # .dep_hash is up-to-date -> no "uv install" call:
         check_calls, stdout, stderr = call_devsetup_main()
-        assert stderr == ''
-        assert f'{DEVSHELL_CALL}\n' in stdout
-        assert check_calls == [DEVSHELL_CALL]
-        assert 'poetry' not in stdout
+        self.assertEqual(stderr, '')
+        self.assertIn('.venv/bin/devshell', stdout)
+        self.assertNotIn('uv ', stdout)
 
-    def test_poetry_install_call(self):
+    def test_uv_install_call(self):
         base_path = Path(devshell.__file__).parent
         assert_is_dir(base_path / 'dev_shell')
 
         DEP_HASH_PATH = base_path / '.venv' / '.dep_hash'
         assert_is_file(DEP_HASH_PATH)
 
-        DEP_LOCK_PATH = base_path / 'poetry.lock'
+        DEP_LOCK_PATH = base_path / 'uv.lock'
 
         current_hash = sha512(DEP_LOCK_PATH.read_bytes()).hexdigest()
 
         assert DEP_HASH_PATH.read_text() == current_hash
 
-        # Change the hash -> "poetry install" should be called:
+        # Change the hash -> "uv install" should be called:
 
         try:
             DEP_HASH_PATH.write_text('this is not the hash')
 
             check_calls, stdout, stderr = call_devsetup_main()
-            assert stderr == ''
-            assert f'{VENV_POETRY} install' in stdout
-            assert f'{VENV_PYTHON} {VENV_DEVSHELL}\n' in stdout
-            assert check_calls == [
-                f'{VENV_POETRY} install',  # <<< install called?
-                DEVSHELL_CALL
-            ]
+            self.assertEqual(stderr, '')
+            self.assertIn('uv sync', stdout)
+            self.assertIn('.venv/bin/devshell', stdout)
         finally:
             DEP_HASH_PATH.write_text(current_hash)
 
@@ -85,27 +72,18 @@ class BootstrapTestCase(TestCase):
         with mock.patch('venv.EnvBuilder.create') as create_mock:
             check_calls, stdout, stderr = call_devsetup_main('devshell.py', '--update')
 
-        assert stderr == ''
-        assert f'{VENV_POETRY} install' in stdout
-        assert f'{DEVSHELL_CALL}\n' in stdout
-        self.assertEqual(
-            check_calls,
-            [
-                f'{VENV_PYTHON} -m pip install -U pip',
-                f'{VENV_PYTHON} -m pip install -U pip setuptools',
-                f'{VENV_PIP} install poetry',
-                f'{VENV_POETRY} install',
-                DEVSHELL_CALL,
-            ],
-        )
-        create_mock.assert_called_once_with(env_dir=VENV_PATH)
+        self.assertEqual(stderr, '')
+        self.assertIn('Create virtual env here:', stdout)
+        self.assertIn('uv sync', stdout)
+        self.assertIn('.venv/bin/devshell\n', stdout)
+        create_mock.assert_called_once()
 
     def test_help(self):
         check_calls, stdout, stderr = call_devsetup_main(
             'devshell.py', '--help',
             catch_sys_exit=True
         )
-        assert stderr == ''
+        self.assertEqual(stderr, '')
         assert 'usage: devshell.py [-h] [--update] [command_args ' in stdout
         assert stdout.endswith('...live long and prosper...\n')
         assert check_calls == []
@@ -118,8 +96,6 @@ class BootstrapTestCase(TestCase):
             'devshell.py', 'not_existing_command', '--help',
             catch_sys_exit=True
         )
-        assert stderr == ''
+        self.assertEqual(stderr, '')
         assert 'not_existing_command --help' in stdout
-        assert check_calls == [
-            f'{DEVSHELL_CALL} not_existing_command --help'
-        ]
+        self.assertIn('.venv/bin/devshell not_existing_command --help', check_calls[0])