Merge pull request #69 from openvar/develop_2_0

fix locust for python3 and remove biopython==1.74 requirement

Author: Peter J. Freeman

REQUIREMENTS.txt

@@ -1,8 +1,8 @@
 git+https://github.com/openvar/vv_hgvs@master#egg=vvhgvs
 git+https://github.com/openvar/variantValidator@master#egg=VariantValidator
 git+https://github.com/openvar/variantFormatter@master#egg=VariantFormatter
-biopython==1.74
-flask
+biopython
+flask==1.1.1
 flask-restplus
 gunicorn
 biocommons.seqrepo>=0.5.1

locust/__pycache__/test_set.cpython-36.pyc

@@ -1,4 +1,4 @@
-from locust import HttpLocust, TaskSet, task, between
+from locust import HttpUser, TaskSet, task, between
 import test_set
 
 """
@@ -23,7 +23,8 @@
 
 """
 
-class UserBehavior(TaskSet):
+
+class UserBehavior(HttpUser):
     """
     Endpoint load-testing for the VariantValidator REST API
 
@@ -51,6 +52,6 @@ def profile(self):
         self.client.get(url)
 
 
-class WebsiteUser(HttpLocust):
+class WebsiteUser(HttpUser):
     task_set = UserBehavior
-    wait_time = between(1, 10) # seconds
+    wait_time = between(1, 10)  # seconds

locust/locust.py

@@ -1,5 +1,6 @@
 import random
 
+
 def variant_list():
     tests = [
         "NC_000016.9:g.2099572TC>T",
@@ -327,6 +328,7 @@ def variant_list():
     odd_job = tests[random_number]
     return odd_job
 
+
 def gene_list():
     tests = [
             "BRCA1",
@@ -340,4 +342,4 @@ def gene_list():
 
     random_number = random.randint(0, 6)
     random_task = tests[random_number]
-    return random_task
+    return random_task

locust/test_set.py

@@ -60,7 +60,7 @@
         "VariantValidator @ git+https://github.com/openvar/variantValidator.git@master#egg=VariantValidator",
         "VariantFormatter @ git+https://github.com/openvar/variantFormatter.git@master#egg=VariantFormatter",
         "biocommons.seqrepo>=0.5.1",
-        "biopython==1.74",
+        "biopython",
     ],
     setup_requires=[
         "setuptools_scm",