pin fs, fix doc tests

Fix scapy Scapy has a pip requirements bug in 2.4.2, which is currently installed by default. We're pinning it to 2.4.3rc1 until the default version in PIP has the fix included. increase timeout for tests
xandfury · Jul 31, 2019 · 8c76abc · 8c76abc
1 parent ea6a01a
commit 8c76abc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -47,10 +47,9 @@ docs/build
 .DS_Store
 
 docs/source/conpot_version.py
-.log
+*.log
 
 log/
-conpot.log
 .cache/
 .tox
 .pytest_cache/

diff --git a/requirements.txt b/requirements.txt
@@ -13,7 +13,7 @@ libtaxii>=1.1.0
 xlrd
 crc16
 natsort
-scapy
+scapy==2.4.3rc1
 enum34
 hpfeeds3
 modbus-tk
@@ -27,10 +27,11 @@ mixbox
 modbus-tk
 cpppo
 pytest
-fs
+fs==2.3.0
 python-slugify
 tftpy
 freezegun
 pytest
 tox
-pycrypto
+pycrypto
+sphinx_rtd_theme
diff --git a/tox.ini b/tox.ini
@@ -16,7 +16,7 @@ deps =
 commands =
     pip --default-timeout=1000 install -r requirements.txt
     # {posargs:coverage run --timid --source={envpython} -m pytest -v --timeout=30}
-    {envpython} -m pytest -rsx -v --timeout=30 --cov=conpot {posargs}
+    {envpython} -m pytest -rsx -v --timeout=60 --cov=conpot {posargs}
 
 [testenv:run]
 envdir = {toxinidir}/.tox/py36