Merge pull request #714 from guardicore/627/pip-lock

Sort and lock pip requirement files

.gitignore

@@ -93,3 +93,6 @@ profiler_logs/
 
 # Server config might contain credentials. Don't commit by default.
 /monkey/monkey_island/cc/server_config.json
+
+# Virtualenv
+venv/

.travis.yml

@@ -18,10 +18,14 @@ os: linux
 
 install:
 # Python
+- pip freeze
 - pip install -r monkey/monkey_island/requirements.txt  # for unit tests
 - pip install flake8 pytest dlint  # for next stages
 - pip install coverage  # for code coverage
 - pip install -r monkey/infection_monkey/requirements.txt  # for unit tests
+- pip install pipdeptree
+# Fail builds on possible conflicting dependencies.
+- pipdeptree --warn fail
 
 # node + npm + eslint
 - node --version

monkey/infection_monkey/requirements.txt

@@ -1,20 +1,20 @@
-impacket
-pycryptodome
-cffi
-requests
-odict
-paramiko
-psutil
+WinSys-3.x>=0.5.2
+cffi>=1.14
+ecdsa==0.15
 git+https://github.com/guardicore/pyinstaller
-ecdsa
-netifaces
-ipaddress
+impacket>=0.9
+ipaddress>=1.0.23
+netifaces>=0.10.9
+odict==1.7.0
+paramiko>=2.7.1
+psutil>=5.7.0
+pycryptodome==3.9.8
+pyftpdlib==1.5.6
+pymssql<3.0
+pypykatz==0.3.12
+requests>=2.24
 # Locking WMI since version 1.5 introduced breaking change on Linux agent compilation.
 # See breaking change here: https://github.com/tjguk/wmi/commit/dcf8e3eca79bb8c0101ffb83e25c066b0ba9e16d
 # Causes pip to error with:
 # Could not find a version that satisfies the requirement pywin32 (from wmi->-r /src/infection_monkey/requirements.txt (line 12)) (from versions: none)
 wmi==1.4.9 ; sys_platform == 'win32'
-pymssql<3.0
-pyftpdlib
-WinSys-3.x
-pypykatz

monkey/monkey_island/requirements.txt

@@ -1,26 +1,27 @@
-pytest
-python-dateutil
-tornado
-werkzeug
-flask
-Flask-Pymongo
-Flask-Restful
-Flask-JWT
-jsonschema
-netifaces
-ipaddress
-pycryptodome
-boto3
-botocore
-PyInstaller
-awscli
-cffi
-virtualenv
-wheel
-mongoengine
-mongomock
-requests
-dpath
-ring
-stix2
-tqdm
+Flask-JWT>=0.3.2
+Flask-Pymongo>=2.3.0
+Flask-Restful>=0.3.8
+PyInstaller==3.6
+awscli>=1.18
+boto3>=1.14
+botocore>=1.17.18,<1.18.0
+cffi>=1.8,!=1.11.3
+dpath>=2.0
+flask>=1.1
+ipaddress>=1.0.23
+jsonschema==3.2.0
+mongoengine>=0.20
+mongomock>=3.19
+netifaces>=0.10.9
+pycryptodome==3.9.8
+pytest>=5.4
+python-dateutil>=2.1,<3.0.0
+requests>=2.24
+ring>=0.7.3
+stix2>=2.0.2
+six>=1.13.0
+tornado>=6.0.4
+tqdm>=4.47
+virtualenv>=20.0.26
+werkzeug>=1.0.1
+wheel>=0.34.2