8000 BUG: Handle .pyf.src and fix SciPy [urgent] by HaoZeke · Pull Request #25287 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG: Handle .pyf.src and fix SciPy [urgent] #25287

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
merged 8 commits into from
Dec 1, 2023
Merged

BUG: Handle .pyf.src and fix SciPy [urgent] #25287

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9240eba
BUG: Handle .pyf.src again
HaoZeke Nov 30, 2023
6aceaa9
MAINT: Migrate pyf.src from distutils [skip-ci]
HaoZeke Dec 1, 2023
3d2ec8f
Revert "BUG: Handle .pyf.src again"
HaoZeke Dec 1, 2023
3bf06f0
BUG: Ensure defines are on newlines [f2py]
HaoZeke Dec 1, 2023
8d47e18
BUG: Don't lower .pyf files
HaoZeke Dec 1, 2023
cf70d72
TST: Add a test mimicing some flapack checks
HaoZeke Dec 1, 2023
7e7e457
BUG: Don't autogenerate untitled modules [f2py]
HaoZeke Dec 1, 2023
722b09c
MAINT: Overwrite compiled extensions with meson
HaoZeke Dec 1, 2023
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
Next Next commit
BUG: Handle .pyf.src again 
Closes gh-25286
  • Loading branch information
@HaoZeke
HaoZeke committed Nov 30, 2023
commit 9240ebacb7fab1cbafbe94c2d60d26d0cde46bca
21 changes: 10 additions & 11 deletions numpy/f2py/f2py2e.py
A0C9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,17 +455,16 @@ def run_main(comline_list):
pyf_files, _ = filter_files("", "[.]pyf([.]src|)", comline_list)
# Checks that no existing modulename is defined in a pyf file
# TODO: Remove all this when scaninputline is replaced
modname = "untitled" # Default
if args.module_name:
if "-h" in comline_list:
modname = (
args.module_name
) # Directly use from args when -h is present
else:
modname = validate_modulename(
pyf_files, args.module_name
) # Validate modname when -h is not present
comline_list += ['-m', modname] # needed for the rest of scaninputline
modname = None
if "-h" not in comline_list:
modname = validate_modulename(pyf_files, args.module_name)
# If -h is present or no valid modname found, use the module name from args
if modname is None and args.module_name:
modname = args.module_name
# If no module name is specified in args or found in pyf_files, use default
if modname is None:
modname = "untitled"
comline_list += ["-m", modname] # needed for the rest of scaninputline
# gh-22819 -- end
files, options = scaninputline(comline_list)
auxfuncs.options = options
Expand Down
0