Skip to content

Commit a5695fe

Browse files
authored
Merge pull request #869 from NASA-IMPACT/dev
Dev to main
2 parents 0dee923 + 09602b6 commit a5695fe

File tree

203 files changed

+49473
-25815
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+49473
-25815
lines changed

.env_sample

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
CELERY_BROKER_URL=""
2+
CELERY_FLOWER_PASSWORD=""
3+
CELERY_FLOWER_USER=""
4+
DATABASE_URL='postgresql://<user>:<password>@localhost:5432/<database>'
5+
DJANGO_ACCOUNT_ALLOW_REGISTRATION=False
6+
DJANGO_AWS_ACCESS_KEY_ID=""
7+
DJANGO_AWS_SECRET_ACCESS_KEY=""
8+
DJANGO_AWS_STORAGE_BUCKET_NAME=""
9+
GITHUB_ACCESS_TOKEN=""
10+
GITHUB_BRANCH_FOR_WEBAPP=""
11+
IPYTHONDIR=""
12+
REDIS_URL=""
13+
SINEQUA_CONFIGS_GITHUB_REPO=""
14+
SINEQUA_CONFIGS_REPO_DEV_BRANCH=""
15+
SINEQUA_CONFIGS_REPO_MASTER_BRANCH=""
16+
SINEQUA_CONFIGS_REPO_WEBAPP_PR_BRANCH=""
17+
SLACK_WEBHOOK_URL=""
18+
USE_DOCKER=no

.envs/.local/.django

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,14 @@ DJANGO_AWS_ACCESS_KEY_ID=''
2222
DJANGO_AWS_SECRET_ACCESS_KEY=''
2323
DJANGO_AWS_STORAGE_BUCKET_NAME=''
2424

25-
# GitHub
25+
# GitHub (please create a new file called .env and put these in there)
2626
# ------------------------------------------------------------------------------
27-
GITHUB_ACCESS_TOKEN=''
28-
SINEQUA_CONFIGS_GITHUB_REPO=''
29-
GITHUB_BRANCH_FOR_WEBAPP=''
27+
GITHUB_ACCESS_TOKEN=
28+
SINEQUA_CONFIGS_GITHUB_REPO='NASA-IMPACT/sde-backend'
29+
SINEQUA_CONFIGS_REPO_MASTER_BRANCH='master'
30+
SINEQUA_CONFIGS_REPO_DEV_BRANCH='dev'
31+
SINEQUA_CONFIGS_REPO_WEBAPP_PR_BRANCH='dummy_branch'
32+
33+
# Slack Webhook
34+
# ------------------------------------------------------------------------------
35+
SLACK_WEBHOOK_URL=''

.github/gh-pages.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# config details can be found on https://github.com/peaceiris/actions-gh-pages#%EF%B8%8F-static-site-generators-with-python
2+
name: GitHub Pages
3+
4+
on:
5+
push:
6+
branches:
7+
- feature-docs
8+
- main
9+
pull_request:
10+
11+
jobs:
12+
deploy:
13+
runs-on: ubuntu-22.04
14+
permissions:
15+
contents: write
16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.ref }}
18+
steps:
19+
- uses: actions/checkout@v3
20+
21+
- name: Setup Python
22+
uses: actions/setup-python@v3
23+
with:
24+
python-version: '3.8'
25+
26+
- name: Upgrade pip
27+
run: |
28+
# install pip=>20.1 to use "pip cache dir"
29+
python3 -m pip install --upgrade pip
30+
31+
- name: Get pip cache dir
32+
id: pip-cache
33+
run: echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
34+
35+
- name: Cache dependencies
36+
uses: actions/cache@v3
37+
with:
38+
path: ${{ steps.pip-cache.outputs.dir }}
39+
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements/local.txt') }}
40+
restore-keys: |
41+
${{ runner.os }}-pip-
42+
43+
- name: Install dependencies
44+
run: python3 -m pip install -r ./requirements/local.txt
45+
46+
- name: Build Sphinx docs
47+
run: sphinx-build -b html ./docs ./docs/_build
48+
49+
- name: Deploy
50+
uses: peaceiris/actions-gh-pages@v3
51+
if: ${{ github.ref == 'refs/heads/feature-docs' || github.ref == 'refs/heads/main' }}
52+
with:
53+
github_token: ${{ secrets.GITHUB_TOKEN }}
54+
publish_dir: ./docs/_build

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,3 +294,6 @@ Document_Classifier_inference/model.pt
294294

295295
# Database backup
296296
backup.json
297+
298+
# Prod backup
299+
prod_backup-20240423.json

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ repos:
4040
# ignoring everything for now
4141
exclude: .
4242
additional_dependencies: [django-stubs, celery, django-environ, django-extensions, django-crispy-forms,
43-
crispy-bootstrap5, django-allauth, django-celery-beat, django-treebeard, djangorestframework, djangorestframework-datatables,
44-
django-debug-toolbar, psycopg2-binary, python-slugify, xmltodict,PyGithub, boto3, scrapy, types-requests]
43+
crispy-bootstrap5, django-allauth, django-celery-beat, djangorestframework, djangorestframework-datatables,
44+
django-debug-toolbar, psycopg2-binary, python-slugify, xmltodict, PyGithub, boto3, scrapy, types-requests]
4545

4646

4747
# sets up .pre-commit-ci.yaml to ensure pre-commit dependencies stay up to date

0 commit comments

Comments
 (0)