From 32fff6dabbd0ebf19abf008f22a1645357aca2c6 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Thu, 13 Jul 2023 09:52:30 +0200 Subject: [PATCH 1/4] treat templates, static, and content as namespace packages --- CHANGELOG.md | 2 +- pyproject.toml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 271acd5..cc3f916 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * default theme: `img` have now `max-width: 100%` by default to avoid very large images overflowing -* packaging: explicitly list `templates`, `static` and `content` as packages +* packaging: treat `templates`, `static` and `content` as namespace packages instead of using package-data for setuptools diff --git a/pyproject.toml b/pyproject.toml index 141b900..5f5e093 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,9 +47,6 @@ version = {attr = "blag.__VERSION__" } [tool.setuptools] packages = [ "blag", - "blag.templates", - "blag.static", - "blag.content", "tests", ] From 3cfd756ac1360e2120ed1e7b60dfa9d7587c3014 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Thu, 13 Jul 2023 10:21:35 +0200 Subject: [PATCH 2/4] added data dirs to MANIFEST.in --- CHANGELOG.md | 2 +- pyproject.toml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc3f916..271acd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * default theme: `img` have now `max-width: 100%` by default to avoid very large images overflowing -* packaging: treat `templates`, `static` and `content` as namespace packages +* packaging: explicitly list `templates`, `static` and `content` as packages instead of using package-data for setuptools diff --git a/pyproject.toml b/pyproject.toml index 5f5e093..141b900 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,6 +47,9 @@ version = {attr = "blag.__VERSION__" } [tool.setuptools] packages = [ "blag", + "blag.templates", + "blag.static", + "blag.content", "tests", ] From a1cfe01373b2386ada237686b7265a2934ff6aeb Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Thu, 13 Jul 2023 10:21:54 +0200 Subject: [PATCH 3/4] added MANIFEST.in --- MANIFEST.in | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..dbb52ef --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,3 @@ +recursive-include blag/content * +recursive-include blag/static * +recursive-include blag/templates * From 111957883ee9bc11e8a5a04674a32bd33d2b96fe Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Thu, 13 Jul 2023 12:07:50 +0200 Subject: [PATCH 4/4] updated changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 271acd5..83a8fa3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,10 @@ * default theme: `img` have now `max-width: 100%` by default to avoid very large images overflowing * packaging: explicitly list `templates`, `static` and `content` as packages - instead of using package-data for setuptools + instead of relying on package-data for setuptools. additionally, created a + MANIFEST.in to add the contents of these directories here as well. the + automatic finding of namespace packages and packaga-data, currently does not + work as advertised in setuptools' docs ## [2.0.0] - 2023-06-16