Merge pull request #117 from gregoil/feature/remove_ulimit_handling_i…

…n_windows removed usage of ut_settings and the library for handling file-descri…
gregoil · Dec 6, 2018 · 2fbe63c · 2fbe63c
2 parents 5e1815b + 36e5800
commit 2fbe63c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 27 deletions.
diff --git a/src/rotest/common/django_utils/ut_settings.py b/src/rotest/common/django_utils/ut_settings.py
diff --git a/tox.ini b/tox.ini
@@ -1,23 +1,18 @@
 [tox]
 envlist =
-    {py27,py35,py36}-{linux,win32}
+    {py27,py35,py36}
     docs
 
 [testenv]
 usedevelop = True
-passenv=ROTEST_WORK_DIR
+passenv = ROTEST_WORK_DIR
 basepython =
     py27: python2.7
     py35: python3.5
     py36: python3.6
 
-platform =
-    win32: win32
-    linux: linux
-
 deps =
     -r{toxinidir}/requirements.txt
-    win32: pypiwin32==219
 
 commands =
     flake8 setup.py src/rotest/ tests/
@@ -52,11 +47,11 @@ commands =
 [flake8]
 ignore = E126,E127,E128,E129
 exclude =
-    migrations,__init__.py,settings.py,ut_settings.py
+    migrations,__init__.py,settings.py
 
 [pytest]
 addopts = --reuse-db --disable-pytest-warnings --cov-report=html --cov=rotest
-DJANGO_SETTINGS_MODULE = rotest.common.django_utils.ut_settings
+DJANGO_SETTINGS_MODULE = rotest.common.django_utils.settings
 python_files = test_*.py
 filterwarnings =
     ignore::RuntimeWarning