Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release latest staging code #591

Merged
merged 57 commits into from
May 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
7f4ac78
build(deps): bump django from 3.2.24 to 3.2.25
dependabot[bot] Mar 18, 2024
fd9fd08
stashing
kaliif Mar 22, 2024
816145c
Target loader now accepts experiments marked as 'manual'
kaliif Mar 26, 2024
2bd0d06
Merge pull request #567 from xchem/m2ms-1282-rcsb-pdb
kaliif Mar 26, 2024
4cbe000
build(deps): bump pillow from 10.2.0 to 10.3.0
dependabot[bot] Apr 3, 2024
57346b4
Attempt to reduce pop-up "flicker" (1403) (#569)
alanbchristie Apr 5, 2024
208df48
feat: endpoint to download first reference pdb from assemblies.yaml
kaliif Apr 9, 2024
fe61db2
stashing
kaliif Apr 10, 2024
6afddf9
stashing
kaliif Apr 10, 2024
8eaf124
fix: removed code mentioned in previous commit
kaliif Apr 10, 2024
d4706f1
Merge pull request #571 from xchem/m2ms-1373-first-assembly
kaliif Apr 10, 2024
ad37b45
basic functionality
kaliif Apr 10, 2024
94b177a
stashing
kaliif Apr 11, 2024
fefe343
build(deps): bump idna from 3.6 to 3.7
dependabot[bot] Apr 11, 2024
5ae1dd4
stashing
kaliif Apr 12, 2024
bf56876
Added 'hidden' property to viewer.Tag model
kaliif Apr 12, 2024
b6399d9
Merge pull request #573 from xchem/m2ms-1389-tags
kaliif Apr 17, 2024
41fb8ff
Better user/proposal cache (#576)
alanbchristie Apr 18, 2024
890c7a1
stashing
kaliif Apr 24, 2024
b1d8bd5
feat: added compound_code to pose serializer
kaliif Apr 24, 2024
b5c3dc9
fix: deeper nesting level to site observaton in meta_aligner.yaml
kaliif Apr 25, 2024
9da3b35
fix: renamed panddas_event_files to ligand_binding_events in meta_al
kaliif Apr 25, 2024
2b4854a
fix: static resources are now loaded again
kaliif Apr 25, 2024
9e54c7a
fix: fixed nginx config
kaliif Apr 25, 2024
eb49ed4
Merge pull request #578 from xchem/fix_static_res_not_loaded
kaliif Apr 25, 2024
1cd6320
Revert "Fix static ressources not being loaded"
kaliif Apr 26, 2024
27db93e
Merge pull request #579 from xchem/revert-578-fix_static_res_not_loaded
kaliif Apr 26, 2024
6813102
stashing
kaliif Apr 29, 2024
5e04ecb
fix: more robust update method
kaliif Apr 30, 2024
ee1ed54
feat: added pose tags
kaliif Apr 30, 2024
5dae9f0
stashing
kaliif May 1, 2024
8de2dfa
feat: fully functional versioned data
kaliif May 2, 2024
597e1d7
fix: removed some dead code
kaliif May 2, 2024
c8669ea
Merge branch 'staging' into m2ms-1311-observation-levels
kaliif May 2, 2024
dd48d31
Merge pull request #580 from xchem/m2ms-1311-observation-levels
kaliif May 2, 2024
5bbe6ce
stashing
kaliif May 3, 2024
e795865
build(deps): bump tqdm from 4.66.1 to 4.66.3
dependabot[bot] May 3, 2024
b783d8a
feat: only non-superseded sites available from the api
kaliif May 7, 2024
a52d8de
Merge pull request #583 from xchem/m2ms-1311-observation-levels
Waztom May 7, 2024
d7ab5b7
Merge pull request #564 from xchem/dependabot/pip/django-3.2.25
kaliif May 7, 2024
6c76dba
build(deps-dev): bump black from 23.12.0 to 24.3.0
dependabot[bot] May 7, 2024
b6239a0
Merge branch 'staging' into m2ms-1392-poses-backend
kaliif May 7, 2024
6bb6ebf
chore: merged conflicting migrations from issue 1311 branch
kaliif May 7, 2024
b5f034a
fix: pose instance attributes updating successfully
kaliif May 8, 2024
1d8f73d
fix: better check for already uploaded data
kaliif May 9, 2024
2107026
Merge pull request #568 from xchem/dependabot/pip/pillow-10.3.0
kaliif May 9, 2024
78849ba
Merge pull request #572 from xchem/dependabot/pip/idna-3.7
kaliif May 9, 2024
48bf8d0
Merge pull request #585 from xchem/fix_upload_fail_message
kaliif May 9, 2024
18a5fcd
Merge pull request #584 from xchem/dependabot/pip/black-24.3.0
kaliif May 10, 2024
493b2fd
Merge pull request #581 from xchem/dependabot/pip/tqdm-4.66.3
kaliif May 10, 2024
faa04e1
Merge branch 'staging' into m2ms-1392-poses-backend
kaliif May 15, 2024
b6e77e9
Merge pull request #586 from xchem/m2ms-1392-poses-backend
kaliif May 15, 2024
f54694b
fix: merge conflicting migrations
kaliif May 16, 2024
4a4c045
Merge pull request #587 from xchem/m2ms-1392-poses-backend
kaliif May 16, 2024
12c8653
Adds basic metrics (#588)
alanbchristie May 20, 2024
ed9f0fd
Attempt to add prometheus to DB (#589)
alanbchristie May 20, 2024
2370888
Merge branch 'production' into staging-conflict-fix
alanbchristie May 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added 'hidden' property to viewer.Tag model
Also, added exclude directives to .pre-commit-config.yaml to not touch
django migration files
kaliif committed Apr 12, 2024
commit bf56876899d762968fbbd9cdde0a5d3170b1aa10
4 changes: 4 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@ repos:
rev: 5.13.1
hooks:
- id: isort
exclude: 'migrations/'
args:
- --profile
- black
@@ -38,6 +39,7 @@ repos:
rev: 23.12.0
hooks:
- id: black
exclude: 'migrations/'
args:
- --skip-string-normalization
- --target-version
@@ -51,6 +53,7 @@ repos:
rev: v1.7.1
hooks:
- id: mypy
exclude: 'migrations/'
additional_dependencies:
- types-PyYAML
- types-pymysql
@@ -63,6 +66,7 @@ repos:
rev: v3.0.3
hooks:
- id: pylint
exclude: 'migrations/'
additional_dependencies:
- pylint-django
args:
23 changes: 23 additions & 0 deletions viewer/migrations/0050_auto_20240412_0930.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 3.2.24 on 2024-04-12 09:30

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('viewer', '0049_auto_20240307_1344'),
]

operations = [
migrations.AddField(
model_name='sessionprojecttag',
name='hidden',
field=models.BooleanField(default=False),
),
migrations.AddField(
model_name='siteobservationtag',
name='hidden',
field=models.BooleanField(default=False),
),
]
1 change: 1 addition & 0 deletions viewer/models.py
Original file line number Diff line number Diff line change
@@ -1206,6 +1206,7 @@ class Tag(models.Model):
null=True,
help_text="Optional JSON field containing name/value pairs for future use",
)
hidden = models.BooleanField(default=False)

def __str__(self) -> str:
return f"{self.tag}"