Skip to content

Update MANIFEST.in to enable 'python -m build` to work#1249

Merged
jorisvandenbossche merged 5 commits intoshapely:mainfrom
mwtoews:manifest
Dec 5, 2021
Merged

Update MANIFEST.in to enable 'python -m build` to work#1249
jorisvandenbossche merged 5 commits intoshapely:mainfrom
mwtoews:manifest

Conversation

@mwtoews
Copy link
Copy Markdown
Member

@mwtoews mwtoews commented Dec 4, 2021

A few edits to MANIFEST.in were necessary to get python -m build to work as expected.

This should probably be integrated into the CI at some point.

@jorisvandenbossche
Copy link
Copy Markdown
Member

jorisvandenbossche commented Dec 4, 2021

@mwtoews could you remove MANIFEST_pygeos.in then? (or check if that this has other things to add, those two files still needed to be consolidated)

@mwtoews
Copy link
Copy Markdown
Member Author

mwtoews commented Dec 4, 2021

thanks @jorisvandenbossche, this merge has now been reviewed. The significant include was for pyproject.toml. The Cython-generated C files don't need to be excluded from shapely/, as they already seem to be ignored.

So at some point, a good CI check would be to:

python setup.py sdist
# figure out what dist/*.tar.gz to use
tar xf ${SDIST}.tar.gz
cd ${SDIST}
python -m build

The VERSION.txt file was removed in 2012, so is finally chopped now as a potential include.

@jorisvandenbossche
Copy link
Copy Markdown
Member

The Cython-generated C files don't need to be excluded from shapely/, as they already seem to be ignored.

From a quick test locally, for me they are included.
Maybe the difference is whether you started from a cleaned repo or not? It's always good to first do a git clean -xdf when running packaging stuff, but explicitly ignoring the shapely/*.c files might still be useful?

@mwtoews
Copy link
Copy Markdown
Member Author

mwtoews commented Dec 4, 2021

Strange, as I have several shapely/*.c files, but these don't get included. There must be some implicit magic happening somewhere. I've added further commit to explicitly exclude these, and python setup.py sdist has a harmless warning:

warning: no previously-included files matching '*.c' found under directory 'shapely'

@jorisvandenbossche
Copy link
Copy Markdown
Member

This should probably be integrated into the CI at some point.

With the copied release.yml workflow from pygeos, we actually do have that now. I will push a small update so that this gets triggered here.

@jorisvandenbossche
Copy link
Copy Markdown
Member

The sdist artifact can be downloaded from https://github.com/Toblerity/Shapely/actions/runs/1540852171

@mwtoews
Copy link
Copy Markdown
Member Author

mwtoews commented Dec 5, 2021

Thanks @jorisvandenbossche, the additions look good.

@jorisvandenbossche jorisvandenbossche merged commit a28a4e3 into shapely:main Dec 5, 2021
@mwtoews mwtoews deleted the manifest branch December 6, 2021 00:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants