Unverified Commit 35dda33f authored by Nicola Soranzo's avatar Nicola Soranzo Committed by GitHub
Browse files

Merge pull request #13028 from nsoranzo/release_21.05_min_pip_version

parents 6c97e488 262ab838

scripts/common_startup.sh

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ if [ $SET_VENV -eq 1 ] && [ $CREATE_VENV -eq 1 ]; then 
                    echo "Creating Conda environment for Galaxy: $GALAXY_CONDA_ENV"

                    echo "To avoid this, use the --no-create-venv flag or set \$GALAXY_CONDA_ENV to an"

                    echo "existing environment before starting Galaxy."

                    $CONDA_EXE create --yes --override-channels --channel conda-forge --channel defaults --name "$GALAXY_CONDA_ENV" 'python=3.6' 'pip>=9' 'virtualenv>=16'

                    $CONDA_EXE create --yes --override-channels --channel conda-forge --channel defaults --name "$GALAXY_CONDA_ENV" 'python=3.6' 'pip>=19.0' 'virtualenv>=16'

                    unset __CONDA_INFO

                fi

                conda_activate
@@ -181,7 +181,7 @@ fi 
: ${PYPI_INDEX_URL:="https://pypi.python.org/simple"}

: ${GALAXY_DEV_REQUIREMENTS:="./lib/galaxy/dependencies/dev-requirements.txt"}

if [ $REPLACE_PIP -eq 1 ]; then

    python -m pip install 'pip>=8.1'

    python -m pip install 'pip>=19.0'

fi



requirement_args="-r requirements.txt"

scripts/common_startup_functions.sh

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ setup_python() { 
        set_conda_exe

        if [ -n "$CONDA_EXE" ] && \

                check_conda_env ${GALAXY_CONDA_ENV:="_galaxy_"}; then

            # You almost surely have pip >= 8.1 and running `conda install ... pip>=8.1` every time is slow

            # You almost surely have the required minimum pip version and running `conda install ... pip>=<min_ver>` every time is slow

            REPLACE_PIP=0

            [ -n "$PYTHONPATH" ] && { echo 'Unsetting $PYTHONPATH'; unset PYTHONPATH; }

            if [ "$CONDA_DEFAULT_ENV" != "$GALAXY_CONDA_ENV" ]; then