Skip to content

Commit

Permalink
Merge pull request #2436 from ohcnetwork/staging
Browse files Browse the repository at this point in the history
Production release v24.37.0
  • Loading branch information
sainak authored Sep 9, 2024
2 parents 66a0a8b + fd58b11 commit da84617
Show file tree
Hide file tree
Showing 76 changed files with 3,987 additions and 2,661 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
* @coronasafe/care-developers
*.yml @tomahawk-pilot @mathew-alex
* @ohcnetwork/care-developers
*.yml @tomahawk-pilot
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@

_*Only PR's with test cases included and passing lint and test pipelines will be reviewed*_

@coronasafe/care-backend-maintainers @coronasafe/care-backend-admins
@ohcnetwork/care-backend-maintainers @ohcnetwork/care-backend-admins
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:

jobs:
build-docs:
if: github.repository == 'coronasafe/care'
if: github.repository == 'ohcnetwork/care'
name: Build docs
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
retention-days: 30

deploy-docs:
if: github.repository == 'coronasafe/care' && github.ref == 'refs/heads/develop'
if: github.repository == 'ohcnetwork/care' && github.ref == 'refs/heads/develop'
name: Deploy docs
runs-on: ubuntu-latest
needs: build-docs
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/issue-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ jobs:
issue_opened_and_reopened:
name: issue_opened_and_reopened
runs-on: ubuntu-latest
if: github.repository == 'coronasafe/care' && github.event_name == 'issues' && github.event.action == 'opened' || github.event.action == 'reopened'
if: github.repository == 'ohcnetwork/care' && github.event_name == 'issues' && github.event.action == 'opened' || github.event.action == 'reopened'
steps:
- name: 'Move issue to "Triage"'
uses: leonsteinhaeuser/[email protected]
with:
gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
organization: coronasafe
organization: ohcnetwork
project_id: 4
resource_node_id: ${{ github.event.issue.node_id }}
status_value: "Triage"
issue_closed:
name: issue_closed
runs-on: ubuntu-latest
if: github.repository == 'coronasafe/care' && github.event_name == 'issues' && github.event.action == 'closed'
if: github.repository == 'ohcnetwork/care' && github.event_name == 'issues' && github.event.action == 'closed'
steps:
- name: 'Moved issue to "Done"'
uses: leonsteinhaeuser/[email protected]
with:
gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
organization: coronasafe
organization: ohcnetwork
project_id: 4
resource_node_id: ${{ github.event.issue.node_id }}
status_value: "Done"
10 changes: 1 addition & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -347,16 +347,8 @@ test_db
celerybeat-schedule

secrets.sh
/.idea/inspectionProfiles/profiles_settings.xml
/.idea/.gitignore
/.idea/aws.xml
/.idea/backend.iml
/.idea/git_toolbox_prj.xml
/.idea/misc.xml
/.idea/modules.xml
/.idea/vcs.xml
/.idea/ruff.xml

/.idea/*

# Redis
*.rdb
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Any support is welcome. You could help by writing documentation, pull-requests,

### Getting Started

An issue wih the [good first](https://github.com/coronasafe/care/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22good+first+issue%22) or [help wanted](https://github.com/coronasafe/care/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3A%22help+wanted%22+is%3Aopen) label might be a good place to start with.
An issue wih the [good first](https://github.com/ohcnetwork/care/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22good+first+issue%22) or [help wanted](https://github.com/ohcnetwork/care/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3A%22help+wanted%22+is%3Aopen) label might be a good place to start with.

### Setting up the development environment

Expand Down
9 changes: 8 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: build, re-build, up, down, list, logs, test, makemigrations
.PHONY: build, re-build, up, down, list, logs, test, makemigrations, reset_db


DOCKER_VERSION := $(shell docker --version 2>/dev/null)
Expand Down Expand Up @@ -47,3 +47,10 @@ test-coverage:
docker compose exec backend bash -c "coverage run manage.py test --settings=config.settings.test --keepdb --parallel --shuffle"
docker compose exec backend bash -c "coverage combine || true; coverage xml"
docker compose cp backend:/app/coverage.xml coverage.xml

reset_db:
docker compose exec backend bash -c "python manage.py reset_db --noinput"
docker compose exec backend bash -c "python manage.py migrate"

%:
docker compose exec backend bash -c "python manage.py $*"
19 changes: 9 additions & 10 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ name = "pypi"

[packages]
argon2-cffi = "==23.1.0"
authlib = "==1.3.0"
boto3 = "==1.34.117"
authlib = "==1.3.1"
boto3 = "==1.35.0"
celery = "==5.4.0"
django = "==4.2.10"
django = "==4.2.15"
django-environ = "==0.11.2"
django-cors-headers = "==4.3.1"
django-filter = "==24.2"
django-hardcopy = "==0.1.4"
django-maintenance-mode = "==0.21.1"
django-model-utils = "==4.5.1"
django-multiselectfield = "==0.1.12"
Expand All @@ -22,7 +21,7 @@ django-redis = "==5.4.0"
django-rest-passwordreset = "==1.4.1"
django-simple-history = "==3.7.0"
djangoql = "==0.18.1"
djangorestframework = "==3.15.1"
djangorestframework = "==3.15.2"
djangorestframework-simplejwt = "==5.3.1"
dry-rest-permissions = "==0.1.10"
drf-nested-routers = "==0.94.1"
Expand All @@ -32,23 +31,23 @@ gunicorn = "==22.0.0"
healthy-django = "==0.1.0"
jsonschema = "==4.22.0"
jwcrypto = "==1.5.6"
newrelic = "==9.10.0"
newrelic = "==9.13.0"
pillow = "==10.3.0"
psycopg = { extras = ["c"], version = "==3.1.19" }
pycryptodome = "==3.20.0"
pydantic = "==1.10.15" # fix for fhir.resources < 7.0.2
pyjwt = "==2.8.0"
python-slugify = "==8.0.4"
pywebpush = "==1.14.0"
pywebpush = "==2.0.0"
redis = { extras = ["hiredis"], version = "==5.0.5" } # constraint for redis-om
redis-om = "==0.3.1"
requests = "==2.32.3"
sentry-sdk = "==2.5.1"
sentry-sdk = "==2.13.0"
whitenoise = "==6.6.0"

[dev-packages]
black = "==24.4.2"
boto3-stubs = { extras = ["s3", "boto3"], version = "==1.34.117" }
boto3-stubs = { extras = ["s3", "boto3"], version = "==1.35.0" }
coverage = "==7.5.3"
debugpy = "==1.8.1"
django-coverage-plugin = "==3.1.0"
Expand All @@ -58,7 +57,7 @@ django-silk = "==5.1.0"
django-stubs = "==5.0.2"
djangorestframework-stubs = "==3.15.0"
factory-boy = "==3.3.0"
flake8 = "==7.0.0"
flake8 = "==7.1.1"
freezegun = "==1.5.1"
ipython = "==8.25.0"
isort = "==5.13.2"
Expand Down
Loading

0 comments on commit da84617

Please sign in to comment.