Merge remote-tracking branch 'origin/master' into django-4-0

ome · May 1, 2023 · 2727112 · 2727112
2 parents b394be4 + a6f8962
commit 2727112
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/omeroweb/settings.py b/omeroweb/settings.py
@@ -40,8 +40,8 @@
 import random
 import string
 from builtins import str as text
+import portalocker
 
-from omero_ext import portalocker
 from omero.util.concurrency import get_event
 from omeroweb.utils import sort_properties_to_tuple
 from omeroweb.connector import Server

diff --git a/setup.py b/setup.py
@@ -62,6 +62,7 @@ def read(fname):
         "omero-marshal>=0.7.0",
         "Pillow",
         "pytz",
+        "portalocker",
     ],
     include_package_data=True,
     tests_require=["pytest"],