Skip to content

Commit

Permalink
Merge pull request #139 from jedie/dev
Browse files Browse the repository at this point in the history
Apply update from cookiecutter templates
  • Loading branch information
jedie authored Sep 24, 2024
2 parents e446bd6 + 8368e70 commit 366ed69
Show file tree
Hide file tree
Showing 8 changed files with 195 additions and 52 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,9 @@ See also git tags: https://github.com/jedie/manageprojects/tags

[comment]: <> (✂✂✂ auto generated history start ✂✂✂)

* [**dev**](https://github.com/jedie/manageprojects/compare/v0.19.1...main)
* [v0.19.2](https://github.com/jedie/manageprojects/compare/v0.19.1...v0.19.2)
* 2024-09-24 - Add piwheels hashes, too.
* 2024-09-24 - Apply update from cookiecutter templates
* 2024-09-24 - Update requirements
* [v0.19.1](https://github.com/jedie/manageprojects/compare/v0.19.0...v0.19.1)
* 2024-09-15 - Bugfix and enhance "setup_python.py"
Expand Down
5 changes: 4 additions & 1 deletion cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def print_no_pip_error():
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 = ''

Expand Down Expand Up @@ -110,6 +110,9 @@ def main(argv):
verbose_check_call(PROJECT_SHELL_SCRIPT, *argv[1:])
except subprocess.CalledProcessError as err:
sys.exit(err.returncode)
except KeyboardInterrupt:
print('Bye!')
sys.exit(130)


if __name__ == '__main__':
Expand Down
5 changes: 4 additions & 1 deletion dev-cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def print_no_pip_error():
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 = ''

Expand Down Expand Up @@ -114,6 +114,9 @@ def main(argv):
verbose_check_call(PROJECT_SHELL_SCRIPT, *argv[1:])
except subprocess.CalledProcessError as err:
sys.exit(err.returncode)
except KeyboardInterrupt:
print('Bye!')
sys.exit(130)


if __name__ == '__main__':
Expand Down
3 changes: 2 additions & 1 deletion manageprojects/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
Manage Python / Django projects
"""

__version__ = '0.19.1'
# See https://packaging.python.org/en/latest/specifications/version-specifiers/
__version__ = '0.19.2'
__author__ = 'Jens Diemer <[email protected]>'
9 changes: 1 addition & 8 deletions manageprojects/cli_dev/packaging.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,7 @@ def update():
CUSTOM_COMPILE_COMMAND='./dev-cli.py update',
)

pip_compile_base = [
bin_path / 'pip-compile',
'--verbose',
'--allow-unsafe', # https://pip-tools.readthedocs.io/en/latest/#deprecations
'--resolver=backtracking', # https://pip-tools.readthedocs.io/en/latest/#deprecations
'--upgrade',
'--generate-hashes',
]
pip_compile_base = [bin_path / 'pip-compile', '--verbose', '--upgrade']

# Only "prod" dependencies:
verbose_check_call(
Expand Down
17 changes: 14 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,21 @@ dev = [
# https://github.com/pygments/pygments
"darker[flynt, isort, color]",

# Work-a-round for:
# https://github.com/jazzband/pip-tools/issues/994
"backports.tarfile",
# Work-a-round for: https://github.com/jazzband/pip-tools/issues/1866
# see also: https://github.com/jazzband/pip-tools/issues/994#issuecomment-1321226661
# backports.tarfile is needed for python <3.12
'backports.tarfile', # via jaraco-context -> keyring -> twine
]

[tool.pip-tools.compile]
index-url="https://pypi.org/simple"
extra-index-url=["https://www.piwheels.org/simple"] # Add hashes of piwheels packages, too!
generate-hashes = true
# https://pip-tools.readthedocs.io/en/stable/#deprecations
allow-unsafe = true
resolver="backtracking"
strip-extras = true

[project.urls]
Documentation = "https://github.com/jedie/manageprojects"
Source = "https://github.com/jedie/manageprojects"
Expand Down Expand Up @@ -203,6 +213,7 @@ applied_migrations = [
"7271d4c", # 2023-12-29T21:57:47+01:00
"f8be3e0", # 2024-07-16T19:35:26+02:00
"2cdc1d8", # 2024-08-25T19:00:41+02:00
"56c3caa", # 2024-09-22T16:52:30+02:00
]

[manageprojects.cookiecutter_context.cookiecutter]
Expand Down
139 changes: 113 additions & 26 deletions requirements.dev.txt

Large diffs are not rendered by default.

65 changes: 54 additions & 11 deletions requirements.txt

Large diffs are not rendered by default.

0 comments on commit 366ed69

Please sign in to comment.