Merge "Revert "Add support for per-distro wheel mirrors""
This commit is contained in:
commit
d444b82cc8
@ -39,26 +39,20 @@ then
|
|||||||
# For OpenStack projects, use the pypi.openstack.org mirror exclusively
|
# For OpenStack projects, use the pypi.openstack.org mirror exclusively
|
||||||
elif [ "$org" == "openstack" ]
|
elif [ "$org" == "openstack" ]
|
||||||
then
|
then
|
||||||
# wheel mirrors are below a dir level containing distro and release
|
export TOX_INDEX_URL='http://pypi.openstack.org/openstack'
|
||||||
# because the wheel format itself does not distinguish
|
|
||||||
distro=`lsb_release -i -r -s | xargs | tr ' ' '-'`
|
|
||||||
|
|
||||||
export TOX_INDEX_URL="http://pypi.openstack.org/openstack/$distro"
|
|
||||||
cat <<EOF > ~/.pydistutils.cfg
|
cat <<EOF > ~/.pydistutils.cfg
|
||||||
[easy_install]
|
[easy_install]
|
||||||
index_url = http://pypi.openstack.org/openstack
|
index_url = http://pypi.openstack.org/openstack
|
||||||
EOF
|
EOF
|
||||||
cat <<EOF > ~/.pip/pip.conf
|
cat <<EOF > ~/.pip/pip.conf
|
||||||
[global]
|
[global]
|
||||||
index-url = http://pypi.openstack.org/openstack/$distro
|
index-url = http://pypi.openstack.org/openstack
|
||||||
extra-index-url = http://pypi.openstack.org/openstack
|
|
||||||
EOF
|
EOF
|
||||||
else
|
else
|
||||||
cat <<EOF > ~/.pip/pip.conf
|
cat <<EOF > ~/.pip/pip.conf
|
||||||
[global]
|
[global]
|
||||||
timeout = 60
|
timeout = 60
|
||||||
index-url = http://pypi.openstack.org/openstack/$distro
|
index-url = http://pypi.openstack.org/openstack
|
||||||
extra-index-url = http://pypi.openstack.org/openstack
|
|
||||||
extra-index-url = http://pypi.python.org/simple
|
extra-index-url = http://pypi.python.org/simple
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user