Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/ci_rc
Browse files Browse the repository at this point in the history
* origin/develop:
  Feature/fr batch image processing (#29)
  Feature/fc constance (#25)
  Register API models in admin (#27)
  Add status callback url (#28)
  Feature/celery results (#24)
  fix ! typo (#22)
  Feature/ci rc (#23)
  • Loading branch information
saxix committed Jun 11, 2024
2 parents 327c80c + af9234c commit 2ea72db
Show file tree
Hide file tree
Showing 41 changed files with 1,005 additions and 633 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/rc.ym_

This file was deleted.

84 changes: 0 additions & 84 deletions .github/workflows/test.ym_

This file was deleted.

37 changes: 26 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,34 @@
.*
~*
*.sh
*.egg-info
dist/
__pycache__
.tox
__pycache__/
*.py[cod]
!tests/.coveragerc
!.dockerignore
!.flake8
!.gitignore
!.github
!.pylintrc
!.isort.cfg
!.git
!.gitlab/
!.tx/config
!.mypy.ini
!.dockerignore
!.gitlab-ci.yml
!.pre-commit-config.yaml
!.bumpversion.cfg
!.flake8
!tests/.coveragerc
pdm.lock
!.trivyignore
!docker/bin/*.sh
!bandit.yaml
build
dist
coverage.xml
Makefile
site
black.txt
flake8
act.*
.pdm-python
!tests/.coveragerc
!.pylintrc
!.isort.cfg
!.git


7 changes: 4 additions & 3 deletions compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
<<: *common
ports:
- 8000:8000
command: ["entrypoint.sh", "dev"]
command: ["docker-entrypoint.sh", "dev"]
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8000/healthcheck"]
interval: 10s
Expand All @@ -29,11 +29,11 @@ services:

celery_worker:
<<: *common
command: ["entrypoint.sh", "celery_worker"]
command: ["docker-entrypoint.sh", "worker"]

celery_beat:
<<: *common
command: ["entrypoint.sh", "celery_beat"]
command: ["docker-entrypoint.sh", "beat"]

db:
image: postgres:15
Expand Down Expand Up @@ -70,6 +70,7 @@ services:
azurite:
image: mcr.microsoft.com/azure-storage/azurite
command: "azurite -l /workspace -d /workspace/debug.log --blobPort 10000 --blobHost 0.0.0.0 --loose"
restart: always
ports:
- "10000:10000" # Blob service
volumes:
Expand Down
1 change: 1 addition & 0 deletions history/+random.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Orphan fragments have no ticket ID.
1 change: 1 addition & 0 deletions history/3456.doc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Can also be ``rst`` as well!
1 change: 1 addition & 0 deletions history/8765.removal.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The final part is ignored, so set it to whatever you want.
Loading

0 comments on commit 2ea72db

Please sign in to comment.