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

Hotfix/anaylses discrepancies #363

Merged
merged 19 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8, 3.9]
python-version: [3.9]

steps:
- uses: actions/checkout@v3
Expand All @@ -35,7 +35,7 @@ jobs:

- name: 🔧 - Install Dependencies
run: |
pip install install .[tests]
pip install .[tests]
pip freeze

- name: Check for unmigrated code changes
Expand Down
3 changes: 2 additions & 1 deletion emgapi/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1698,10 +1698,11 @@ def available(self, request=None):
- all | has access to public analyses
- authenticated | has access to public and private analyses they own

Filtered out analyses for SUPPRESSED samples
Filtered out analyses for SUPPRESSED studies
"""
query_filters = {
"all": [
Q(study__is_suppressed=False),
Q(study__is_private=False),
Q(run__is_private=False) | Q(assembly__is_private=False),
Q(is_suppressed=False),
Expand Down
2 changes: 1 addition & 1 deletion emgcli/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__: str = "2.4.47"
__version__: str = "2.4.48"
8 changes: 4 additions & 4 deletions emgcli/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@
},
},
'loggers': {
'emgena': {
'emgena': {
'handlers': ['notify'],
'level': 'INFO',
'propagate': False
},
'emgapianns.management.commands': {
'emgapianns.management.commands': {
'handlers': ['default', 'console'],
'level': 'INFO',
'propagate': False
Expand Down Expand Up @@ -339,8 +339,8 @@ def create_secret_key(var_dir):
if 'ena' in DATABASES and 'ena_pro' not in DATABASES:
DATABASES['ena_pro'] = DATABASES['ena']

# this is required to use the djang-mysql QS Hints
# https://django-mysql.readthedocs.io/en/latest/queryset_extensions.html?highlight=DJANGO_MYSQL_REWRITE_QUERIES#query-hints
# this is required to use the djang-mysql QS Hints
# https://django-mysql.readthedocs.io/en/latest/queryset_extensions.html?highlight=DJANGO_MYSQL_REWRITE_QUERIES#query-hints
DJANGO_MYSQL_REWRITE_QUERIES = True

try:
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ tests = [
"pytest==6.2.5",
"pytest-django==4.4.0",
"pytest-xdist==2.3.0",
"model_bakery==1.3.2",
"model_bakery==1.17.0",
"mock_services==0.3.1",
"mongomock==3.23.0",
"jsonapi-client==0.9.9",
"pytest-cov==2.12.1",
"pandas==1.3.2",
"pandas==2.2.1",
"responses==0.23.1",
"Faker==19.6.2",
]
Expand Down Expand Up @@ -117,7 +117,7 @@ max-line-length = 119
"""

[tool.bumpversion]
current_version = "2.4.47"
current_version = "2.4.48"

[[tool.bumpversion.files]]
filename = "emgcli/__init__.py"
2 changes: 1 addition & 1 deletion tests/webuploader/test_study_summary_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import pandas as pd
import pytest
from model_bakery import baker
from pandas.util.testing import assert_frame_equal
from pandas.testing import assert_frame_equal

from emgapianns.management.lib import study_summary_generator # noqa: E402

Expand Down
Loading