Skip to content

Sort and lock pip requirement files #714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Jul 8, 2020
Merged

Sort and lock pip requirement files #714

merged 4 commits into from
Jul 8, 2020

Conversation

ShayNehmad
Copy link
Contributor

@ShayNehmad ShayNehmad commented Jul 8, 2020 •
edited
Loading

What is this?

Fixes #627 .

Checklist

  • Have you added an explanation of what your changes do and why you'd like to include them?
  • Have you successfully tested your changes locally?
  • Is the TravisCI build passing?

Proof that it works

Build + UTs
From build:

0.01s0.01s$ source ~/virtualenv/python3.7/bin/activate0.14s0.09s0.00s0.06s
worker_info
Worker information
0.15s0.01s0.00s0.01s
system_info
Build system information
0.01s0.01s0.40s0.21s0.05s0.00s0.04s0.00s0.01s0.01s0.01s0.01s0.01s0.00s0.00s0.02s0.00s0.01s0.29s0.00s0.00s0.00s0.01s0.00s0.09s0.00s0.80s0.00s0.00s6.03s0.00s
resolvconf
git.checkout
2.21s$ git clone --depth=50 https://github.com/guardicore/monkey.git guardicore/monkey
git.submodule
5.91s$ git submodule update --init --recursive
cache.1
Setting up build cache
cache.pip
$ python --version
Python 3.7.1
$ pip --version
pip 20.1.1 from /home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pip (python 3.7)
install.1
0.35s$ pip freeze
atomicwrites==1.3.0
attrs==19.1.0
certifi==2019.3.9
importlib-metadata==0.18
mock==4.0.2
more-itertools==7.0.0
nose==1.3.7
numpy==1.16.4
packaging==19.0
pipenv==2018.11.26
pluggy==0.12.0
py==1.8.0
pyparsing==2.4.0
pytest==5.4.3
six==1.12.0
virtualenv==16.6.0
virtualenv-clone==0.5.3
wcwidth==0.1.7
zipp==0.5.1
install.2
30.93s$ pip install -r monkey/monkey_island/requirements.txt
install.3
1.33s$ pip install flake8 pytest dlint
install.4
1.22s$ pip install coverage
install.5
15.37s$ pip install -r monkey/infection_monkey/requirements.txt
install.6
0.99s$ pip install pipdeptree
install.7
0.60s$ pipdeptree --warn fail
atomicwrites==1.3.0
awscli==1.18.95
  - botocore [required: ==1.17.18, installed: 1.17.18]
    - docutils [required: >=0.10,<0.16, installed: 0.15.2]
    - jmespath [required: >=0.7.1,<1.0.0, installed: 0.10.0]
    - python-dateutil [required: >=2.1,<3.0.0, installed: 2.8.1]
      - six [required: >=1.5, installed: 1.15.0]
    - urllib3 [required: >=1.20,<1.26, installed: 1.25.9]
  - colorama [required: >=0.2.5,<0.4.4, installed: 0.4.3]
  - docutils [required: >=0.10,<0.16, installed: 0.15.2]
  - PyYAML [required: >=3.10,<5.4, installed: 5.3.1]
  - rsa [required: >=3.1.2,<=3.5.0, installed: 3.4.2]
    - pyasn1 [required: >=0.1.3, installed: 0.4.8]
  - s3transfer [required: >=0.3.0,<0.4.0, installed: 0.3.3]
    - botocore [required: >=1.12.36,<2.0a.0, installed: 1.17.18]
      - docutils [required: >=0.10,<0.16, installed: 0.15.2]
      - jmespath [required: >=0.7.1,<1.0.0, installed: 0.10.0]
      - python-dateutil [required: >=2.1,<3.0.0, installed: 2.8.1]
        - six [required: >=1.5, installed: 1.15.0]
      - urllib3 [required: >=1.20,<1.26, installed: 1.25.9]
