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

MAINT: Fix a couple mistakes in .pyf files. #8538

Merged
merged 2 commits into from Mar 10, 2018

Conversation

@WarrenWeckesser
Copy link
Member

commented Mar 9, 2018

No description provided.

@WarrenWeckesser

This comment has been minimized.

Copy link
Member Author

commented Mar 9, 2018

Don't merge this yet. There are a few more fixes for .pyf files that I'll add to this pull request.

@WarrenWeckesser WarrenWeckesser changed the title MAINT: fftpack: Use correct comment character in fftpack.pyf. WIP: MAINT: fftpack: Use correct comment character in fftpack.pyf. Mar 9, 2018

MAINT: fftpack: Use correct comment character in fftpack.pyf.
f2py interface files don't use C-style comments.  This fixes the following
message that occurs in the build log:

    f2py: scipy/fftpack/fftpack.pyf
    Reading fortran codes...
        Reading file 'scipy/fftpack/fftpack.pyf' (format:free)
    Line #86 in scipy/fftpack/fftpack.pyf:"       /* Single precision version */"
        crackline:2: No pattern for line
MAINT: optimize: Add missing 'end interface' statement in nnls.pyf.
This fixes the following message that occurs in the build log:

    f2py: scipy/optimize/nnls/nnls.pyf
    Reading fortran codes...
        Reading file 'scipy/optimize/nnls/nnls.pyf' (format:free)
    crackline: groupcounter=1 groupname={0: '', 1: 'python module', 2: 'interface', 3: 'subroutine'}
    crackline: Mismatch of blocks encountered. Trying to fix it by assuming "end" statement.

@WarrenWeckesser WarrenWeckesser force-pushed the WarrenWeckesser:fix-fftpack-pyf-comment branch from d817ba4 to d01a85e Mar 9, 2018

@WarrenWeckesser

This comment has been minimized.

Copy link
Member Author

commented Mar 9, 2018

OK, there were not as many additional changes as I thought, so this is ready. Of course, the travis-ci test using numpy master will fail for unrelated reasons.

There is one other f2py/crackline issue, but that one requires some more investigation. I'll open up a separate issue for it.

@WarrenWeckesser WarrenWeckesser changed the title WIP: MAINT: fftpack: Use correct comment character in fftpack.pyf. MAINT: Fix a couple mistakes in .pyf files. Mar 9, 2018

@WarrenWeckesser

This comment has been minimized.

Copy link
Member Author

commented Mar 9, 2018

@larsoner FYI: I snuck in another commit after you approved the PR.

@charris

This comment has been minimized.

Copy link
Member

commented Mar 9, 2018

@WarrenWeckesser Do these fixes need a backport?

@WarrenWeckesser

This comment has been minimized.

Copy link
Member Author

commented Mar 9, 2018

@charris No backport needed, I think. f2py ignores the C-style comment (I guess it would ignore any line it doesn't understand), and in the case of the missing end interface, it treats the end as implied.

@ilayn ilayn merged commit c10dc21 into scipy:master Mar 10, 2018

4 checks passed

ci/circleci: build Your tests passed on CircleCI!
Details
codecov/project 75.93% (target 1%)
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@ilayn

This comment has been minimized.

Copy link
Member

commented Mar 10, 2018

LGTM. Clicked the button.

@ilayn ilayn added this to the 1.1.0 milestone Mar 10, 2018

adbugger added a commit to adbugger/scipy that referenced this pull request Mar 11, 2018
MAINT: Fix a couple mistakes in .pyf files. (scipy#8538)
* MAINT: fftpack: Use correct comment character in fftpack.pyf.

f2py interface files don't use C-style comments.  This fixes the following
message that occurs in the build log:

    f2py: scipy/fftpack/fftpack.pyf
    Reading fortran codes...
        Reading file 'scipy/fftpack/fftpack.pyf' (format:free)
    Line scipy#86 in scipy/fftpack/fftpack.pyf:"       /* Single precision version */"
        crackline:2: No pattern for line

* MAINT: optimize: Add missing 'end interface' statement in nnls.pyf.

This fixes the following message that occurs in the build log:

    f2py: scipy/optimize/nnls/nnls.pyf
    Reading fortran codes...
        Reading file 'scipy/optimize/nnls/nnls.pyf' (format:free)
    crackline: groupcounter=1 groupname={0: '', 1: 'python module', 2: 'interface', 3: 'subroutine'}
    crackline: Mismatch of blocks encountered. Trying to fix it by assuming "end" statement.

@WarrenWeckesser WarrenWeckesser deleted the WarrenWeckesser:fix-fftpack-pyf-comment branch Mar 27, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.