Skip to content
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

Bump geventhttpclient and switch back to use its original repo + fix windows issue with resource module #1388

Merged
merged 3 commits into from
May 25, 2020
Merged

Bump geventhttpclient and switch back to use its original repo + fix windows issue with resource module #1388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dd02be
Bump geventhttpclient and switch back to use its original repo instea…
cyberw May 22, 2020
19ec1cd
Bump geventhttpclient to a version that has pre-built wheels
cyberw May 24, 2020
0140776
Resource is a *nix only package, so import it in a try. Noticed this …
cyberw May 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion locust/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import socket
import sys
import time
import resource

import gevent

Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down