Skip to content

Commit 710f2d2

Browse files
committed
Rename project_slug to python_package_name
1 parent 6bde69d commit 710f2d2

61 files changed

Lines changed: 73 additions & 76 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.vscode/settings.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
},
1919
"editor.formatOnSave": true,
2020
"files.associations": {
21-
"**/?? cookiecutter.project_slug ??/**/*.json": "jinja-json",
22-
"**/?? cookiecutter.project_slug ??/.vscode/settings.json": "jsonc",
23-
"**/?? cookiecutter.project_slug ??/.python-version": "jinja",
24-
"**/?? cookiecutter.project_slug ??/**/*.md": "jinja-md",
25-
"**/?? cookiecutter.project_slug ??/**/*.py": "jinja-py",
26-
"**/?? cookiecutter.project_slug ??/**/*.toml": "jinja-toml",
27-
"**/?? cookiecutter.project_slug ??/**/*.yml": "jinja-yaml",
28-
"**/?? cookiecutter.project_slug ??/**/PKGBUILD": "jinja-shell",
21+
"**/?? cookiecutter.pypi_package_name ??/**/*.json": "jinja-json",
22+
"**/?? cookiecutter.pypi_package_name ??/.vscode/settings.json": "jsonc",
23+
"**/?? cookiecutter.pypi_package_name ??/.python-version": "jinja",
24+
"**/?? cookiecutter.pypi_package_name ??/**/*.md": "jinja-md",
25+
"**/?? cookiecutter.pypi_package_name ??/**/*.py": "jinja-py",
26+
"**/?? cookiecutter.pypi_package_name ??/**/*.toml": "jinja-toml",
27+
"**/?? cookiecutter.pypi_package_name ??/**/*.yml": "jinja-yaml",
28+
"**/?? cookiecutter.pypi_package_name ??/**/PKGBUILD": "jinja-shell",
2929
"**/hooks/*_gen_project.py": "jinja-py"
3030
},
3131
"files.exclude": {

README.md

Lines changed: 1 addition & 1 deletion

cookiecutter.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"project_title": "",
3-
"project_slug": "{{ cookiecutter.project_title.lower().replace(' ', '_').replace('-', '_') }}",
3+
"python_package_name": "{{ cookiecutter.project_title.lower().replace(' ', '_').replace('-', '_') }}",
44
"project_description": "",
55
"first_module_name": "api",
66
"project_version": "0.1.0",
@@ -11,7 +11,7 @@
1111
"copyright_holder_full_name": "{{ cookiecutter.author_full_name }}",
1212
"github_username": "",
1313
"include_executable": "y",
14-
"executable_name": "{{ cookiecutter.project_slug.replace('_', '-') }}",
14+
"executable_name": "{{ cookiecutter.python_package_name.replace('_', '-') }}",
1515
"install_dependencies_now": "y",
1616
"_copy_without_render": [
1717
".redport/patches/*.patch"

hooks/post_gen_project.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
{% if cookiecutter.include_executable != "y" -%}
2626
os.remove('.vscode/launch.json')
27-
os.remove('{{ cookiecutter.project_slug }}/__main__.py')
28-
os.remove('{{ cookiecutter.project_slug }}/cli.py')
29-
os.remove('{{ cookiecutter.project_slug }}/fire_workarounds.py')
27+
os.remove('{{ cookiecutter.python_package_name }}/__main__.py')
28+
os.remove('{{ cookiecutter.python_package_name }}/cli.py')
29+
os.remove('{{ cookiecutter.python_package_name }}/fire_workarounds.py')
3030
{% endif -%}
3131

3232
{%- if cookiecutter.install_dependencies_now == "y" %}
@@ -47,7 +47,7 @@ def sysexit_formatted(message: str) -> None:
4747
except subprocess.CalledProcessError as e:
4848
sysexit_formatted([
4949
f'Pyenv failed with exit code {e.returncode}.',
50-
'Go to the {{ cookiecutter.project_slug }}'
50+
'Go to the {{ cookiecutter.pypi_package_name }}'
5151
' directory and re-run:',
5252
*[
5353
f' {command}'
@@ -75,7 +75,7 @@ def sysexit_formatted(message: str) -> None:
7575
print(
7676
f'Poetry failed with exit code {e.returncode}.',
7777
'Fix any issues, then go to the '
78-
'{{ cookiecutter.project_slug }} directory and re-run:',
78+
'{{ cookiecutter.pypi_package_name }} directory and re-run:',
7979
f' {e.cmd}',
8080
file=sys.stderr,
8181
sep='\n',

hooks/pre_gen_project.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{{
1010
cookiecutter.update({
1111
"pypi_package_name":
12-
cookiecutter.project_slug.replace('_', '-'),
12+
cookiecutter.python_package_name.replace('_', '-'),
1313
"spdx_license":
1414
spdx_license_dict[cookiecutter.project_license],
1515
"use_alternative_union_syntax":
@@ -33,9 +33,9 @@
3333
"""
3434
)
3535

36-
if '{{ cookiecutter.project_slug }}' \
36+
if '{{ cookiecutter.python_package_name }}' \
3737
== '{{ cookiecutter.first_module_name }}':
38-
sys.exit('Project slug and first module name cannot be the same')
38+
sys.exit('Package name and first module name cannot be the same')
3939

4040
if not shutil.which('poetry'):
4141
sys.exit(

{{ cookiecutter.project_slug }}/contrib/archlinux/{{ cookiecutter.pypi_package_name }}-local/.gitignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

{{ cookiecutter.project_slug }}/{{ cookiecutter.project_slug }}/__init__.py

Lines changed: 0 additions & 23 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

{{ cookiecutter.project_slug }}/.github/workflows/build-dist.yml renamed to {{ cookiecutter.pypi_package_name }}/.github/workflows/build-dist.yml

File renamed without changes.

0 commit comments

Comments
 (0)