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

{dev-shell-0.6.1 → dev_shell-0.8.0}/PKG-INFO

@@ -1,20 +1,18 @@
 Metadata-Version: 2.1
 Name: dev-shell
-Version: 0.6.1
-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.7,<4.0.0
+Requires-Python: >=3.9,<4.0
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 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 ;)
@@ -30,7 +28,7 @@ This small project is intended to improve the start-up for collaborators.
 
 The idea is to make the project setup as simple as possible. Just clone the sources and start a script and you're done ;)
 
-Why in hell not just a `Makefile`? Because it doesn't out-of-the-box under Windows and MacOS, the dev-shell does ;) 
+Why in hell not just a `Makefile`? Because it doesn't out-of-the-box under Windows and MacOS, the dev-shell does ;)
 
 Run Tests? Just start the script and call the "run test command".
 
@@ -115,6 +113,7 @@ You can also just delete `/.venv/` and start `devshell.py` again ;)
 
 | dev-shell version | OS                      | Python version      |
 |-------------------|-------------------------|---------------------|
+| >=v0.7.0          | Linux + MacOS + Windows | 3.11, 3.10, 3.9     |
 | >=v0.5.0          | Linux + MacOS + Windows | 3.10, 3.9, 3.8, 3.7 |
 | >=v0.0.1          | Linux + MacOS + Windows | 3.9, 3.8, 3.7       |
 
