Skip to content

Features/merge services #59

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 297 commits into from
Jan 19, 2024
Merged

Features/merge services #59

merged 297 commits into from
Jan 19, 2024

Conversation

@marcoooo
Copy link
Contributor

@marcoooo marcoooo commented Jan 18, 2024

Merged ensembl-metadata-service to api.
Should ease the pain of maintaining multiple repository and their quite entangled compatibility map.

aaneja and others added 30 commits March 17, 2022 16:35
Move tests directory
a8aaa68
update some uuids for testing
1a80674
@alisha17
Merge pull request #7 from Ensembl/make_nicer_inputs
7817d44 
Fix path issues and prep for deployment
update gitlab ci file
d93e03d
update gitlab ci file
da02515
Update gitlab ci
565920c
@alisha17
Merge pull request #8 from Ensembl/gitlab_ci
42bed4d 
update gitlab ci file env vars
update env vars
991799e
Update gitlab yml
8c5a70b
@alisha17
Merge pull request #9 from Ensembl/update_env_vars
11ce9ca 
update env vars
@alisha17
update gitlab ci for prod env
2443297
@alisha17
add changes for testing pipeline
6875c5c
@alisha17
add changes
7cf1623
@alisha17
Merge branch 'main' into add_production_config
36115a7
@ahc87
Remove scientific_parlance_name and add default ncbi_common_name
59635b1
@marcoooo
Merge pull request #10 from Ensembl/add_production_config
0767f21 
Add cluster prod config
@ahc87
Restore scientific_parlance_name in tests
0409658
@marcoooo
Merge pull request #11 from Ensembl/get-tests-working
dff56cf 
Changed tests configuration to run locally
@bilalebi
🚧 Push initial changes which are returning interesting results
231a3c2
@bilalebi
🚧 removed datasets_obj name level
0ec78c9
@bilalebi
🚧 fixed sql query and switched to Struct for dynamic fields
ca78973
@bilalebi
✨ add release version
6703795
@bilalebi
📝 remove comment
9d2b889
@bilalebi
📝 add genome_uuid to where statement
224c3f5
@ahc87
Add RPC method for getting datasets of a given type
b2fa1ba
@ahc87
Check for null data when creating dataset info
0274491
@bilalebi
📝 apply review suggestions
da06e0c
@bilalebi
📝 commit the auto-generated changes to the pb2 files
a4dac37
@ahc87
Change method name in client_examples
e15b749
@bilalebi
♻️ replace struct with nested message to get a cleaner response
a138c62
marcoooo and others added 17 commits November 13, 2023 10:37
@marcoooo
Revert to commits presents in main branch and related to PR Ensembl…
bf422ed 
…/ensembl-metadata-service#43
@marcoooo
Removed extra print from tests.
799b0ca
@marcoooo
Merge pull request #45 from Ensembl/fix_related_assemblies_count
878d218 
Fix related assemblies count and Thoas gRPC bug
@bilalebi
🐛 fix alternative_names containing None and add tests
9da703c
@bilalebi
Merge pull request #46 from Ensembl/hotfix/alternative_names
e3dbd0d 
Fix alternative_names containing None and add tests
@marcoooo
updated dependencies to retrieve what's new from ensembl-py.
c103c83 
Updated DBConnection inits to enable those params in configs.
@marcoooo
changed to version.
d56e169
@marcoooo
Merge pull request #47 from Ensembl/bugfixes/lost-mysql-connection
ae650d9 
updated dependencies to retrieve what's new from ensembl-py.
@bilalebi
fix genome query
cd849c8
@bilalebi
fix broken tests
a3570d8
@bilalebi
remove print statement
0678f73
@marcoooo
updated requirements on metadata-api version.
69564c7
@marcoooo
updated tests.
7faab38
@bilalebi
Merge pull request #48 from Ensembl/hotfix/optimize_genome_query
8760894 
Optimize Genome Query
@marcoooo
updated deps to released.
033ca68
@marcoooo
Merge pull request #49 from Ensembl/features/api-1-3-3
86ca999 
updated requirements on metadata-api version.
@marcoooo
Merged Conflicts from github repositories updates
6193df1
@marcoooo marcoooo marked this pull request as ready for review January 18, 2024 16:47
@marcoooo marcoooo self-assigned this Jan 18, 2024
@marcoooo marcoooo added the enhancement New feature or request label Jan 18, 2024
@marcoooo
Added dockerignore standard file
2444b4e 
update config not to expect pymysql by default.
Updated Dockerfile to not run as root
Updated setup to import the right version of protobuf
@marcoooo
Copy link
Contributor Author

marcoooo commented Jan 18, 2024 •
edited
Loading

I couldn't restrain myself in updating the Dockerfile to make it a bit better. It's now deployed on our / your cluster in tests namespaces, respectively ensprod-apps-test (prod) and ensembl-ensprod-test (apps).

@azangru Is there a way to test it on your environment?
Docker image should just be renamed from ensembl-metadata-service:xxx to ensembl-metadata-api:latest (or 2.0.0.dev1), no other changes required. Thanks!

@marcoooo marcoooo requested a review from azangru January 18, 2024 17:44
@marcoooo marcoooo merged commit e7a301a into main Jan 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dpopleton dpopleton dpopleton approved these changes

@bilalebi bilalebi Awaiting requested review from bilalebi

@azangru azangru Awaiting requested review from azangru

Assignees

@marcoooo marcoooo

Labels

enhancement New feature or request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@marcoooo @dpopleton @alisha17 @ahc87 @bilalebi @vinay-ebi