Merge develop to master #89
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* find locustfile in the root directory * Add ability to write out csv file data as part of command line run * Update minimum version of gevent to fix locustio#598 * CSV flag, review comments * Modify gevent wsgi and libev dependencies * Sort all python imports * Sort setup.py imports * Standardize utf8 file coding declarations * Bump version to 0.8a3 for another pre-release candidate * Changed from deprecated method name * Added test_suite argument to setup.py’s setup() method call Not specifying the test_suite argument (using the default one) resulted in all tests being run multiple times (on Python 3.5). I haven’t looked in to why, since specifying “locust.test” should be correct, and fixes it. * Suppress a warning that appears when running the tests on Python 3, that can cause tests (that depends on output to stderr) to fail. * Apply gevent monkey patching before we import requests, to avoid infinite recursion error when doing SSL requests. Should fix locustio#655. * Also patch threading when applying gevent monkey patch. Should fix locustio#569. * Bumped version to 0.8a4 * Improved changelog * Update main.py Code comment and slightly more descriptive variable name * More info about 0.8 to the Changelog * Added some random examples that maybe could be useful to someone * Bumped version to 0.8 * Upgrade pyzmq to latest stable version, and changed so that we do not pin the version (will make it easier to install Locust on Windows) * Better installation instructions for Windows * Bumped version to 0.8.1
* add get team configuration * change read json path
* enabling json uploading * fix modal ui in upload json * enabling upload on json also * modify ui a bit and avoid duplicated message * unify the function
* change team_configuration function * update configuration works
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.