Skip to content
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
repos:
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 25.12.0
rev: 26.1.0
hooks:
- id: black
args: [--target-version=py35]
Expand Down
1 change: 0 additions & 1 deletion omeroweb/api/api_marshal.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

"""Helper functions for views that handle object trees."""


from omero_marshal import get_encoder


Expand Down
2 changes: 0 additions & 2 deletions omeroweb/api/api_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@

"""Helper functions for views that handle object trees."""


from omero.rtypes import unwrap, wrap, rlong
from omero.sys import ParametersI
from . import api_settings

from .api_marshal import marshal_objects
from copy import deepcopy


MAX_LIMIT = max(1, api_settings.API_MAX_LIMIT)
DEFAULT_LIMIT = max(1, api_settings.API_LIMIT)

Expand Down
1 change: 0 additions & 1 deletion omeroweb/api/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
NotFoundError,
)


logger = logging.getLogger(__name__)


Expand Down
1 change: 1 addition & 0 deletions omeroweb/testlib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"""
Library for Web integration tests
"""

import json
import warnings

Expand Down
7 changes: 2 additions & 5 deletions omeroweb/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,10 @@ def redirect_urlpatterns():
regex = "^%s/" % label
urlpatterns.append(re_path(regex, include(urlmodule)))
except ImportError:
print(
"""Failed to import %s
print("""Failed to import %s
Please check if the app is installed and the versions of the app and
OMERO.web are compatible
"""
% urlmodule
)
""" % urlmodule)
raise
else:
logger.debug("Module not found: %s" % urlmodule)
Expand Down
1 change: 0 additions & 1 deletion omeroweb/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
from django.urls import reverse
from django.urls import NoReverseMatch


logger = logging.getLogger(__name__)


Expand Down
1 change: 0 additions & 1 deletion omeroweb/webadmin/custom_forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
from django.utils.encoding import smart_str
from django.core.validators import validate_email, EMPTY_VALUES


##################################################################
# Fields

Expand Down
8 changes: 2 additions & 6 deletions omeroweb/webclient/show.py
Original file line number Diff line number Diff line change
Expand Up @@ -970,9 +970,7 @@ def paths_to_tag(conn, experimenter_id=None, tagset_id=None, tag_id=None):
left outer join tagset.annotationLinks ttlink
left outer join ttlink.child.details.owner towner
where %s
""" % " and ".join(
where_clause
)
""" % " and ".join(where_clause)

tagsets = qs.projection(q, params, service_opts)
for e in tagsets:
Expand Down Expand Up @@ -1004,9 +1002,7 @@ def paths_to_tag(conn, experimenter_id=None, tagset_id=None, tag_id=None):
from TagAnnotation tag
left outer join tag.details.owner towner
where %s
""" % " and ".join(
where_clause
)
""" % " and ".join(where_clause)

tagsets = qs.projection(q, params, service_opts)
for e in tagsets:
Expand Down
Loading
Loading