@@ -122,8 +121,15 @@ See also github test configuration: [.github/workflows/test.yml](https://github.
 
 ## History
 
-* [*dev*](https://github.com/jedie/dev-shell/compare/v.6.1...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
 * [0.6.1 - 2022-09-02](https://github.com/jedie/dev-shell/compare/v0.6.0...v0.6.1)
   * Set default subprocess timeout to 5 Min.
   * Skip buggy Poetry v1.2.0

{dev-shell-0.6.1 → dev_shell-0.8.0}/README.md

@@ -11,7 +11,7 @@ This small project is intended to improve the start-up for collaborators.
 
 The idea is to make the project setup as simple as possible. Just clone the sources and start a script and you're done ;)
 
-Why in hell not just a `Makefile`? Because it doesn't out-of-the-box under Windows and MacOS, the dev-shell does ;) 
+Why in hell not just a `Makefile`? Because it doesn't out-of-the-box under Windows and MacOS, the dev-shell does ;)
 
 Run Tests? Just start the script and call the "run test command".
 
@@ -96,6 +96,7 @@ You can also just delete `/.venv/` and start `devshell.py` again ;)
 
 | dev-shell version | OS                      | Python version      |
 |-------------------|-------------------------|---------------------|
+| >=v0.7.0          | Linux + MacOS + Windows | 3.11, 3.10, 3.9     |
 | >=v0.5.0          | Linux + MacOS + Windows | 3.10, 3.9, 3.8, 3.7 |
 | >=v0.0.1          | Linux + MacOS + Windows | 3.9, 3.8, 3.7       |
 
@@ -103,8 +104,15 @@ See also github test configuration: [.github/workflows/test.yml](https://github.
 
 ## History
 
-* [*dev*](https://github.com/jedie/dev-shell/compare/v.6.1...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
 * [0.6.1 - 2022-09-02](https://github.com/jedie/dev-shell/compare/v0.6.0...v0.6.1)
   * Set default subprocess timeout to 5 Min.
   * Skip buggy Poetry v1.2.0

dev_shell-0.8.0/dev_shell/__init__.py

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

{dev-shell-0.6.1 → 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.6.1 → 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.6.1 → 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:
@@ -44,8 +44,10 @@ class RedirectStdOutErr:
         self._output = None
 
     def __enter__(self):
-        self._stdout_redirect = redirect_stdout(self._buffer).__enter__()
-        self._stderr_redirect = redirect_stderr(self._buffer).__enter__()
+        self._stdout_redirect = redirect_stdout(self._buffer)
+        self._stdout_redirect.__enter__()
+        self._stderr_redirect = redirect_stderr(self._buffer)
+        self._stderr_redirect.__enter__()
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):

{dev-shell-0.6.1 → dev_shell-0.8.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "dev-shell"
-version = "0.6.1"
-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,20 +14,16 @@ packages = [
 devshell = 'dev_shell.dev_shell_app:devshell_cmdloop'
 
 [tool.poetry.dependencies]
-python = ">=3.7,<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
 pytest = "*"
 pytest-randomly = "*"
 pytest-cov = "*"
-pytest-darker = "*"  # https://github.com/akaihola/pytest-darker
+darker = "*"  # https://github.com/akaihola/darker
 # TODO: pytest-mypy = "*"
 tox = "*"
 pyupgrade = "*"  # https://github.com/asottile/pyupgrade
@@ -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
@@ -86,7 +81,6 @@ addopts = """
     --cov-report xml
     --no-cov-on-fail
     --showlocals
-    --darker
     --doctest-modules
     --failed-first
     --last-failed-no-failures all
@@ -100,7 +94,7 @@ addopts = """
 legacy_tox_ini = """
 [tox]
 isolated_build = True
-envlist = py{37,38,39,310}
+envlist = py{39,310,311}
 skip_missing_interpreters = True
 
 [testenv]

dev-shell-0.6.1/dev_shell/__init__.py

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

dev-shell-0.6.1/setup.py

@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['dev_shell', 'dev_shell.command_sets', 'dev_shell.tests', 'dev_shell.utils']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['cmd2']
-
-extras_require = \
-{':sys_platform == "darwin"': ['gnureadline']}
-
-entry_points = \
-{'console_scripts': ['devshell = dev_shell.dev_shell_app:devshell_cmdloop']}
-
-setup_kwargs = {
-    'name': 'dev-shell',
-    'version': '0.6.1',
-    'description': 'Devloper shell for easy startup...',
-    'long_description': '# A "dev-shell" for Python projects ;)\n\n[![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)\n[![codecov](https://codecov.io/gh/jedie/dev-shell/branch/main/graph/badge.svg)](https://codecov.io/gh/jedie/dev-shell)\n\n[![ddev-shell @ PyPi](https://img.shields.io/pypi/v/dev-shell?label=dev-shell%20%40%20PyPi)\n![Python Versions](https://img.shields.io/pypi/pyversions/dev-shell)\n![License GPL V3+](https://img.shields.io/pypi/l/dev-shell)](https://pypi.org/project/dev-shell/)\n\nThis small project is intended to improve the start-up for collaborators.\n\nThe idea is to make the project setup as simple as possible. Just clone the sources and start a script and you\'re done ;)\n\nWhy in hell not just a `Makefile`? Because it doesn\'t out-of-the-box under Windows and MacOS, the dev-shell does ;) \n\nRun Tests? Just start the script and call the "run test command".\n\nThe "dev-shell" is the base to create a CLI and a shell. It also shows how to make a project bootstrap as simply as possible, e.g.:\n\n```bash\n~$ git clone https://github.com/jedie/dev-shell.git\n~$ cd dev-shell\n~/dev-shell$ ./devshell.py pytest\n```\n\n\n## How it works\n\nFirst start of the Python script [./devshell.py](https://github.com/jedie/dev-shell/blob/main/devshell.py) will bootstrap:\n\n* Generate a Python virtual environment (in short: `venv`)\n* Install poetry\n* Install project dependencies and the project himself\n\nThe output on first bootstrap start looks like:\n\n```bash\n~/dev-shell$ ./devshell.py\nCreate venv here: ~/dev-shell/.venv\nCollecting pip\n...\nSuccessfully installed pip-21.0.1\nCollecting poetry\n...\nInstalling dependencies from lock file\n\nPackage operations: 31 installs, 1 update, 0 removals\n\n...\n\nInstalling the current project: dev-shell (0.0.1alpha0)\n\n\n+ .venv/bin/python .venv/bin/devshell\n\n\nDeveloper shell - dev_shell - v0.2.0\n\n\nDocumented commands (use \'help -v\' for verbose/\'help <topic>\' for details):\n\ndev-shell commands\n==================\nfix_code_style  linting  list_venv_packages  publish  pytest  update\n\n...\n\n(dev_shell) quit\n~/dev-shell$\n```\n\nThe first bootstrap start takes a few seconds. Each later startup detects the existing virtualenv and is very fast:\n\n```bash\n~/dev-shell$ ./devshell.py\n\nDeveloper shell - dev_shell - v0.2.0\n\n(dev_shell) help\n```\n\nInfo: The `.venv` will be automatically updated via `poetry install` call if the `poetry.lock` file has been changed.\n\nA call with `--update` will force to call some create/update steps, e.g.:\n\n```bash\n~/dev-shell$ ./devshell.py --update\n```\n\nYou can also just delete `/.venv/` and start `devshell.py` again ;)\n\n(Using `--update` is not to be confused with the call of "update" command.)\n\n\n## compatibility\n\n| dev-shell version | OS                      | Python version      |\n|-------------------|-------------------------|---------------------|\n| >=v0.5.0          | Linux + MacOS + Windows | 3.10, 3.9, 3.8, 3.7 |\n| >=v0.0.1          | Linux + MacOS + Windows | 3.9, 3.8, 3.7       |\n\nSee also github test configuration: [.github/workflows/test.yml](https://github.com/jedie/dev-shell/blob/main/.github/workflows/test.yml)\n\n## History\n\n* [*dev*](https://github.com/jedie/dev-shell/compare/v.6.1...main)\n  * TBC\n* [0.6.1 - 2022-09-02](https://github.com/jedie/dev-shell/compare/v0.6.0...v0.6.1)\n  * Set default subprocess timeout to 5 Min.\n  * Skip buggy Poetry v1.2.0\n  * Update requirements\n* [0.6.0 - 2022-07-19](https://github.com/jedie/dev-shell/compare/v0.5.0...v0.6.0)\n  * Add "pyupgrade" as shell command\n* [0.5.0 - 2022-05-29](https://github.com/jedie/dev-shell/compare/v0.4.0...v0.5.0)\n  * Add "tox" and "poetry" commands to call them installed in created ```.venv```\n  * Update requirements\n* [v0.4.0 - 2022-02-28](https://github.com/jedie/dev-shell/compare/v0.3.0...v0.4.0)\n  * Update to new cmd2, colorama and pytest versions\n* [v0.3.0 - 2022-01-30](https://github.com/jedie/dev-shell/compare/v0.2.4...v0.3.0)\n  * Remove "flynt" form linting/fix code style\n* [v0.2.4 - 2022-01-30](https://github.com/jedie/dev-shell/compare/v0.2.3...v0.2.4)\n  * Update requirements\n  * Use darker as code formatter and pytest-darker for linting\n* [v0.2.3 - 2021-11-15](https://github.com/jedie/dev-shell/compare/v0.2.2...v0.2.3)\n  * Update requirements\n  * [Flynt arguments can be changes via CommandSet](https://github.com/jedie/dev-shell/issues/29)\n* [v0.2.2 - 2021-04-13](https://github.com/jedie/dev-shell/compare/v0.2.1...v0.2.2)\n  * Include bootstrap file, to it\'s possible to use it in external projects, too.\n* [v0.2.1 - 2021-04-12](https://github.com/jedie/dev-shell/compare/v0.2.0...v0.2.1)\n  * Handle if "poetry-publish" is not installed, so a project that used "dev-shell" must not install it.\n* [v0.2.0 - 2021-04-11](https://github.com/jedie/dev-shell/compare/v0.1.0...v0.2.0)\n  * Rename: "dev-shell.py => devshell.py" because of better autocomplete\n  * Add `DevShellConfig.base_path` and use it in own commands like, `pytest`, `linting` etc. (So they are usable in external project, too.)\n  * recognize "--update" and "--help" arguments better in `./devshell.py` calls.\n  * Update `setuptools` on `.venv` creation, too.\n  * Fix Bugs/tests under Windows\n* [v0.1.0 - 2021-03-22](https://github.com/jedie/dev-shell/compare/v0.0.2...v0.1.0)\n  * Fix CI usage: Exit with correct return code if tests failed\n  * Better "run as CLI" implementation via new `run_cmd2_app()`\n  * Bugfix errors that only occur on Windows.\n  * Simplify `devshell.py` boot script and fix raise error if `ensurepip` missing\n* [v0.0.2 - 2021-03-19](https://github.com/jedie/dev-shell/compare/v0.0.1...v0.0.2)\n  * refactor colorful shortcuts\n  * display subprocess calls with separated colors\n* [v0.0.1 - 2021-03-19](https://github.com/jedie/dev-shell/compare/ad5dca...v0.0.1)\n  * first "useable" version\n\n## Project links\n\n* Github: https://github.com/jedie/dev-shell/\n* PyPi: https://pypi.org/project/dev-shell/\n',
-    'author': 'Jens Diemer',
-    'author_email': 'python@jensdiemer.de',
-    'maintainer': None,
-    'maintainer_email': None,
-    'url': 'https://github.com/jedie/dev-shell',
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'extras_require': extras_require,
-    'entry_points': entry_points,
-    'python_requires': '>=3.7,<4.0.0',
-}
-
-
-setup(**setup_kwargs)