Merge pull request #1848 from chaoss/spg-patch-abg

Updates to Schema, Tests, Workers, Documentation
chaoss · May 27, 2022 · 08ef23d · 08ef23d
2 parents 5310d55 + 806db25
commit 08ef23d
Show file tree

Hide file tree

Showing 96 changed files with 854 additions and 4,549 deletions.
diff --git a/.gitignore b/.gitignore
@@ -180,10 +180,12 @@ workers/clustering_worker/vocabulary_count
 # nohup logs
 nohup.out
 
-# vscode 
+# vscode
 .vscode/
 
-
+# local db volume
+pgdata/
+postgres-data/
 
 # Generated files from github
 .history/
diff --git a/A1.png b/A1.png
diff --git a/SECURITY.md b/SECURITY.md
@@ -6,7 +6,20 @@ These versions of Augur are currently supported with security updates.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 0.12.x   | :white_check_mark: |
+| 0.26.x   | :white_check_mark: |
+| 0.25.x   | :white_check_mark: |
+| 0.24.x   | :white_check_mark: |
+| 0.23.x   | :x: |
+| 0.21.x   | :x: |
+| 0.20.x   | :x: |
+| 0.19.x   | :x: |
+| 0.18.x   | :x: |
+| 0.17.x   | :x: |
+| 0.16.x   | :x: |
+| 0.15.x   | :x: |
+| 0.14.x   | :x: |
+| 0.13.x   | :x: |
+| 0.12.x   | :x: |
 | 0.11.x   | :x:                |
 | 0.10.x   | :x: |
 | < 0.10   | :x:                |

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -48,7 +48,8 @@
     'sphinx.ext.githubpages',
     'sphinx_rtd_theme',
     'sphinxcontrib.openapi',