boto3==1.14.18
  - botocore [required: >=1.17.18,<1.18.0, installed: 1.17.18]
    - docutils [required: >=0.10,<0.16, installed: 0.15.2]
    - jmespath [required: >=0.7.1,<1.0.0, installed: 0.10.0]
    - python-dateutil [required: >=2.1,<3.0.0, installed: 2.8.1]
      - six [required: >=1.5, installed: 1.15.0]
    - urllib3 [required: >=1.20,<1.26, installed: 1.25.9]
  - jmespath [required: >=0.7.1,<1.0.0, installed: 0.10.0]
  - s3transfer [required: >=0.3.0,<0.4.0, installed: 0.3.3]
    - botocore [required: >=1.12.36,<2.0a.0, installed: 1.17.18]
      - docutils [required: >=0.10,<0.16, installed: 0.15.2]
      - jmespath [required: >=0.7.1,<1.0.0, installed: 0.10.0]
      - python-dateutil [required: >=2.1,<3.0.0, installed: 2.8.1]
        - six [required: >=1.5, installed: 1.15.0]
      - urllib3 [required: >=1.20,<1.26, installed: 1.25.9]
coverage==5.2
dlint==0.10.3
  - flake8 [required: >=3.6.0,<4.0.0, installed: 3.8.3]
    - importlib-metadata [required: Any, installed: 0.18]
      - zipp [required: >=0.5, installed: 0.5.1]
    - mccabe [required: >=0.6.0,<0.7.0, installed: 0.6.1]
    - pycodestyle [required: >=2.6.0a1,<2.7.0, installed: 2.6.0]
    - pyflakes [required: >=2.2.0,<2.3.0, installed: 2.2.0]
dpath==2.0.1
ecdsa==0.15
  - six [required: >=1.9.0, installed: 1.15.0]
Flask-JWT==0.3.2
  - Flask [required: >=0.9, installed: 1.1.2]
    - click [required: >=5.1, installed: 7.1.2]
    - itsdangerous [required: >=0.24, installed: 1.1.0]
    - Jinja2 [required: >=2.10.1, installed: 2.11.2]
      - MarkupSafe [required: >=0.23, installed: 1.1.1]
    - Werkzeug [required: >=0.15, installed: 1.0.1]
  - PyJWT [required: >=1.4.0,<1.5.0, installed: 1.4.2]
Flask-PyMongo==2.3.0
  - Flask [required: >=0.11, installed: 1.1.2]
    - click [required: >=5.1, installed: 7.1.2]
    - itsdangerous [required: >=0.24, installed: 1.1.0]
    - Jinja2 [required: >=2.10.1, installed: 2.11.2]
      - MarkupSafe [required: >=0.23, installed: 1.1.1]
    - Werkzeug [required: >=0.15, installed: 1.0.1]
  - PyMongo [required: >=3.3, installed: 3.10.1]
Flask-RESTful==0.3.8
  - aniso8601 [required: >=0.82, installed: 8.0.0]
  - Flask [required: >=0.8, installed: 1.1.2]
    - click [required: >=5.1, installed: 7.1.2]
    - itsdangerous [required: >=0.24, installed: 1.1.0]
    - Jinja2 [required: >=2.10.1, installed: 2.11.2]
      - MarkupSafe [required: >=0.23, installed: 1.1.1]
    - Werkzeug [required: >=0.15, installed: 1.0.1]
  - pytz [required: Any, installed: 2020.1]
  - six [required: >=1.3.0, installed: 1.15.0]
