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

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

@@ -1,19 +1,18 @@
 Metadata-Version: 2.1
 Name: dev-shell
-Version: 0.7.0
-Summary: Devloper shell for easy startup...
+Version: 0.8.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.0
+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
-Requires-Dist: gnureadline ; sys_platform == "darwin"
 Description-Content-Type: text/markdown
 
 # A "dev-shell" for Python projects ;)
@@ -122,8 +121,12 @@ See also github test configuration: [.github/workflows/test.yml](https://github.
 
 ## History
 
-* [*dev*](https://github.com/jedie/dev-shell/compare/v0.7.0...main)
+* [*dev*](https://github.com/jedie/dev-shell/compare/v0.8.0...main)
   * TBC
+* [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
+  * update requirements
 * [0.7.0 - 2023-04-25](https://github.com/jedie/dev-shell/compare/v0.6.1...v0.7.0)
   * Update test matrix
   * update requirements

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

@@ -104,8 +104,12 @@ See also github test configuration: [.github/workflows/test.yml](https://github.
 
 ## History
 
-* [*dev*](https://github.com/jedie/dev-shell/compare/v0.7.0...main)
+* [*dev*](https://github.com/jedie/dev-shell/compare/v0.8.0...main)
   * TBC
+* [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
+  * update requirements
 * [0.7.0 - 2023-04-25](https://github.com/jedie/dev-shell/compare/v0.6.1...v0.7.0)
   * Update test matrix
   * update requirements

dev_shell-0.8.0/dev_shell/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.8.0'

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

@@ -9,12 +9,12 @@
     This file is from: https://pypi.org/project/dev-shell/
     Source: https://github.com/jedie/dev-shell/blob/main/devshell.py
 
-    :copyleft: 2021-2022 by Jens Diemer
+    :copyleft: 2021-2024 by Jens Diemer
     :license: GNU GPL v3 or above
 """
-
 import argparse
 import hashlib
+import shlex
 import signal
 import subprocess
 import sys
@@ -22,17 +22,25 @@ import venv
 from pathlib import Path
 
 
+def print_no_pip_error():
+    print('Error: Pip not available!')
+    print('Hint: "apt-get install python3-venv"\n')
+
+
 try:
-    import ensurepip  # noqa
+    from ensurepip import version
 except ModuleNotFoundError as err:
     print(err)
     print('-' * 100)
-    print('Error: Pip not available!')
-    print('Hint: "apt-get install python3-venv"\n')
+    print_no_pip_error()
     raise
+else:
+    if not version():
+        print_no_pip_error()
+        sys.exit(-1)
 
 
-assert sys.version_info >= (3, 7), 'Python version is too old!'
+assert sys.version_info >= (3, 9), f'Python version {sys.version_info} is too old!'
 
 
 if sys.platform == 'win32':  # wtf
@@ -60,25 +68,24 @@ PROJECT_SHELL_SCRIPT = BIN_PATH / 'devshell'
 
 
 def get_dep_hash():
-    """ Get SHA512 hash from poetry.lock content. """
+    """Get SHA512 hash from lock file content."""
     return hashlib.sha512(DEP_LOCK_PATH.read_bytes()).hexdigest()
 
 
 def store_dep_hash():
-    """ Generate /.venv/.dep_hash """
+    """Generate .venv/.dep_hash"""
     DEP_HASH_PATH.write_text(get_dep_hash())
 
 
 def venv_up2date():
-    """ Is existing .venv is up-to-date? """
+    """Is existing .venv is up-to-date?"""
     if DEP_HASH_PATH.is_file():
         return DEP_HASH_PATH.read_text() == get_dep_hash()
     return False
 
 
 def verbose_check_call(*popen_args):
-    popen_args = [str(arg) for arg in popen_args]  # e.g.: Path() -> str for python 3.7
-    print(f'\n+ {" ".join(popen_args)}\n')
+    print(f'\n+ {shlex.join(str(arg) for arg in popen_args)}\n')
     return subprocess.check_call(popen_args)
 
 
@@ -86,7 +93,6 @@ def noop_signal_handler(signal_num, frame):
     """
     Signal handler that does nothing: Used to ignore "Ctrl-C" signals
     """
-    pass
 
 
 def main(argv):
@@ -119,12 +125,14 @@ def main(argv):
         print('Create virtual env here:', VENV_PATH.absolute())
         builder = venv.EnvBuilder(symlinks=True, upgrade=True, with_pip=True)
         builder.create(env_dir=VENV_PATH)
+        # 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!=1.2.0')
+        verbose_check_call(PIP_PATH, 'install', 'poetry')
 
     # install via poetry, if:
     #   1. .venv not exists

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

@@ -88,12 +88,16 @@ class BootstrapTestCase(TestCase):
         assert stderr == ''
         assert f'{VENV_POETRY} install' in stdout
         assert f'{DEVSHELL_CALL}\n' in stdout
-        assert check_calls == [
-            f'{VENV_PYTHON} -m pip install -U pip setuptools',
-            f'{VENV_PIP} install poetry!=1.2.0',
-            f'{VENV_POETRY} install',
-            DEVSHELL_CALL
-        ]
+        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)
 
     def test_help(self):

{dev_shell-0.7.0 → dev_shell-0.8.0}/dev_shell/tests/utils.py

@@ -23,7 +23,7 @@ def call_mocked_subprocess(func_name, func, *args, catch_sys_exit=False, **kwarg
             if isinstance(popenargs, str):
                 command_str = popenargs
             else:
-                command_str = ' '.join(popenargs)
+                command_str = ' '.join([str(arg) for arg in popenargs])
 
             cwd = kwargs.get('cwd')
             if cwd:

{dev_shell-0.7.0 → dev_shell-0.8.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "dev-shell"
-version = "0.7.0"
-description = "Devloper shell for easy startup..."
+version = "0.8.0"
+description = "Developer shell for easy startup..."
 readme = "README.md"
 authors = ["Jens Diemer <python@jensdiemer.de>"]
 homepage = "https://github.com/jedie/dev-shell"
@@ -14,13 +14,9 @@ packages = [
 devshell = 'dev_shell.dev_shell_app:devshell_cmdloop'
 
 [tool.poetry.dependencies]
-python = ">=3.9,<4.0.0"
+python = ">=3.9,<4.0"
 cmd2 = "*"  # https://github.com/python-cmd2/cmd2
 
-# fix completion for Mac OS:
-gnureadline = { version = "*", markers = "sys_platform == 'darwin'" }
-
-
 [tool.poetry.dev-dependencies]
 cmd2_ext_test = "*"
 poetry-publish = "*"  # https://github.com/jedie/poetry-publish
@@ -42,7 +38,6 @@ build-backend = "poetry.core.masonry.api"
 src = ['.',]
 revision = "origin/main..."
 line_length = 100
-verbose = true
 skip_string_normalization = true
 diff = false
 check = false

dev_shell-0.7.0/dev_shell/__init__.py

@@ -1 +0,0 @@
-__version__ = '0.7.0'