Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

B

backend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

431b5443

Commit 431b5443 authored 2 years ago by Hartung, Michael

Downloads
- Plain Diff

Merge branch 'development' of...

Merge branch 'development' of gitlab.rrz.uni-hamburg.de:cosy-bio/drugst.one/backend into development


Former-commit-id: 09bbaefb

parents b6a24856 f66f3de3

No related branches found

No related tags found

No related merge requests found

Changes 15

Show whitespace changes

Inline Side-by-side

Showing

.dockerignore 2 additions, 0 deletions

.dockerignore
.gitignore 1 addition, 1 deletion

.gitignore
README.md 4 additions, 0 deletions

README.md
docker-compose.yml 2 additions, 2 deletions

docker-compose.yml
drugstone/management/commands/import_from_nedrex.py 8 additions, 8 deletions

drugstone/management/commands/import_from_nedrex.py
drugstone/management/commands/populate_db.py 2 additions, 2 deletions

drugstone/management/commands/populate_db.py
drugstone/management/includes/DataLoader.py 1 addition, 1 deletion

drugstone/management/includes/DataLoader.py
drugstone/management/includes/DatasetLoader.py 66 additions, 58 deletions

drugstone/management/includes/DatasetLoader.py
drugstone/serializers.py 6 additions, 6 deletions

drugstone/serializers.py
drugstone/util/query_db.py 2 additions, 2 deletions

drugstone/util/query_db.py
drugstone/views.py 40 additions, 19 deletions

drugstone/views.py
requirements.txt 2 additions, 2 deletions

requirements.txt
scripts/docker-entrypoint.sh 1 addition, 0 deletions

scripts/docker-entrypoint.sh
tasks/quick_task.py 10 additions, 4 deletions

tasks/quick_task.py
tasks/util/scores_to_results.py 24 additions, 11 deletions

tasks/util/scores_to_results.py

with 171 additions and 116 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment