From 2dd5169220058b85771126bf0cd8f21fe720c5d5 Mon Sep 17 00:00:00 2001 From: Matthew Pitkin Date: Wed, 22 May 2024 13:02:05 +0100 Subject: [PATCH] Minor packaging changes --- MANIFEST.in | 4 ++-- pyproject.toml | 13 ++++++------- setup.py | 4 ++-- src/{ => lintegrate}/__init__.py | 0 src/{ => lintegrate}/lintegrate.pyx | 0 5 files changed, 10 insertions(+), 11 deletions(-) rename src/{ => lintegrate}/__init__.py (100%) rename src/{ => lintegrate}/lintegrate.pyx (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 9e35d42..320214c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,7 @@ include src/*.h include src/*.c -include src/*.pyx -include src/*.py +include src/lintegrate/*.pyx +include src/lintegrate/*.py include LICENSE include gsl-config.bat include pyproject.toml diff --git a/pyproject.toml b/pyproject.toml index 7fd0a49..a373c86 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,14 +46,13 @@ docs = [ "sphinxext-remoteliteralinclude", ] -[tools.setuptools.packages.find] -include = [ - "lintegrate*", -] +[tool.setuptools.packages.find] +where = ["src"] +include = ["lintegrate*"] -[tools.setuptools.package-data] +[tool.setuptools.package-data] lintegrate = ["*.pyx"] -[tools.setuptools_scm] -write_to = "src/_version.py" +[tool.setuptools_scm] +write_to = "src/lintegrate/_version.py" diff --git a/setup.py b/setup.py index 9fdd864..133dcea 100644 --- a/setup.py +++ b/setup.py @@ -59,9 +59,9 @@ def gsl_config(*args, **kwargs): ext_modules = [ Extension( - "lintegrate", + "lintegrate.lintegrate", sources=[ - "src/lintegrate.pyx", + "src/lintegrate/lintegrate.pyx", "src/lintegrate_qag.c", "src/lintegrate_qng.c", "src/lintegrate_cquad.c", diff --git a/src/__init__.py b/src/lintegrate/__init__.py similarity index 100% rename from src/__init__.py rename to src/lintegrate/__init__.py diff --git a/src/lintegrate.pyx b/src/lintegrate/lintegrate.pyx similarity index 100% rename from src/lintegrate.pyx rename to src/lintegrate/lintegrate.pyx