impacket==0.9.21
  - flask [required: >=1.0, installed: 1.1.2]
    - click [required: >=5.1, installed: 7.1.2]
    - itsdangerous [required: >=0.24, installed: 1.1.0]
    - Jinja2 [required: >=2.10.1, installed: 2.11.2]
      - MarkupSafe [required: >=0.23, installed: 1.1.1]
    - Werkzeug [required: >=0.15, installed: 1.0.1]
  - ldap3 [required: >=2.5,!=2.6,!=2.5.2,!=2.5.0, installed: 2.7]
    - pyasn1 [required: >=0.1.8, installed: 0.4.8]
  - ldapdomaindump [required: >=0.9.0, installed: 0.9.3]
    - dnspython [required: Any, installed: 1.16.0]
    - future [required: Any, installed: 0.18.2]
    - ldap3 [required: >=2.5,!=2.6,!=2.5.2,!=2.5.0, installed: 2.7]
      - pyasn1 [required: >=0.1.8, installed: 0.4.8]
  - pyasn1 [required: >=0.2.3, installed: 0.4.8]
  - pycryptodomex [required: Any, installed: 3.9.8]
  - pyOpenSSL [required: >=0.13.1, installed: 19.1.0]
    - cryptography [required: >=2.8, installed: 2.9.2]
      - cffi [required: >=1.8,!=1.11.3, installed: 1.14.0]
        - pycparser [required: Any, installed: 2.20]
      - six [required: >=1.4.1, installed: 1.15.0]
    - six [required: >=1.5.2, installed: 1.15.0]
  - six [required: Any, installed: 1.15.0]
ipaddress==1.0.23
jsonschema==3.2.0
  - attrs [required: >=17.4.0, installed: 19.1.0]
  - importlib-metadata [required: Any, installed: 0.18]
    - zipp [required: >=0.5, installed: 0.5.1]
  - pyrsistent [required: >=0.14.0, installed: 0.16.0]
    - six [required: Any, installed: 1.15.0]
  - setuptools [required: Any, installed: 49.1.0]
  - six [required: >=1.11.0, installed: 1.15.0]
mock==4.0.2
mongoengine==0.20.0
  - pymongo [required: >=3.4,<4.0, installed: 3.10.1]
mongomock==3.19.0
  - sentinels [required: Any, installed: 1.0.0]
  - six [required: Any, installed: 1.15.0]
netifaces==0.10.9
nose==1.3.7
numpy==1.16.4
odict==1.7.0
  - setuptools [required: Any, installed: 49.1.0]
paramiko==2.7.1
  - bcrypt [required: >=3.1.3, installed: 3.1.7]
    - cffi [required: >=1.1, installed: 1.14.0]
      - pycparser [required: Any, installed: 2.20]
    - six [required: >=1.4.1, installed: 1.15.0]
  - cryptography [required: >=2.5, installed: 2.9.2]
    - cffi [required: >=1.8,!=1.11.3, installed: 1.14.0]
      - pycparser [required: Any, installed: 2.20]
    - six [required: >=1.4.1, installed: 1.15.0]
  - pynacl [required: >=1.0.1, installed: 1.4.0]
    - cffi [required: >=1.4.1, installed: 1.14.0]
      - pycparser [required: Any, installed: 2.20]
    - six [required: Any, installed: 1.15.0]
pipdeptree==1.0.0
  - pip [required: >=6.0.0, installed: 20.1.1]
pipenv==2018.11.26
  - certifi [required: Any, installed: 2019.3.9]
  - pip [required: >=9.0.1, installed: 20.1.1]
  - setuptools [required: >=36.2.1, installed: 49.1.0]
  - virtualenv [required: Any, installed: 20.0.26]
    - appdirs [required: >=1.4.3,<2, installed: 1.4.4]
    - distlib [required: >=0.3.1,<1, installed: 0.3.1]
    - filelock [required: >=3.0.0,<4, installed: 3.0.12]
    - importlib-metadata [required: >=0.12,<2, installed: 0.18]
      - zipp [required: >=0.5, installed: 0.5.1]
    - six [required: >=1.9.0,<2, installed: 1.15.0]
  - virtualenv-clone [required: >=0.2.5, installed: 0.5.3]
psutil==5.7.0
pycryptodome==3.9.8
pyftpdlib==1.5.6
PyInstaller==4.0.dev0
  - altgraph [required: Any, installed: 0.17]
  - setuptools [required: Any, installed: 49.1.0]
