Skip to content

fixed dfindexer wheel build #1034

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.

Sign up for GitHub

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

Merged
tridge merged 1 commit into from
May 21, 2025
Merged

fixed dfindexer wheel build #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ include/mavlink/v1.0
/.vscode
.idea/
.venv/
dfindexer/dfindexer_cy.c
dfindexer/*.so
dfindexer/*.pyd
pymavlink/dfindexer/dfindexer_cy.c
pymavlink/dfindexer/*.so
pymavlink/dfindexer/*.pyd
4 changes: 2 additions & 2 deletions DFReader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@

try:
from . import mavutil
from . import dfindexer
except ImportError:
# allows running uninstalled
from pymavlink import mavutil
from pymavlink import dfindexer

from pymavlink import dfindexer

try:
long # Python 2 has long
Expand Down
0 dfindexer/__init__.py → pymavlink/dfindexer/__init__.py
View file
Open in desktop
File renamed without changes.
0 dfindexer/dfindexer.c → pymavlink/dfindexer/dfindexer.c
View file
Open in desktop
File renamed without changes.
0 dfindexer/dfindexer.h → pymavlink/dfindexer/dfindexer.h
View file
Open in desktop
File renamed without changes.
0 dfindexer/dfindexer_cy.pyx → pymavlink/dfindexer/dfindexer_cy.pyx
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ def run(self):
Extension(
name="pymavlink.dfindexer.dfindexer_cy",
sources=[
"dfindexer/dfindexer_cy.pyx",
"dfindexer/dfindexer.c"
"pymavlink/dfindexer/dfindexer_cy.pyx",
"pymavlink/dfindexer/dfindexer.c"
],
include_dirs=["pymavlink/dfindexer"],
extra_compile_args=extra_compile_args,
Expand Down Expand Up @@ -170,7 +170,7 @@ def run(self):
'pymavlink.dialects',
'pymavlink.dialects.v10',
'pymavlink.dialects.v20',
'pymavlink.dfindexer',
'pymavlink.pymavlink.dfindexer',
],
scripts = [ 'tools/magfit_delta.py', 'tools/mavextract.py',
'tools/mavgraph.py', 'tools/mavparmdiff.py',
Expand Down