Skip to content

Commit

Permalink
Update setup.py for new src layout
Browse files Browse the repository at this point in the history
In addition to making changes for src-layout, also fixed find_package() configurations,
so both editable and non-editable installation now work as intended.
Previousely, only editable installation was possible (simpeg#336).
  • Loading branch information
omid-b committed Sep 10, 2023
1 parent 5843c7c commit 5cc6db7
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@

metadata = dict(
name="discretize",
packages=find_packages(include=["discretize", "discretize.*"]),
packages=find_packages(where="src"),
package_dir={"": "src"},
include_package_data=True,
python_requires=">=3.8",
setup_requires=build_requires,
install_requires=install_requires,
Expand All @@ -57,7 +59,7 @@
classifiers=CLASSIFIERS,
platforms=["Windows", "Linux", "Solaris", "Mac OS-X", "Unix"],
use_scm_version={
"write_to": os.path.join("discretize", "version.py"),
"write_to": os.path.join("src", "discretize", "version.py"),
},
)
if len(sys.argv) >= 2 and (
Expand Down Expand Up @@ -87,19 +89,22 @@
extensions = [
Extension(
"discretize._extensions.interputils_cython",
["discretize/_extensions/interputils_cython.pyx"],
["src/discretize/_extensions/interputils_cython.pyx"],
include_dirs=[np.get_include()],
**ext_kwargs
),
Extension(
"discretize._extensions.tree_ext",
["discretize/_extensions/tree_ext.pyx", "discretize/_extensions/tree.cpp"],
[
"src/discretize/_extensions/tree_ext.pyx",
"src/discretize/_extensions/tree.cpp",
],
include_dirs=[np.get_include()],
**ext_kwargs
),
Extension(
"discretize._extensions.simplex_helpers",
["discretize/_extensions/simplex_helpers.pyx"],
["src/discretize/_extensions/simplex_helpers.pyx"],
include_dirs=[np.get_include()],
**ext_kwargs
),
Expand Down

0 comments on commit 5cc6db7

Please sign in to comment.