-    'sphinxcontrib.redoc'
+    'sphinxcontrib.redoc',
+    'sphinx.ext.autosectionlabel'
 ]
 
 redoc = [

diff --git a/docs/source/deployment/nginx-configuration.rst b/docs/source/deployment/nginx-configuration.rst
@@ -1,5 +1,5 @@
 Web Server Configuration
-------------------------
+-------------------------------------
 
 Configuring nginx for Augur to run behind nginx requires you to have certain options available for symlinks and other basic nginx options. The `nginx.conf` file below is one example of a configuration known to work.
 
@@ -11,9 +11,9 @@ Once you have nginx configured, run these commands to make sure everything is lo
 2. ``sudo systemctl restart nginx`` on Ubuntu.
 3. sudo nginx on OS X.
 
-------------------
+--------------------------
 Server Compilation
-------------------
+--------------------------
 
 **Your Augur instance must compile with a publicly accessible domain that the frontend instance will be able to access.**
 

diff --git a/docs/source/quick-start.rst b/docs/source/quick-start.rst
@@ -3,55 +3,56 @@ Quickstart
 
 Get going fast! Intended for folks familiar with setting up DevOps environments. These instructions were tested using Ubuntu 20.04. Ubuntu 18x is no longer supported because the versions of Python3 available on it are not current. 
 
+:ref:`Complete installation instructions with more complete explanations are located in our "Getting Started" section.<Getting Started>`
 
 Setting up VirtualBox
 ~~~~~~~~~~~~~~~~~~~~~~~
-- Type "Download VirtualBox for windows" in the search bar.
+- Type "Download VirtualBox for Windows" in the search bar.
 - Click on the websight by Oracle.
 .. image:: development-guide/images/A1.png
   :width: 600  
-- Download VirtualBox for "windows hosts".
+- Download VirtualBox for "Windows hosts".
 .. image:: development-guide/images/A2.png
   :width: 600  
-- Click on the downloaded VirtualBox and continue clicking NEXT with the default options.
+- Click on the downloaded VirtualBox and continue clicking Next with the default options.
 .. image:: development-guide/images/A3.png
   :width: 600  
-- Accept the warning for network Interfaces.
+- Accept the warning for Network Interfaces.
 .. image:: development-guide/images/A5.png
   :width: 600  
-- Give it all the permissions it wants.
+- Allow all permissions
 .. image:: development-guide/images/A4.png
   :width: 600  
-- Open the VirtualBox by clicking on the windows desktop icon.
-- Click on "machine" and then on "new".
+- Open the VirtualBox by clicking on the Windows desktop icon.
+- Click "Machine" and then "New".
 .. image:: development-guide/images/A6.png
   :width: 600  
-- Name the machine as you wish. In type select "Linux" and in version select "Ubuntu (64-bits)".
+- Name the Machine. In type select "Linux" and in version select "Ubuntu (64-bits)".
 .. image:: development-guide/images/A7.png
   :width: 600  
 .. image:: development-guide/images/A8.png
   :width: 600  
-- Allot it the memory size you want , then click on NEXT.
+- Choose memory size, then click Next.
 .. image:: development-guide/images/A9.png
   :width: 600  
-- Choose "Create a virtual hard disk now" and click on CREATE.
+- Choose "Create a virtual hard disk now" and click Create.
 .. image:: development-guide/images/A10.png
   :width: 600  
-- In hard disk file type choose VDI(VirtualBox Disk Image) and click on NEXT.
+- Hard disk file type choose VDI (VirtualBox Disk Image) and click Next.
 .. image:: development-guide/images/A11.png
   :width: 600  
-- In storage on physical hard disk choose "Dynamically allocated" and click on NEXT.
+- Storage on physical hard disk choose "Dynamically allocated" and click Next.
 .. image:: development-guide/images/A12.png
   :width: 600  
-- Continue with the default options by clicking on next. Your machine will be created.
-- Start the machine.
+- Continue with the default options by clicking Next. Your machine will be created.
+- Start the Machine.
 .. image:: development-guide/images/A13.png
   :width: 600  
 
 Ubuntu download 
 ~~~~~~~~~~~~~~~~~
-- Type "Download ubuntu" in the search bar.
-- Click on download (Prefer LTS version). Ubuntu will be downloaded.
+- Type "Download Ubuntu" in the search bar.
+- Click download (Prefer LTS version). Ubuntu will be downloaded.
 .. image:: development-guide/images/A14.png
   :width: 600  
 
@@ -62,16 +63,16 @@ Installing Ubuntu in VirtualBox
 - In the welcome window select Install Ubuntu and move forward with the default options.
 .. image:: development-guide/images/Af.png
   :width: 600  
-- Select the keyboard layout you desire.
-- Select installation type as "Erase disk and install Ubuntu".
+- Select Keyboard layout.
+- Select Installation type "Erase disk and install Ubuntu".
 .. image:: development-guide/images/Ad.png
   :width: 600  
 - Enter your details and set a password.
 .. image:: development-guide/images/Ac.png
   :width: 600  
 .. image:: development-guide/images/Ab.png
   :width: 600  
-- Your Ubuntu will be ready to use in few minutes.
+- Your Ubuntu will be ready to use in a few minutes.
 .. image:: development-guide/images/Aa.png
   :width: 600  
 
@@ -98,7 +99,7 @@ PostgreSQL Installation
     $ su - postgres
     $ psql
 
-Then, once you've connected to your PostgreSQL instance\:
+Then, once you've connected to your PostgreSQL instance:
 
 .. code-block:: postgresql
 

diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -9,6 +9,7 @@
 *.swp
 *.vi
 *~
+*.spg
 *.sass-cache
 dist/*
 

diff --git a/frontend/variables.env b/frontend/variables.env
diff --git a/lib-0.16.1.md b/lib-0.16.1.md
diff --git a/metadata.py b/metadata.py
@@ -5,8 +5,8 @@
 
 __short_description__ = "Python 3 package for free/libre and open-source software community metrics, models & data collection"
 
-__version__ = "0.26.4"
-__release__ = "v0.26.4"
+__version__ = "0.26.5"
+__release__ = "v0.26.5"
 
 __license__ = "MIT"
 __copyright__ = "University of Missouri, University of Nebraska-Omaha, CHAOSS, & Augurlabs 2022"
diff --git a/sandiego_service.sh b/sandiego_service.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/bash
+source /home/augur/github/virtualenvs/augur-red/bin/activate 
+cd /home/augur/github/augur-red
+augur backend stop
+augur backend kill 
+sleep 30
+(nohup augur backend start >logs/sean.log 2>logs/sean.err &)