mirror of
https://github.com/github/octodns.git
synced 2024-05-11 05:55:00 +00:00
Merge pull request #801 from bkane-msft/bkane/virtualenv_to_venv
replace virtualenv with venv
This commit is contained in:
@@ -41,7 +41,7 @@ Running through the following commands will install the latest release of OctoDN
|
|||||||
```shell
|
```shell
|
||||||
$ mkdir dns
|
$ mkdir dns
|
||||||
$ cd dns
|
$ cd dns
|
||||||
$ virtualenv env
|
$ python -m venv env
|
||||||
...
|
...
|
||||||
$ source env/bin/activate
|
$ source env/bin/activate
|
||||||
$ pip install octodns <provider-specific-requirements>
|
$ pip install octodns <provider-specific-requirements>
|
||||||
|
|||||||
@@ -15,15 +15,18 @@ if [ ! -d "$VENV_NAME" ]; then
|
|||||||
if [ -z "$VENV_PYTHON" ]; then
|
if [ -z "$VENV_PYTHON" ]; then
|
||||||
VENV_PYTHON=$(command -v python3)
|
VENV_PYTHON=$(command -v python3)
|
||||||
fi
|
fi
|
||||||
virtualenv --python="$VENV_PYTHON" "$VENV_NAME"
|
"$VENV_PYTHON" -m venv "$VENV_NAME"
|
||||||
fi
|
fi
|
||||||
. "$VENV_NAME/bin/activate"
|
. "$VENV_NAME/bin/activate"
|
||||||
|
|
||||||
pip install -U 'pip>=10.0.1'
|
# We're in the venv now, so use the first Python in $PATH. In particular, don't
|
||||||
pip install -r requirements.txt
|
# use $VENV_PYTHON - that's the Python that *created* the venv, not the python
|
||||||
|
# *inside* the venv
|
||||||
|
python -m pip install -U 'pip>=10.0.1'
|
||||||
|
python -m pip install -r requirements.txt
|
||||||
|
|
||||||
if [ "$ENV" != "production" ]; then
|
if [ "$ENV" != "production" ]; then
|
||||||
pip install -r requirements-dev.txt
|
python -m pip install -r requirements-dev.txt
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -L ".git/hooks/pre-commit" ]; then
|
if [ ! -L ".git/hooks/pre-commit" ]; then
|
||||||
|
|||||||
@@ -8,9 +8,7 @@ script/bootstrap
|
|||||||
|
|
||||||
echo "## environment & versions ######################################################"
|
echo "## environment & versions ######################################################"
|
||||||
python --version
|
python --version
|
||||||
pip --version
|
python -m pip --version
|
||||||
VVER=$(virtualenv --version)
|
|
||||||
echo "virtualenv $VVER"
|
|
||||||
|
|
||||||
if [ -z "$VENV_NAME" ]; then
|
if [ -z "$VENV_NAME" ]; then
|
||||||
VENV_NAME="env"
|
VENV_NAME="env"
|
||||||
|
|||||||
Reference in New Issue
Block a user