Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct location of py.typed file in MANIFEST.in #267

Merged
merged 1 commit into from
Sep 27, 2024

Conversation

lonvia
Copy link
Member

@lonvia lonvia commented Sep 27, 2024

py.typed is of course located in the package.

@sebastic I noticed that py.typed is missing in the Debian package for 4.0.0. Could you confirm that this will fix the issue? Then I would do a new release.

@lonvia lonvia merged commit f8eeee6 into osmcode:master Sep 27, 2024
22 checks passed
@lonvia lonvia deleted the fix-manifest branch September 27, 2024 09:18
@sebastic
Copy link
Contributor

@sebastic I noticed that py.typed is missing in the Debian package for 4.0.0.

Is it really?

$ apt-file show python3-pyosmium | grep py.typed
python3-pyosmium: /usr/lib/python3/dist-packages/osmium/py.typed

Could you confirm that this will fix the issue? Then I would do a new release.

It only avoids a few warnings:

../pyosmium_4.0.0-1_amd64.build:warning: no files found matching 'src/py.typed'
../pyosmium_4.0.0-1_amd64.build:copying src/osmium/py.typed -> /build/pyosmium-4.0.0/.pybuild/cpython3_3.12_pyosmium/build/osmium
../pyosmium_4.0.0-1_amd64.build:warning: no files found matching 'src/py.typed'
../pyosmium_4.0.0-1_amd64.build:copying /build/pyosmium-4.0.0/.pybuild/cpython3_3.12_pyosmium/build/osmium/py.typed -> /build/pyosmium-4.0.0/debian/python3-pyosmium/usr/lib/python3.12/dist-packages/osmium
../pyosmium_4.0.0-2_amd64.build:copying src/osmium/py.typed -> /build/pyosmium-4.0.0/.pybuild/cpython3_3.12_pyosmium/build/osmium
../pyosmium_4.0.0-2_amd64.build:copying /build/pyosmium-4.0.0/.pybuild/cpython3_3.12_pyosmium/build/osmium/py.typed -> /build/pyosmium-4.0.0/debian/python3-pyosmium/usr/lib/python3.12/dist-packages/osmium

@lonvia
Copy link
Member Author

lonvia commented Sep 27, 2024

That is odd. I'm using Debian 12 with backports:

me@machine:~$ dpkg -l python3-pyosmium
Desired=Unknown/Install/Remove/Purge/Hold
| Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend
|/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)
||/ Name             Version         Architecture Description
+++-================-===============-============-====================================
ii  python3-pyosmium 4.0.0-1~bpo12+1 amd64        Osmium library bindings for Python 3
me@machine:~$ apt-file show python3-pyosmium | grep py.typed
python3-pyosmium: /usr/lib/python3/dist-packages/osmium/py.typed

So far so good, but when I list the files:

