Merge branch 'hotfix/revert-4281-release/public-20200414'

fecgov · Apr 15, 2020 · 76b3843 · 76b3843
2 parents f1a9292 + 12f9a2e
commit 76b3843
Show file tree

Hide file tree

Showing 114 changed files with 5,226 additions and 8,818 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -43,7 +43,7 @@ jobs:
 
       - restore_cache:
           keys:
-          - v2-fec-api-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "package.json" }}
+          - v2-fec-api-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "requirements-dev.txt" }}-{{ checksum "package.json" }}
           # fallback to using the latest cache if no exact match is found
           - v2-fec-api-dependencies-
 
@@ -66,13 +66,13 @@ jobs:
           command: |
             python3 -m venv venv
             . venv/bin/activate
-            pip install -r requirements.txt
+            pip install -r requirements.txt  -r requirements-dev.txt
 
       - save_cache:
           paths:
             - ./venv
             - ./node_modules
-          key: v2-fec-api-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "package.json" }}
+          key: v2-fec-api-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "requirements-dev.txt" }}-{{ checksum "package.json" }}
 
       - run:
           name: Ensure database is available

diff --git a/README.md b/README.md
@@ -266,18 +266,6 @@ Running the tests:
 pytest
 ```
 
-Running only the pep8 linting:
-
-```
-pytest --linting
-```
-
-Running the tests without pep8 linting:
-
-```
-pytest --no-linting
-```
-
 #### The test data subset
 If you add new tables to the data, you'll need to generate a new subset for testing.
 

diff --git a/data/migrations/V0191__drop_ofec_totals_pacs_parties.sql b/data/migrations/V0191__drop_ofec_totals_pacs_parties.sql
diff --git a/data/migrations/V0192__add_pg_date_column_to_presidential_tables.sql b/data/migrations/V0192__add_pg_date_column_to_presidential_tables.sql
diff --git a/endpoints_walk.py b/endpoints_walk.py
@@ -124,7 +124,7 @@ def check_endpoints(server, api_key):
         if r.status_code == 200:
             print("{}: ok".format(endp))
         else:
-            print("******{}: not working. Status: {}".format(endp, r.status_code))
+            print("******{}: not working. Status: {}".format(endp,r.status_code))
 
 
 if __name__ == "__main__":

diff --git a/jdbc_utils.py b/jdbc_utils.py
@@ -1,20 +1,17 @@
 import re
 
-
 def get_jdbc_credentials(dbi_url):
     """Extract username and password from connection string"""
-    DB_URL_REGEX = re.compile(
-        r'postgresql://(?P<username>[^:]*):?(?P<password>\S*)@(?P<host_port>\S*)$'
-    )
+    DB_URL_REGEX = re.compile(r'postgresql://(?P<username>[^:]*):?(?P<password>\S*)@(?P<host_port>\S*)$')
     match = DB_URL_REGEX.match(dbi_url)
     if match:
-        jdbc_url = 'jdbc:postgresql://{}'.format(match.group('host_port'))
+        jdbc_url = 'jdbc:postgresql://{}'.format(
+            match.group('host_port'))
         username = match.group('username')
         password = match.group('password')
         return jdbc_url, username, password
     return None, None, None
 
-
 def to_jdbc_url(dbi_url):
     """Reformat PostgreSQL uri to JDBC uri"""
     jdbc_url, username, password = get_jdbc_credentials(dbi_url)
@@ -45,13 +42,12 @@ def remove_credentials(error):
         '3D000': 'invalid_catalog_name',
         '42000': 'syntax_error_or_access_rule_violation',
         '42501': 'insufficient_privilege',
-        '42601': 'syntax_error',
+        '42601': 'syntax_error'
     }
     match = re.search(r'.*(SQL State  : )+(?P<error>[a-zA-Z0-9]{0,5})', error)
     if match:
         error_code = match.group('error')
         return 'PostgreSQL error code {}: {}'.format(
-            error_code, login_related_error_codes.get(error_code, error)
-        )
+            error_code, login_related_error_codes.get(error_code, error))
     else:
         return error
diff --git a/locustfile.py b/locustfile.py
@@ -119,6 +119,7 @@
     {
         "sort_nulls_large": True,
         "contributor_name": "tom+lewis",
+        "contributor_name": "thomas+lewis",
         "two_year_transaction_period": 2016,
         "min_date": "01%2F01%2F2015",
         "max_date": "12%2F31%2F2016",