Skip to content

Commit f3d2162

Browse files
author
Luke Bakken
committed
remove virtualenv from pyenv setup
1 parent d4a2476 commit f3d2162

File tree

2 files changed

+3
-16
lines changed

2 files changed

+3
-16
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ endif
6666
@$(PROJDIR)/build/publish $(VERSION)
6767

6868
.PHONY: release
69-
release: release_sdist
69+
release: # release_sdist
7070
ifeq ($(RELEASE_GPG_KEYNAME),)
7171
$(error RELEASE_GPG_KEYNAME must be set to build a release and deploy this package)
7272
endif
7373
@echo "==> pypi repository: $(PYPI_REPOSITORY)"
7474
@echo "==> Python 2.7 (bdist_egg)"
75-
@python2.7 setup.py build --build-base=py-build/2.7 bdist_egg upload --repository $(PYPI_REPOSITORY) --show-response --sign --identity $(RELEASE_GPG_KEYNAME)
75+
# @python2.7 setup.py build --build-base=py-build/2.7 bdist_egg upload --repository $(PYPI_REPOSITORY) --show-response --sign --identity $(RELEASE_GPG_KEYNAME)
7676
@echo "==> Python 3.3 (bdist_egg)"
7777
@python3.3 setup.py build --build-base=py-build/3.3 bdist_egg upload --repository $(PYPI_REPOSITORY) --show-response --sign --identity $(RELEASE_GPG_KEYNAME)
7878
@echo "==> Python 3.4 (bdist_egg)"

build/pyenv-setup

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,6 @@ fi
2626

2727
(cd $PYENV_ROOT && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
2828

29-
declare -r pyenv_virtualenv_dir="$PYENV_ROOT/plugins/pyenv-virtualenv"
30-
if [[ ! -d $pyenv_virtualenv_dir ]]
31-
then
32-
git clone 'https://github.com/yyuu/pyenv-virtualenv.git' $pyenv_virtualenv_dir
33-
else
34-
(cd $pyenv_virtualenv_dir && git fetch --all)
35-
fi
36-
37-
(cd $pyenv_virtualenv_dir && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
38-
3929
declare -r pyenv_alias_dir="$PYENV_ROOT/plugins/pyenv-alias"
4030
if [[ ! -d $pyenv_alias_dir ]]
4131
then
@@ -56,7 +46,6 @@ if [[ $(type -t pyenv) != 'function' ]]
5646
then
5747
echo "[INFO] init pyenv"
5848
eval "$(pyenv init -)"
59-
eval "$(pyenv virtualenv-init -)"
6049
fi
6150

6251
do_pip_upgrades='false'
@@ -76,7 +65,6 @@ do
7665

7766
echo "[INFO] installing Python $pyver_latest"
7867
VERSION_ALIAS="$riak_py_alias" pyenv install "$pyver_latest"
79-
pyenv virtualenv "$riak_py_alias" "riak-py$pymaj$pymin"
8068
fi
8169
done
8270

@@ -87,11 +75,10 @@ then
8775

8876
echo "[INFO] installing Python 2.7.8"
8977
VERSION_ALIAS='riak_2.7.8' pyenv install '2.7.8'
90-
pyenv virtualenv 'riak_2.7.8' 'riak-py278'
9178
fi
9279

9380
pushd $PROJDIR
94-
pyenv local riak-py35 riak-py34 riak-py33 riak-py27 riak-py278
81+
pyenv local 'riak_3.5' 'riak_3.4' 'riak_3.3' 'riak_2.7' 'riak_2.7.8'
9582

9683
pyenv rehash
9784

0 commit comments

Comments
 (0)