Scripts need to be importable

firedrakeproject · Oct 31, 2024 · 0519e07 · 0519e07
1 parent fa73211
commit 0519e07
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 11 deletions.
diff --git a/scripts/firedrake-install → firedrake/scripts/firedrake-install b/scripts/firedrake-install → firedrake/scripts/firedrake-install
diff --git a/scripts/firedrake-zenodo → firedrake/scripts/firedrake-zenodo b/scripts/firedrake-zenodo → firedrake/scripts/firedrake-zenodo
diff --git a/scripts/firedrake-clean → firedrake/scripts/firedrake_clean b/scripts/firedrake-clean → firedrake/scripts/firedrake_clean
diff --git a/scripts/firedrake-preprocess-bibtex → ...drake/scripts/firedrake_preprocess_bibtex b/scripts/firedrake-preprocess-bibtex → ...drake/scripts/firedrake_preprocess_bibtex
diff --git a/scripts/firedrake-status → firedrake/scripts/firedrake_status b/scripts/firedrake-status → firedrake/scripts/firedrake_status
diff --git a/scripts/spydump → pyop2/scripts/spydump b/scripts/spydump → pyop2/scripts/spydump
diff --git a/pyproject.toml b/pyproject.toml
@@ -55,11 +55,11 @@ Repository = "https://github.com/firedrakeproject/firedrake"
 Issues = "https://github.com/firedrakeproject/firedrake/issues/new/choose"
 
 [project.scripts]
-firedrake-clean = "scripts.firedrake-clean:main"
-firedrake-preprocess-bibtex = "scripts.firedrake-preprocess-bibtex:main"
-firedrake-status = "scripts.firedrake-status:main"
+firedrake-clean = "firedrake.scripts.firedrake_clean:main"
+firedrake-preprocess-bibtex = "firedrake.scripts.firedrake-preprocess_bibtex:main"
+firedrake-status = "firedrake.scripts.firedrake_status:main"
 pyop2-clean = "pyop2.compilation:clear_compiler_disk_cache"
-spydump = "scripts.spydump:main"
+spydump = "pyop2.scripts.spydump:main"
 
 [project.optional-dependencies]
 test = [

diff --git a/scripts/pyop2-clean b/scripts/pyop2-clean
diff --git a/setup.py b/setup.py
@@ -144,7 +144,10 @@ def get_petsc_dir():
 setup(
     cmdclass=cmdclass,
     packages=find_packages(),
-    package_data={"firedrake": ["evaluate.h", "locate.c", "icons/*.png"]},
+    package_data={
+        "firedrake": ["evaluate.h", "locate.c", "icons/*.png"],
+        "pyop2": ["assets/*", "*.h", "*.pxd", "*.pyx", "codegen/c/*.c"]
+    },
     ext_modules=extensions
 )