Merge pull request #831 from chaoss/dev

Next Release: Merged per review of final tested version of PR #830 in `dev`.

.github/CODEOWNERS

@@ -1,19 +1,22 @@
-*.py @ccarterlandis @gabe-heim
+/augur/cli/ @ccarterlandis
+/augur/metrics/ @ccarterlandis
+/augur/housekeeper/ @gabe-heim
+/augur/server.py @ccarterlandis @gabe-heim
+/augur/application.py @ccarterlandis @gabe-heim
+/augur/routes/ @ccarterlandis @gabe-heim
 
-/augur/ @ccarterlandis @gabe-heim
+/frontend/ @gabe-heim
 
-/frontend/ @gabe-heim @michaelwoodruffdev
+/schema/ @sgoggins @ccarterlandis
 
-/schema @sgoggins
-
-/workers/ @ccarterlandis @gabe-heim @sgoggins
+/workers/ @ccarterlandis @gabe-heim
 
 /README.md @sgoggins @ccarterlandis
 /CONTRIBUTING.md @sgoggins @ccarterlandis
-/LICENSE @sgoggins
-/CODE_OF_CONDUCT.md @sgoggins
+/LICENSE @sgoggins @ccarterlandis
+/CODE_OF_CONDUCT.md @sgoggins @ccarterlandis
 
-/test/ @ccarterlandis
+/tests/ @ccarterlandis
 /util/docker @ccarterlandis
 /scripts/ @ccarterlandis
 /docs/ @ccarterlandis

.gitignore

@@ -10,6 +10,7 @@ augur_export_env.sh
 
 
 node_modules/
+.idea/
 logs/
 __pycache__/
 *$py.class

.travis.yml

@@ -6,29 +6,29 @@ services:
 
 jobs:
   include:
-    - name: 3.6 Metrics
+    - name: Python v3.6 Unit Tests
       python: 3.6
-      env: TOXENV=py36-metrics
+      env: TOXENV=py36-workers,py36-application
 
-    - name: 3.6 Metrics API
+    - name: Python v3.6 API Tests
       python: 3.6
-      env: TOXENV=py36-metrics_api
+      env: TOXENV=py36-metric-routes
 
-    - name: 3.7 Metrics
+    - name: Python v3.7 Unit Tests
       python: 3.7
-      env: TOXENV=py37-metrics
+      env: TOXENV=py37-workers,py36-application
 
-    - name: 3.7 Metrics API
+    - name: Python v3.7 API Tests
       python: 3.7
-      env: TOXENV=py37-metrics_api
+      env: TOXENV=py37-metric-routes
 
-    - name: 3.8 Metrics
+    - name: Python v3.8 Unit Tests
       python: 3.8
-      env: TOXENV=py38-metrics
+      env: TOXENV=py38-workers,py36-application
 
-    - name: 3.8 Metrics API
+    - name: Python v3.8 API Tests
       python: 3.8
-      env: TOXENV=py38-metrics_api
+      env: TOXENV=py38-metric-routes
 
 env:
   global:
@@ -39,8 +39,7 @@ env:
     AUGUR_DB_PASSWORD=augur
 
 before_install:
-  - docker run -d -p 5432:5432 --name augur_test_database augurlabs/augur:test_data@sha256:3c496445d7219b824315a37369fcddbe83b10773259560df5645162ce81dfb33
-
+  - docker run -d -p 5432:5432 --name augur_test_database augurlabs/augur:test_data@sha256:fd2d9a178a9fee7cd548bd40a16e08d4611be22892491e817aafd53502f74cd0
 install:
   - pip install .[dev]
   - augur configure generate

Makefile

@@ -77,43 +77,36 @@ dev: dev-stop dev-start
 #
 # Testing
 #
-.PHONY: test test-metrics test-metrics-api
+.PHONY: test test-data test-application test-metric-routes test-python-versions
 
-test: test-metrics test-metrics-api
+test-data:
+	@ docker run -p 5434:5432 --name augur_test_data augurlabs/augur:test_data@sha256:fd2d9a178a9fee7cd548bd40a16e08d4611be22892491e817aafd53502f74cd0
+
+test: test-application test-metric-routes test-workers
+
+test-application:
+	@ bash -c 'tox -e py-application'
 
-test-metrics:
-	@ bash -c 'tox -e py-metrics 2>&1 | tee logs/metrics_test.log'
+test-workers:
+	@ bash -c 'tox -e py-workers'
 
-test-metrics-api:
-	@ bash -c 'tox -e py-metrics_api 2>&1 | tee logs/metrics_api_test.log'
+test-metric-routes:
+	@ bash -c 'tox -e py-metric-routes'
 
 test-python-versions:
-	@ bash -c 'tox -e ALL 2>&1 | tee logs/metrics_ALL.log'
+	@ bash -c 'tox -e ALL'
 
 
 #
 # Documentation
 #
-.PHONY: library-docs library-docs-view 
-.PHONY:api-docs api-docs-view docs
-
-test-data:
-	@ docker run -p 5434:5432 --name augur_test_data augurlabs/augur:test_data@sha256:3c496445d7219b824315a37369fcddbe83b10773259560df5645162ce81dfb33
-
-library-docs:
+.PHONY: docs docs-view 
+docs:
 	@ bash -c 'cd docs/ && rm -rf build/ && make html;'
 
-library-docs-view: library-docs
+docs-view: docs
 	@ bash -c 'open docs/build/html/index.html'
 
-api-docs:
-	@ scripts/install/api_docs.sh
-
-api-docs-view: api-docs
-	@ bash -c "open frontend/public/api_docs/index.html"
-
-docs: api-docs library-docs
-
 
 #
 # Docker Shortcuts

README.md

@@ -52,4 +52,4 @@ Copyright © 2020 University of Nebraska at Omaha, University of Missouri and CH
 
 Augur is free software: you can redistribute it and/or modify it under the terms of the MIT License as published by the Open Source Initiative. See the [LICENSE](LICENSE) file for more details.
 
-This work has been funded through the Alfred P. Sloan Foundation.
+This work has been funded through the Alfred P. Sloan Foundation, Mozilla, The Reynolds Journalism Institute, and 9 Google Summer of Code Students. 

SECURITY.md

@@ -13,4 +13,4 @@ These versions of Augur are currently supported with security updates.
 
 ## Reporting a Vulnerability
 
-Please report vulnterabilities using GitHub Issues  
+Please report vulnerabilities using GitHub Issues  

augur/__init__.py

@@ -1,10 +1,4 @@
 #SPDX-License-Identifier: MIT
 
-# Functions
-from .util import logger
-
-# Classes
-from .application import Application
-
-# Plugins
-from .augurplugin import AugurPlugin
+import os
+ROOT_AUGUR_DIRECTORY = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))