me@machine:~$ dpkg -L python3-pyosmium
/.
/usr
/usr/lib
/usr/lib/python3
/usr/lib/python3/dist-packages
/usr/lib/python3/dist-packages/osmium
/usr/lib/python3/dist-packages/osmium/__init__.py
/usr/lib/python3/dist-packages/osmium/_osmium.cpython-311-x86_64-linux-gnu.so
/usr/lib/python3/dist-packages/osmium/_osmium.pyi
/usr/lib/python3/dist-packages/osmium/area.cpython-311-x86_64-linux-gnu.so
/usr/lib/python3/dist-packages/osmium/area.pyi
/usr/lib/python3/dist-packages/osmium/back_reference_writer.py
/usr/lib/python3/dist-packages/osmium/file_processor.py
/usr/lib/python3/dist-packages/osmium/filter.cpython-311-x86_64-linux-gnu.so
/usr/lib/python3/dist-packages/osmium/filter.pyi
/usr/lib/python3/dist-packages/osmium/forward_reference_writer.py
/usr/lib/python3/dist-packages/osmium/geom.cpython-311-x86_64-linux-gnu.so
/usr/lib/python3/dist-packages/osmium/geom.pyi
/usr/lib/python3/dist-packages/osmium/helper.py
/usr/lib/python3/dist-packages/osmium/index.cpython-311-x86_64-linux-gnu.so
/usr/lib/python3/dist-packages/osmium/index.pyi
/usr/lib/python3/dist-packages/osmium/io.cpython-311-x86_64-linux-gnu.so
/usr/lib/python3/dist-packages/osmium/io.pyi
/usr/lib/python3/dist-packages/osmium/osm
/usr/lib/python3/dist-packages/osmium/osm/__init__.py
/usr/lib/python3/dist-packages/osmium/osm/_osm.cpython-311-x86_64-linux-gnu.so
/usr/lib/python3/dist-packages/osmium/osm/_osm.pyi
/usr/lib/python3/dist-packages/osmium/osm/mutable.py
/usr/lib/python3/dist-packages/osmium/osm/types.py
/usr/lib/python3/dist-packages/osmium/replication
/usr/lib/python3/dist-packages/osmium/replication/__init__.py
/usr/lib/python3/dist-packages/osmium/replication/_replication.cpython-311-x86_64-linux-gnu.so
/usr/lib/python3/dist-packages/osmium/replication/_replication.pyi
/usr/lib/python3/dist-packages/osmium/replication/server.py
/usr/lib/python3/dist-packages/osmium/replication/utils.py
/usr/lib/python3/dist-packages/osmium/simple_handler.py
/usr/lib/python3/dist-packages/osmium/version.py
/usr/lib/python3/dist-packages/osmium-4.0.0.egg-info
/usr/lib/python3/dist-packages/osmium-4.0.0.egg-info/PKG-INFO
/usr/lib/python3/dist-packages/osmium-4.0.0.egg-info/dependency_links.txt
/usr/lib/python3/dist-packages/osmium-4.0.0.egg-info/not-zip-safe
/usr/lib/python3/dist-packages/osmium-4.0.0.egg-info/requires.txt
/usr/lib/python3/dist-packages/osmium-4.0.0.egg-info/top_level.txt
/usr/lib/python3-pyosmium
/usr/lib/python3-pyosmium/pyosmium-get-changes
/usr/lib/python3-pyosmium/pyosmium-up-to-date
/usr/share
/usr/share/doc
/usr/share/doc/python3-pyosmium
/usr/share/doc/python3-pyosmium/changelog.Debian.gz
/usr/share/doc/python3-pyosmium/changelog.gz
/usr/share/doc/python3-pyosmium/copyright
/usr/share/doc/python3-pyosmium/examples
/usr/share/doc/python3-pyosmium/examples/amenity_list.py
/usr/share/doc/python3-pyosmium/examples/convert.py
/usr/share/doc/python3-pyosmium/examples/convert_to_geojson.py
/usr/share/doc/python3-pyosmium/examples/create_nodecache.py
/usr/share/doc/python3-pyosmium/examples/filter_coastlines.py
/usr/share/doc/python3-pyosmium/examples/normalize_boolean.py
/usr/share/doc/python3-pyosmium/examples/osm_diff_stats.py
/usr/share/doc/python3-pyosmium/examples/osm_file_stats.py
/usr/share/doc/python3-pyosmium/examples/osm_replication_stats.py
/usr/share/doc/python3-pyosmium/examples/osm_url_stats.py
/usr/share/doc/python3-pyosmium/examples/pub_names.py
/usr/share/doc/python3-pyosmium/examples/road_length.py
/usr/share/doc/python3-pyosmium/examples/use_nodecache.py
/usr/share/lintian
/usr/share/lintian/overrides
/usr/share/lintian/overrides/python3-pyosmium

@sebastic
Copy link
Contributor

The backport doesn't include the file due to the older pybuild in bookworm.

The patch does help for the backport:

copying src/osmium/py.typed -> /build/pyosmium-4.0.0/.pybuild/cpython3_3.11_pyosmium/build/osmium
copying /build/pyosmium-4.0.0/.pybuild/cpython3_3.11_pyosmium/build/osmium/py.typed -> /build/pyosmium-4.0.0/debian/python3-pyosmium/usr/lib/python3.11/dist-packages/osmium

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants