Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
build/pkgs/setuptools, build/pkgs/pip: Remove python2 support from de…
Browse files Browse the repository at this point in the history
…pendencies, install scripts
  • Loading branch information
Matthias Koeppe committed Jun 5, 2020
1 parent 70378ed commit 10a2bac
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
7 changes: 1 addition & 6 deletions build/pkgs/pip/spkg-install.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@ export PYTHONPATH="$(pwd)/src"
# need to use --upgrade or --ignore-installed; Otherwise pip, which is
# importing itself, will think itself is already installed
#
if [ "$SAGE_PYTHON3" = "yes" ]; then
versions="3"
else
# Install pip3 first so pip2 overwrites local/bin/pip
versions="3 2"
fi
versions=3

for vers in $versions; do
python${vers} -m pip install --verbose --no-index --ignore-installed \
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/setuptools/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$(PYTHON) python3
$(PYTHON)

----------
All lines of this file are ignored except the first.
Expand Down
6 changes: 1 addition & 5 deletions build/pkgs/setuptools/spkg-install.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ export PYTHON_EGG_CACHE="$DOT_SAGE/.python-eggs"

cd src

if [ "$SAGE_PYTHON3" = "yes" ]; then
versions="3"
else
versions="2 3"
fi
versions=3

# Prevent setuptools from installing itself with easy_install
for vers in $versions; do
Expand Down

0 comments on commit 10a2bac

Please sign in to comment.