pymssql==2.1.4
pypykatz==0.3.12
  - aiowinreg [required: >=0.0.3, installed: 0.0.3]
  - minidump [required: >=0.0.12, installed: 0.0.13]
  - minikerberos [required: >=0.2.1, installed: 0.2.3]
    - asn1crypto [required: >=1.3.0, installed: 1.3.0]
    - asysocks [required: >=0.0.2, installed: 0.0.5]
  - msldap [required: >=0.2.13, installed: 0.3.11]
    - asn1crypto [required: Any, installed: 1.3.0]
    - asysocks [required: >=0.0.5, installed: 0.0.5]
    - minikerberos [required: >=0.2.1, installed: 0.2.3]
      - asn1crypto [required: >=1.3.0, installed: 1.3.0]
      - asysocks [required: >=0.0.2, installed: 0.0.5]
    - prompt-toolkit [required: >=3.0.2, installed: 3.0.5]
      - wcwidth [required: Any, installed: 0.1.7]
    - tqdm [required: Any, installed: 4.47.0]
    - winacl [required: >=0.0.2, installed: 0.0.6]
  - winsspi [required: >=0.0.9, installed: 0.0.9]
    - minikerberos [required: >=0.2.0, installed: 0.2.3]
      - asn1crypto [required: >=1.3.0, installed: 1.3.0]
      - asysocks [required: >=0.0.2, installed: 0.0.5]
pytest==5.4.3
  - attrs [required: >=17.4.0, installed: 19.1.0]
  - importlib-metadata [required: >=0.12, installed: 0.18]
    - zipp [required: >=0.5, installed: 0.5.1]
  - more-itertools [required: >=4.0.0, installed: 7.0.0]
  - packaging [required: Any, installed: 19.0]
    - pyparsing [required: >=2.0.2, installed: 2.4.0]
    - six [required: Any, installed: 1.15.0]
  - pluggy [required: >=0.12,<1.0, installed: 0.12.0]
    - importlib-metadata [required: >=0.12, installed: 0.18]
      - zipp [required: >=0.5, installed: 0.5.1]
  - py [required: >=1.5.0, installed: 1.8.0]
  - wcwidth [required: Any, installed: 0.1.7]
ring==0.7.3
  - six [required: >=1.11.0, installed: 1.15.0]
  - wirerope [required: ==0.3.0, installed: 0.3.0]
    - six [required: >=1.11.0, installed: 1.15.0]
stix2==2.0.2
  - pytz [required: Any, installed: 2020.1]
  - requests [required: Any, installed: 2.24.0]
    - certifi [required: >=2017.4.17, installed: 2019.3.9]
    - chardet [required: >=3.0.2,<4, installed: 3.0.4]
    - idna [required: >=2.5,<3, installed: 2.10]
    - urllib3 [required: >=1.21.1,<1.26,!=1.25.1,!=1.25.0, installed: 1.25.9]
  - simplejson [required: Any, installed: 3.17.0]
  - six [required: >=1.13.0, installed: 1.15.0]
  - stix2-patterns [required: Any, installed: 1.3.0]
    - antlr4-python3-runtime [required: ~=4.8.0, installed: 4.8]
    - six [required: Any, installed: 1.15.0]
tornado==6.0.4
wheel==0.34.2
WinSys-3.x==0.5.2

@ShayNehmad ShayNehmad self-assigned this Jul 8, 2020
ShayNehmad added 2 commits July 8, 2020 16:04
@ShayNehmad
Unlock pyinstaller
45035cc 
On systems where you have one venv for agent and server, the pyinstaller version is our own build from the GC repo
@ShayNehmad
Add six minimum requirement to explicitly resolve conflict
d501bf3 
Added pip freeze to travis to ease debugging
@codecov
Copy link

codecov bot commented Jul 8, 2020

Codecov Report

Merging #714 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop     #714   +/-   ##
========================================
  Coverage    59.89%   59.89%           
========================================
  Files          147      147           
  Lines         4787     4787           
========================================
  Hits          2867     2867           
  Misses        1920     1920

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8c44731...638e6d6. Read the comment docs.

@ShayNehmad ShayNehmad merged commit 94540b9 into develop Jul 8, 2020
@ShayNehmad ShayNehmad deleted the 627/pip-lock branch July 8, 2020 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@itaymmguardicore itaymmguardicore itaymmguardicore approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@ShayNehmad ShayNehmad

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Lock all pip dependency verisons
2 participants
@ShayNehmad @itaymmguardicore