Skip to content

BUG: Revert use of console_scripts.#11718

Merged
charris merged 1 commit intonumpy:masterfrom
charris:fix-f2py-hang
Aug 14, 2018
Merged

BUG: Revert use of console_scripts.#11718
charris merged 1 commit intonumpy:masterfrom
charris:fix-f2py-hang

Conversation

@charris
Copy link
Copy Markdown
Member

@charris charris commented Aug 12, 2018

The changes introduced in #10463 caused f2py to hang in somde
circumstances. There is may a better fix than this, but
until it is implemented it is better to undo the change.

Closes #11649.

The changes introduced in numpy#10463 caused f2py to hang in somde
circumstances. There is may a better fix than this, but
until it is implemented it is better to undo the change.

Closes numpy#11649.
'console_scripts': [
'f2py = numpy.f2py.__main__:main',
'conv-template = numpy.distutils.conv_template:main',
'from-template = numpy.distutils.from_template:main',
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think these last two lines can stay? Were conv-template and from-template on the path before?

I suppose the other way of looking at it is that these are awfully generic names to add to the user's path.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

They are only used during builds and, AFAICT, only other functions in numpy/distutils use them, so I don't see the need to include them in a bin directory or windows equivalent. Note that the names are also changed.

The reason there are two such functions is that f2py and numpy have their own separate template definitions. It would be nice if some day we only needed one :)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Which is also probably sufficient reason to remove the main functions that were added in #10463 and just do a complete reversion, but those added functions are also harmless.

@charris
Copy link
Copy Markdown
Member Author

charris commented Aug 14, 2018

Note that we may still want entry point sometime in the future, but a couple of things need to be done when they are added.

  1. Remove the distutils scripts method currently used.
  2. Make sure that multiple version dependent entry_points are defined (f2py2.7, etc.) as currently done.
  3. Point the entry point to the correct file (f2py2e).
  4. Find out where the scripts are installed in windows so the tests can be fixed.

@charris charris merged commit a1b3f26 into numpy:master Aug 14, 2018
@charris charris deleted the fix-f2py-hang branch August 14, 2018 15:30
@charris charris removed the 09 - Backport-Candidate PRs tagged should be backported label Aug 16, 2018
@charris charris removed this from the 1.15.1 release milestone Aug 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

f2py build hangs after running gcc w/1.15.0

2 participants