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.

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

updated requirements files #177

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

updated requirements files #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42f9e6f
updated requirements files
marcoooo Apr 19, 2024
30ad9a9
4.4.7 started
marcoooo Apr 26, 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
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.4.6
4.4.7
6 changes: 3 additions & 3 deletions requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ensembl-prodinf-dbcopy@git+https://github.com/Ensembl/[email protected]
ensembl-prodinf-webhelp@git+https://github.com/Ensembl/[email protected]
ensembl-prodinf-masterdb@git+https://github.com/Ensembl/[email protected].6rc1
ensembl-prodinf-jira@git+https://github.com/Ensembl/[email protected].5
ensembl-metadata-admin@git+https://github.com/Ensembl/ensembl-metadata-admin.git@1.0.0a3
ensembl-prodinf-masterdb@git+https://github.com/Ensembl/[email protected].6
ensembl-prodinf-jira@git+https://github.com/Ensembl/[email protected].6
ensembl-metadata-admin@git+https://github.com/Ensembl/ensembl-metadata-admin.git@2.1.0a2
ensembl-prodinf-core~=2.0.8
Django~=3.2
django-jazzmin~=2.6
Expand Down
133 changes: 20 additions & 113 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,15 @@ attrs==23.2.0
# ensembl-metadata-admin
# jsonschema
# referencing
certifi==2023.11.17
certifi==2024.2.2
# via
# -r requirements.in
# ensembl-metadata-admin
# ensembl-metadata-api
# ensembl-prodinf-core
# requests
cffi==1.16.0
# via cryptography
charset-normalizer==3.3.2
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# requests
# via requests
coreapi==2.3.3
# via
# django-rest-swagger
Expand All @@ -46,7 +41,7 @@ defusedxml==0.7.1
# via jira
deprecation==2.1.0
# via ensembl-prodinf-core
django==3.2.24
django==3.2.25
# via
# -r requirements.in
# django-admin-inline-paginator
Expand Down Expand Up @@ -89,7 +84,7 @@ django-fernet-fields==0.6
# via ensembl-prodinf-jira
django-filter==23.5
# via ensembl-metadata-admin
django-jazzmin==2.6.0
django-jazzmin==2.6.2
# via -r requirements.in
django-js-asset==2.2.0
# via django-ckeditor
Expand Down Expand Up @@ -130,15 +125,8 @@ drf-yasg==1.20.3
# ensembl-prodinf-masterdb
elasticsearch==6.8.2
# via ensembl-prodinf-core
ensembl-hive @ git+https://github.com/Ensembl/ensembl-hive.git
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# ensembl-py
ensembl-metadata-admin @ git+https://github.com/Ensembl/[email protected]
ensembl-metadata-admin @ git+https://github.com/Ensembl/[email protected]
# via -r requirements.in
ensembl-metadata-api @ git+https://github.com/Ensembl/[email protected]
# via ensembl-metadata-admin
ensembl-prodinf-core==2.0.8
# via
# -r requirements.in
Expand All @@ -151,47 +139,23 @@ ensembl-prodinf-djcore==1.2.0a1
# ensembl-prodinf-jira
# ensembl-prodinf-masterdb
# ensembl-prodinf-webhelp
ensembl-prodinf-jira @ git+https://github.com/Ensembl/[email protected].5
ensembl-prodinf-jira @ git+https://github.com/Ensembl/[email protected].6
# via -r requirements.in
ensembl-prodinf-masterdb @ git+https://github.com/Ensembl/[email protected].6rc1
ensembl-prodinf-masterdb @ git+https://github.com/Ensembl/[email protected].6
# via -r requirements.in
ensembl-prodinf-webhelp @ git+https://github.com/Ensembl/[email protected]
# via -r requirements.in
ensembl-py @ git+https://github.com/Ensembl/[email protected]
# via
# ensembl-metadata-admin
# ensembl-metadata-api
exceptiongroup==1.2.0
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# pytest
greenlet==3.0.3
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# sqlalchemy
grpcio==1.60.0
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# grpcio-tools
grpcio-tools==1.60.0
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# via sqlalchemy
gunicorn==20.1.0
# via -r requirements.in
idna==3.6
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# requests
importlib-metadata==7.0.1
idna==3.7
# via requests
importlib-metadata==7.0.2
# via
# ensembl-metadata-admin
# markdown
importlib-resources==6.1.2
importlib-resources==6.3.0
# via
# ensembl-metadata-admin
# jsonschema
Expand All @@ -201,11 +165,6 @@ inflection==0.5.1
# drf-spectacular
# drf-yasg
# ensembl-metadata-admin
iniconfig==2.0.0
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# pytest
itypes==1.2.0
# via coreapi
jinja2==3.1.3
Expand All @@ -222,62 +181,32 @@ jsonschema-specifications==2023.12.1
# jsonschema
kombu==5.0.2
# via ensembl-prodinf-core
markdown==3.5.2
markdown==3.6
# via ensembl-metadata-admin
markupsafe==2.1.5
# via jinja2
mysqlclient==2.1.1
# via
# -r requirements.in
# ensembl-metadata-admin
# ensembl-metadata-api
# ensembl-prodinf-dbcopy
# ensembl-py
oauthlib==3.2.2
# via requests-oauthlib
openapi-codec==1.3.2
# via django-rest-swagger
packaging==23.2
packaging==24.0
# via
# deprecation
# drf-yasg
# ensembl-metadata-admin
# ensembl-metadata-api
# jira
# pytest
pkgutil-resolve-name==1.3.10
# via
# ensembl-metadata-admin
# jsonschema
pluggy==1.3.0
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# pytest
protobuf==4.25.2
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# grpcio-tools
pycparser==2.21
pycparser==2.22
# via cffi
pytest==7.4.4
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# ensembl-py
# pytest-dependency
pytest-dependency==0.5.1
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# ensembl-py
python-dotenv==0.19.2
# via
# -r requirements.in
# ensembl-metadata-admin
# ensembl-metadata-api
# ensembl-py
# via -r requirements.in
pytz==2024.1
# via
# django
Expand All @@ -287,9 +216,7 @@ pyyaml==6.0.1
# via
# drf-spectacular
# ensembl-metadata-admin
# ensembl-metadata-api
# ensembl-prodinf-core
# ensembl-py
referencing==0.33.0
# via
# ensembl-metadata-admin
Expand All @@ -298,14 +225,11 @@ referencing==0.33.0
requests==2.31.0
# via
# coreapi
# ensembl-metadata-admin
# ensembl-metadata-api
# ensembl-prodinf-core
# ensembl-py
# jira
# requests-oauthlib
# requests-toolbelt
requests-oauthlib==1.3.1
requests-oauthlib==2.0.0
# via jira
requests-toolbelt==1.0.0
# via jira
Expand All @@ -326,35 +250,19 @@ six==1.16.0
# django-jsonfield
# ensembl-metadata-admin
# ensembl-prodinf-core
sqlalchemy==1.4.51
sqlalchemy==1.4.52
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# ensembl-prodinf-core
# ensembl-py
# sqlalchemy-utils
sqlalchemy-utils==0.38.3
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# ensembl-prodinf-core
# ensembl-py
# via ensembl-prodinf-core
sqlparse==0.4.4
# via
# -r requirements.in
# django
# ensembl-metadata-admin
tomli==2.0.1
# via
# ensembl-metadata-admin
# ensembl-metadata-api
# pytest
tqdm==4.66.2
# via django-mirage-field
types-pymysql==1.1.0.1
# via
# ensembl-metadata-admin
# ensembl-metadata-api
typing-extensions==4.10.0
# via
# asgiref
Expand All @@ -372,12 +280,11 @@ urllib3==1.26.18
# -r requirements.in
# elasticsearch
# ensembl-metadata-admin
# ensembl-metadata-api
# ensembl-prodinf-core
# requests
vine==5.1.0
# via amqp
zipp==3.17.0
zipp==3.18.1
# via
# ensembl-metadata-admin
# importlib-metadata
Expand Down
1 change: 0 additions & 1 deletion src/ensembl/production/portal/views/css.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ class AppCssView(DetailView):
slug_url_kwarg = "app_prod_url"

def get(self, request, *args, **kwargs):
print(kwargs)
return super().get(request, *args, **kwargs)

def get_object(self, queryset=None):
Expand Down
4 changes: 2 additions & 2 deletions src/production_services/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@
'production': env.db('PRODUCTION_DB_URL', default='mysql://[email protected]:3306/ensembl_production'),
'website': env.db('WEBHELP_DB_URL', default='mysql://[email protected]:3306/ensembl_website'),
'dbcopy': env.db('DBCOPY_DB_URL', default='mysql://[email protected]:3306/ensembl_db_copy'),
'metadata': env.db('METADATA_DB_URL', default='mysql://[email protected]:3306/ensembl_genome_metadata'),
'ncbi': env.db('NCBI_DB_URL', default='mysql://[email protected]:3306/ncbi_taxonomy'),
'metadata': env.db('METADATA_DB_URL', default='mysql://[email protected]:3306/marco_ensembl_genome_metadata'),
'ncbi': env.db('NCBI_DB_URL', default='mysql://[email protected]:3306/marco_ncbi_taxonomy'),
}

DATABASE_ROUTERS = [
Expand Down