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

Fix #15 - installing from pip and easy_install (Take 2) #21

Merged
merged 5 commits into from
Mar 28, 2016
Merged

Fix #15 - installing from pip and easy_install (Take 2) #21

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3277500
Revert "setup.py: fix for Python 2.6"
ccpost Mar 27, 2016
d088bc8
Revert "Merge pull request #20 from ccpost/fix/pip-install"
ccpost Mar 27, 2016
55680b2
Fix #15 - installing from `pip` and `easy_install` (Take 2)
ccpost Mar 27, 2016
e09bc6f
Add `test_install` to phony targets
ccpost Mar 27, 2016
0f59ade
Remove `test_install` Makefile target
ccpost Mar 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
Next Next commit
Revert "setup.py: fix for Python 2.6" 
This reverts commit fd90704.
  • Loading branch information
@ccpost
ccpost committed Mar 27, 2016
commit 3277500d0745034810f4ddc0f81e09d7a4998597
7 changes: 1 addition & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,7 @@ def run(self):
if self.old_and_unmanageable or self.single_version_externally_managed:
return install_orig.install.run(self)

try:
have_called_from_setup = self._called_from_setup is not None
except AttributeError:
have_called_from_setup = False

if not have_called_from_setup or not self._called_from_setup(inspect.currentframe()):
if not self._called_from_setup(inspect.currentframe()):
# Run in backward-compatibility mode to support bdist_* commands.
install_orig.install.run(self)
else:
Expand Down