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

Aligns production with latest staging #545

Merged
merged 49 commits into from
Mar 5, 2024
Merged

Aligns production with latest staging #545

merged 49 commits into from
Mar 5, 2024

Conversation

alanbchristie
Copy link
Collaborator

No description provided.

kaliif and others added 30 commits February 12, 2024 13:03
…527)

* stashing

* fix: cset_upload.py updated to allow new-style site observation codes

NB! this probably still won't work! I suspect the file I was given is
broken and I cannot test it further
Target loader now reads short code prefix and tooltip from
meta_aligner.yaml. Tooltip is saved to Experiment model.

TODO: make tooltip available via API
Short code prefix and tooltip read from yaml file (issue 1334)
TODO: add all the yamls
* stashing

* stashing

* feat: download structure fixed

TODO: add all the yamls

* All yaml files added to download
cset_upload.py: lhs_pdb renamed to ref_pdb (issue 1327)
* Centralised environment variables (#529)

* refactor: Restructured settings.py

* docs: Minor tweaks

* refactor: Move security and infection config to settings

* refactor: b/e & f/e/ tags now in settings (also fixed f/e tag value)

* refactor: Move Neo4j config to settings

* refactor: More variables into settings

* refactor: Moved remaining config

* docs: Adds configuration guide as comments

* docs: Variable prefix now 'stack_' not 'stack_env_'

---------

Co-authored-by: Alan Christie <alan.christie@matildapeak.com>

* feat: Adds support for private keys on SSH tunnel

* fix: Fixes key-based logic

---------

Co-authored-by: Alan Christie <alan.christie@matildapeak.com>
Bumps [cryptography](https://github.com/pyca/cryptography) from 42.0.0 to 42.0.2.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@42.0.0...42.0.2)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alan Christie <alan.christie@matildapeak.com>
Bumps [django](https://github.com/django/django) from 3.2.20 to 3.2.24.
- [Commits](django/django@3.2.20...3.2.24)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Download zip; ligand sdfs now in aligned_files not in missing_sdfs
RHS upload backend side functional
Increased loglevel to error on unexpected exceptions block
alanbchristie and others added 3 commits February 29, 2024 11:02
…vice (#544)

Co-authored-by: Alan Christie <alan.christie@matildapeak.com>
Bumps [cryptography](https://github.com/pyca/cryptography) from 42.0.2 to 42.0.4.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@42.0.2...42.0.4)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@alanbchristie alanbchristie requested a review from kaliif February 29, 2024 10:41
Started working on issue 1355 as well, it's too tightly coupled. Some
work remaining re that:
- when tag created in UI, make sure upload_name attribute is populated
Only populated on creation, updates won't touch it
kaliif and others added 13 commits March 1, 2024 11:06
Changes metadata.csv format in download and adds 'upload_name' attribute to tag model (issues 1343 and 1355)
- apo_file, bound_file, sdf_info and smiles_info merged into
all_aligned_structures
- added pdb_info field

NB! download_structures was requred to provide ligand_pdb as
well. This wasn't tracked previously, so I added field to
SiteObservation model. Meaning there's a migration and on stack
deployment data needs to be wiped and reuploaded
Updates to api/download_structures endpoint (issue 1326)
Added parsing directives to DownloadStructuresserializer
Consecutive numbering of observations under canon site
SiteObservatdion.tag split to tag and tag_prefix (1361)
@alanbchristie alanbchristie merged commit 4a1e452 into production Mar 5, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants