8000 Backport 7131 by charris · Pull Request #7132 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

Backport 7131 #7132

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 2 commits into from
Jan 28, 2016
Merged

Backport 7131 #7132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f5efd1
BLD/BUG: revert usage of setuptools when building an sdist.
Jan 27, 2016
dae1a38
MAINT: warn in egg_info command if using setuptools.sdist.
Jan 27, 2016
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
8 changes: 8 additions & 0 deletions numpy/distutils/command/egg_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
from __future__ import division, absolute_import, print_function

import sys

from setuptools.command.egg_info import egg_info as _egg_info

class egg_info(_egg_info):
def run(self):
if 'sdist' in sys.argv:
import warnings
warnings.warn("`build_src` is being run, this may lead to missing "
"files in your sdist! See numpy issue gh-7127 for "
"details", UserWarning)

# We need to ensure that build_src has been executed in order to give
# setuptools' egg_info command real filenames instead of functions which
# generate files.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
5CBC
Original file line numberDiff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def check_submodules():
raise ValueError('Submodule not clean: %s' % line)


from setuptools.command.sdist import sdist
from distutils.command.sdist import sdist
class sdist_checked(sdist):
""" check submodules on sdist to prevent incomplete tarballs """
def run(self):
Expand Down
0