From 96149314ecf1ad9c22669ce12d579f846b77016e Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Thu, 6 Feb 2025 13:42:57 +0000 Subject: [PATCH 1/3] Only include packages under the module name (#79) This should fix #78 --- {{ cookiecutter.package_name }}/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/{{ cookiecutter.package_name }}/pyproject.toml b/{{ cookiecutter.package_name }}/pyproject.toml index 714b1d4..5a1f847 100644 --- a/{{ cookiecutter.package_name }}/pyproject.toml +++ b/{{ cookiecutter.package_name }}/pyproject.toml @@ -53,6 +53,7 @@ zip-safe = false include-package-data = true [tool.setuptools.packages.find] +include = ["{{ cookiecutter.module_name }}*"] {% if cookiecutter.enable_dynamic_dev_versions == 'y' -%} exclude = ["{{ cookiecutter.module_name }}._dev*"] {%- endif %} From 6ec91baf6ba6a8208be20ff06b586ac679c7858e Mon Sep 17 00:00:00 2001 From: Jan Gieseler <39489154+jgieseler@users.noreply.github.com> Date: Thu, 6 Feb 2025 17:55:52 +0200 Subject: [PATCH 2/3] Replace "Astropy" with "{{ cookiecutter.package_name }}" in BSD-3 (#80) * Replace "Astropy Team" with "{{ cookiecutter.package_name }} team" in BSD-3 license * remove testing of license file line 12 from test_licence() --- tests/test_hooks.py | 3 ++- {{ cookiecutter.package_name }}/licenses/BSD3.rst | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_hooks.py b/tests/test_hooks.py index d548861..8c299ad 100644 --- a/tests/test_hooks.py +++ b/tests/test_hooks.py @@ -60,7 +60,8 @@ def test_licence(license, lfile, cookies): with open(base_path / lfile) as fobj: expected_content = fobj.readlines() - assert expected_content[1:] == license_content[1:] + assert expected_content[1:11] == license_content[1:11] + assert expected_content[12:] == license_content[12:] def test_other_licence(cookies): diff --git a/{{ cookiecutter.package_name }}/licenses/BSD3.rst b/{{ cookiecutter.package_name }}/licenses/BSD3.rst index 67e9e47..a1e90cf 100644 --- a/{{ cookiecutter.package_name }}/licenses/BSD3.rst +++ b/{{ cookiecutter.package_name }}/licenses/BSD3.rst @@ -9,7 +9,7 @@ are permitted provided that the following conditions are met: * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the Astropy Team nor the names of its contributors may be +* Neither the name of the {{ cookiecutter.package_name }} team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. From d7fa4e2e631cefea3833744915ed188cffb7c8b1 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Thu, 6 Feb 2025 08:39:53 -0800 Subject: [PATCH 3/3] Update pyproject.toml --- {{ cookiecutter.package_name }}/pyproject.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/{{ cookiecutter.package_name }}/pyproject.toml b/{{ cookiecutter.package_name }}/pyproject.toml index 9e42ce4..173e2a1 100644 --- a/{{ cookiecutter.package_name }}/pyproject.toml +++ b/{{ cookiecutter.package_name }}/pyproject.toml @@ -75,11 +75,7 @@ include-package-data = true [tool.setuptools.packages.find] include = ["{{ cookiecutter.module_name }}*"] -<<<<<<< HEAD -{%- if cookiecutter.enable_dynamic_dev_versions == 'y' %} -======= {% if cookiecutter.enable_dynamic_dev_versions == 'y' -%} ->>>>>>> openastronomy/main exclude = ["{{ cookiecutter.module_name }}._dev*"] {%- endif %} {% if cookiecutter.use_compiled_extensions == 'y' %}