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.

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

Jump to bottom

need __version__.py if user needs to compile for their architecture or python version. #556

Closed
wants to merge 6 commits into from
Closed

need __version__.py if user needs to compile for their architecture or python version. #556

wants to merge 6 commits into from

Conversation

jamiecook
Copy link
Contributor

No description provided.

@pedrocamargo
Copy link
Contributor

The paths for some of the pyx files changed (to ./cython), and that has to change in the setup.py as well. Something that @r-akemii can take a look at?

pedrocamargo
pedrocamargo reviewed Aug 7, 2024
View reviewed changes
setup.py Outdated
@@ -100,7 +100,7 @@
"aequilibrae.reference_files": ["spatialite.sqlite", "nauru.zip", "sioux_falls.zip", "coquimbo.zip"],
"aequilibrae.paths": ["parameters.pxi", "*.pyx"],
Copy link
Contributor

@pedrocamargo pedrocamargo Aug 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"aequilibrae.paths.cython": [".pix", ".pyx" "*.pxd"],

pedrocamargo
pedrocamargo reviewed Aug 8, 2024
View reviewed changes
aequilibrae/__init__.py Outdated
@@ -11,7 +11,7 @@
from aequilibrae import project

try:
from aequilibrae.paths.AoN import path_computation
from aequilibrae.paths.cython.AoN import path_computation
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrong. The extension is NOT built inside the cython folder

pedrocamargo
pedrocamargo reviewed Aug 8, 2024
View reviewed changes
aequilibrae/paths/__init__.py Outdated
@@ -9,14 +9,14 @@
from aequilibrae.paths.vdf import VDF
from aequilibrae.paths.graph import Graph, TransitGraph
from aequilibrae.paths.optimal_strategies import OptimalStrategies
from aequilibrae.paths.public_transport import HyperpathGenerating
from aequilibrae.paths.cython.public_transport import HyperpathGenerating
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again

@pedrocamargo
Copy link
Contributor

@Jake-Moss , can you cleanup this mess we made? :-D

@Jake-Moss
Copy link
Contributor

Looks like I removed __version__.py from the package here 230d51e because of the request here conda-forge/staged-recipes#22437 (review) . It was being packaged at the top level of wheel, which when unpacked would be outside of the aequilibrae package. The same was happening with our test dir but that should have been fixed via the FlatLayoutPackageFinder.

I'm not sure what's breaking because setup.py is not packaged in the wheel, which is the only use of __version__.py I can find.

@Jake-Moss
Remove .pxd files to where the module will end up (above cython/)
7b93a4e 
Remove paramaters.pxi, it was largely unused.  Remove .pyx source from wheels (they weren't being included anyway, not
sure why), it's not useful without our setup.py anyway. .pxd files are useful to others though.  Remove __version__.py,
not necessary
@pedrocamargo pedrocamargo deleted the jamiecook/version branch August 12, 2024 20:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pedrocamargo pedrocamargo pedrocamargo left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jamiecook @pedrocamargo @Jake-Moss @r-akemii