Unverified Commit ac74bfa7 authored by John Chilton's avatar John Chilton Committed by GitHub
Browse files

Merge pull request #10704 from mvdbeek/cryptography_backport 

[20.01] Bump cryptography dependency to 3.2.1
parents 1e393a05 f730e8b0

lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ cmd2==0.8.9 
coloredlogs==10.0

configparser==4.0.2 ; python_version < '3.2'

contextlib2==0.6.0.post1 ; python_version < '3.5'

cryptography==2.8

cryptography==3.2.1

cwltool==1.0.20191225192155

debtcollector==1.22.0

decorator==4.4.1

lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ _galaxy_setup_environment() { 
$integrity_injection

$slots_statement

export GALAXY_SLOTS

export PYTHONWARNINGS="ignore"

GALAXY_VIRTUAL_ENV="$galaxy_virtual_env"

_GALAXY_VIRTUAL_ENV="$galaxy_virtual_env"

PRESERVE_GALAXY_ENVIRONMENT="$preserve_python_environment"