p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactored for island to have only one requirements file.

This commit is contained in:
VakarisZ 2019-02-04 10:35:39 +02:00
parent cf3bf89df5
commit ed921fceed
4 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment_scripts/deploy_linux.sh
View File

@ -69,7 +69,7 @@ log_message "Installing pip"
sudo apt-get install python-pip sudo apt-get install python-pip
log_message "Installing island requirements" log_message "Installing island requirements"
requirements="$ISLAND_PATH/requirements_linux.txt" requirements="$ISLAND_PATH/requirements.txt"
python -m pip install --user -r ${requirements} || handle_error python -m pip install --user -r ${requirements} || handle_error
# Download binaries # Download binaries

2
deployment_scripts/deploy_windows.ps1
View File

@ -76,7 +76,7 @@ function Deploy-Windows([String] $monkey_home = (Get-Item -Path ".\").FullName,
Remove-Item $TEMP_VC_FOR_PYTHON27_INSTALLER Remove-Item $TEMP_VC_FOR_PYTHON27_INSTALLER
# Install requirements for island # Install requirements for island
$islandRequirements = Join-Path -Path $monkey_home -ChildPath $MONKEY_ISLAND_DIR | Join-Path -ChildPath "\requirements_windows.txt" -ErrorAction Stop $islandRequirements = Join-Path -Path $monkey_home -ChildPath $MONKEY_ISLAND_DIR | Join-Path -ChildPath "\requirements.txt" -ErrorAction Stop
"Upgrading pip..." "Upgrading pip..."
$output = cmd.exe /c 'python -m pip install --user --upgrade pip 2>&1' $output = cmd.exe /c 'python -m pip install --user --upgrade pip 2>&1'
$output $output

0
monkey/monkey_island/requirements_linux.txt → monkey/monkey_island/requirements.txt
View File

16
monkey/monkey_island/requirements_windows.txt
View File

@ -1,16 +0,0 @@
python-dateutil
tornado
werkzeug
jinja2
markupsafe
itsdangerous
click
flask
Flask-Pymongo
Flask-Restful
Flask-JWT
jsonschema
netifaces
ipaddress
enum34
PyCrypto