Merge pull request #1388 from locustio/bump-geventhttpclient-and-swit…

…ch-back-to-use-original-repo-instead-of-fork Bump geventhttpclient and switch back to use its original repo
locustio · May 25, 2020 · a207489 · a207489
2 parents 23eb5e0 + 0140776
commit a207489
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/locust/main.py b/locust/main.py
@@ -6,7 +6,6 @@
 import socket
 import sys
 import time
-import resource 
 
 import gevent
 
@@ -155,6 +154,7 @@ def main():
         user_classes = list(user_classes.values())
 
     try:
+        import resource 
         if resource.getrlimit(resource.RLIMIT_NOFILE)[0] < 10000:
             # Increasing the limit to 10000 within a running process should work on at least MacOS.
             # It does not work on all OS:es, but we should be no worse off for trying.

diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
         "requests>=2.9.1", 
         "msgpack>=0.6.2", 
         "pyzmq>=16.0.2", 
-        "geventhttpclient-wheels==1.3.1.dev3",
+        "geventhttpclient>=1.4.2",
         "ConfigArgParse>=1.0",
         "psutil>=5.6.7",
         "Flask-BasicAuth>=0.2.0"