From f4a4765f1f2bd1d38c0a7e0db46cd962d17f3939 Mon Sep 17 00:00:00 2001 From: Matt Craig Date: Tue, 6 Aug 2024 08:27:36 -0500 Subject: [PATCH 1/3] Include proper files in sdist so they land in the wheel --- pyproject.toml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f6ad95b3..dc10f678 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,17 +59,25 @@ source = "vcs" [tool.hatch.build.hooks.vcs] version-file = "stellarphot/_version.py" -[tool.hatch.build.targets.wheel.shared-data] -"stellarphot/notebooks/photometry" = "share/jupyter/stellarphot/photometry" -"stellarphot/notebooks" = "share/jupyter/stellarphot" -".jp_app_launcher_stellarphot.yaml" = "share/jupyter/jupyter_app_launcher/jp_app_launcher_stellarphot.yaml" -"docs/_static/stellarphot-logo.svg" = "share/jupyter/stellarphot/stellarphot-logo.svg" - [tool.hatch.build.targets.sdist] +# This section determines what files are included in the source distribution include = [ + # The source code "/stellarphot", + # Logo for JupyterLab launcher + "/docs/_static/stellarphot-logo.svg", + # Configuration for jupyter-app-launcher + "/.jp_app_launcher_stellarphot.yaml" ] +[tool.hatch.build.targets.wheel.shared-data] +# This section determines what data files are included in the wheel +# and where they should eventually be installed in the user's environment. +"docs/_static/stellarphot-logo.svg" = "share/jupyter/stellarphot/stellarphot-logo.svg" +# This includes the notebooks used in the launcher +"stellarphot/notebooks" = "share/jupyter/stellarphot" +".jp_app_launcher_stellarphot.yaml" = "share/jupyter/jupyter_app_launcher/jp_app_launcher_stellarphot.yaml" + [tool.coverage] [tool.coverage.run] From b1528dd4e20140dc081f951d5fd4beb2d50f5301 Mon Sep 17 00:00:00 2001 From: Matt Craig Date: Tue, 6 Aug 2024 08:37:53 -0500 Subject: [PATCH 2/3] Remove unneeded package files --- stellarphot/notebooks/__init__.py | 0 stellarphot/notebooks/photometry/__init__.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 stellarphot/notebooks/__init__.py delete mode 100644 stellarphot/notebooks/photometry/__init__.py diff --git a/stellarphot/notebooks/__init__.py b/stellarphot/notebooks/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/stellarphot/notebooks/photometry/__init__.py b/stellarphot/notebooks/photometry/__init__.py deleted file mode 100644 index e69de29b..00000000 From 95fd94a1c4e71090defd9a6025e0725fe5039a37 Mon Sep 17 00:00:00 2001 From: Matt Craig Date: Tue, 6 Aug 2024 08:46:54 -0500 Subject: [PATCH 3/3] Revert "Remove unneeded package files" This reverts commit b1528dd4e20140dc081f951d5fd4beb2d50f5301. Turns out that because get_pkg_data_filename is used to get the photometry runner notebook at least one of these is needed. --- stellarphot/notebooks/__init__.py | 0 stellarphot/notebooks/photometry/__init__.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 stellarphot/notebooks/__init__.py create mode 100644 stellarphot/notebooks/photometry/__init__.py diff --git a/stellarphot/notebooks/__init__.py b/stellarphot/notebooks/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/stellarphot/notebooks/photometry/__init__.py b/stellarphot/notebooks/photometry/__init__.py new file mode 100644 index 00000000..e69de29b