Skip to content

Commit

Permalink
Merge branch 'main' into remove-debug-output
Browse files Browse the repository at this point in the history
  • Loading branch information
Edoardo Pirovano authored and GitHub committed Jan 2, 2022
2 parents cca1cfd + 79ea6d6 commit ea1acc5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions python-setup/install_tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ py -3 -m pip install --user --upgrade pip setuptools wheel

# virtualenv is a bit nicer for setting up virtual environment, since it will provide up-to-date versions of
# pip/setuptools/wheel which basic `python3 -m venv venv` won't
py -2 -m pip install --user virtualenv
py -3 -m pip install --user virtualenv
py -2 -m pip install --user 'virtualenv<20.11'
py -3 -m pip install --user 'virtualenv<20.11'

# poetry 1.0.10 has error (https://github.com/python-poetry/poetry/issues/2711)
py -3 -m pip install --user poetry!=1.0.10
py -3 -m pip install --user pipenv
py -3 -m pip install --user pipenv
4 changes: 2 additions & 2 deletions python-setup/install_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ python3 -m pip install --user --upgrade pip setuptools wheel

# virtualenv is a bit nicer for setting up virtual environment, since it will provide up-to-date versions of
# pip/setuptools/wheel which basic `python3 -m venv venv` won't
python3 -m pip install --user virtualenv
python3 -m pip install --user 'virtualenv<20.11'

# We install poetry with pip instead of the recommended way, since the recommended way
# caused some problem since `poetry run` gives output like:
Expand All @@ -35,5 +35,5 @@ if command -v python2 &> /dev/null; then

python2 -m pip install --user --upgrade pip setuptools wheel

python2 -m pip install --user virtualenv
python2 -m pip install --user 'virtualenv<20.11'
fi

0 comments on commit ea1acc5

Please sign in to comment.