Skip to content

Commit

Permalink
Merge pull request #435 from atlas-bi/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherpickering authored Sep 19, 2023
2 parents 516715c + ba14eb6 commit a1fcf64
Show file tree
Hide file tree
Showing 197 changed files with 11,118 additions and 10,431 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codespell.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
cancel-in-progress: true
steps:
- name: 💾 Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: ✔️ Codespell
uses: codespell-project/actions-codespell@master
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lighthouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- 5432:5432
steps:
- name: 💾 Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: 💾 Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: ⎔ Setup node
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: 💾 Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
persist-credentials: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

steps:
- name: 💾 Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: 🧹 Cleanup apt list
uses: christopherpickering/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
if: github.ref_name == 'dev'
steps:
- name: 💾 Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: alpha

Expand All @@ -32,7 +32,7 @@ jobs:
if: github.ref_name == 'alpha'
steps:
- name: 💾 Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: main

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ migrations_test
docs/_build
report.xml
docs/autoapi
Install.sh

# Created by https://www.toptal.com/developers/gitignore/api/node,python,macos,windows,git
# Edit at https://www.toptal.com/developers/gitignore?templates=node,python,macos,windows,git
Expand Down
12 changes: 7 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ exclude: >
(?x)(
migrations/|
migrations_dev/|
package-lock.jons|
poetry.lock
package-lock.json|
poetry.lock|
web/static/.*\.min.*|
web/static/fonts/|
web/static/css/
)
repos:
Expand All @@ -23,7 +26,6 @@ repos:
- id: pretty-format-json
args: [--autofix]
- id: check-json
exclude: package-lock.json
- id: check-toml
- id: check-yaml
- id: end-of-file-fixer
Expand All @@ -34,7 +36,7 @@ repos:
exclude: migrations* | docs*
additional_dependencies: [toml]
- repo: https://github.com/psf/black
rev: 23.7.0
rev: 23.9.1
hooks:
- id: black
language_version: python3.9
Expand All @@ -48,6 +50,6 @@ repos:
- id: pretty-format-yaml
args: [--autofix, --indent, '2']
- repo: https://github.com/Riverside-Healthcare/djLint
rev: v1.32.1
rev: v1.33.0
hooks:
- id: djlint-jinja
6 changes: 3 additions & 3 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ node_modules/*
/web/static/lib/*
!/web/static/lib/table/
!/web/static/lib/scroll/
web/static/fonts/*
web/static/css/*
.lighthouserc/*
/web/static/fonts/*
/web/static/css/*
/.lighthouserc/*
10 changes: 10 additions & 0 deletions config.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,13 @@ class Config:

HTTP_VERIFY_SSL = False

"""
Azure Devops connection
"""

DEVOPS_URL = "https://dev.azure.com/orgname/"
DEVOPS_TOKEN = r"token"

"""
Default SQL Connection Settings
"""
Expand Down Expand Up @@ -266,6 +273,9 @@ class Config:
SMTP_SENDER_EMAIL = "[email protected]"
SMTP_DEFAULT_RECIEVER = "[email protected]"
SMTP_SUBJECT_PREFIX = "### "
SMTP_USE_TLS = False
SMTP_USERNAME = None
SMTP_PASSWORD = None

EXECUTOR_TYPE = "thread"
EXECUTOR_MAX_WORKERS = 12
Expand Down
33 changes: 33 additions & 0 deletions migrations/versions/e075a9d31b1a_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
"""empty message
Revision ID: e075a9d31b1a
Revises: 6b8978d637c5
Create Date: 2023-09-18 15:14:26.310892
"""
import sqlalchemy as sa
from alembic import op

# revision identifiers, used by Alembic.
revision = 'e075a9d31b1a'
down_revision = '6b8978d637c5'
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('task', schema=None) as batch_op:
batch_op.add_column(sa.Column('source_devops', sa.String(length=1000), nullable=True))
batch_op.add_column(sa.Column('processing_devops', sa.String(length=1000), nullable=True))

# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('task', schema=None) as batch_op:
batch_op.drop_column('processing_devops')
batch_op.drop_column('source_devops')

# ### end Alembic commands ###
Loading

0 comments on commit a1fcf64

Please sign in to comment.