Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
knabar committed Dec 12, 2023
1 parent dee1f0b commit 15bbcc0
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
6 changes: 2 additions & 4 deletions loris/webapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@
from configobj import ConfigObj
from werkzeug.http import parse_date, http_date

from werkzeug.wrappers import (
Request, Response, BaseResponse, CommonResponseDescriptorsMixin
)
from werkzeug.wrappers import Request, Response

from loris import constants, img, transforms
from loris.img_info import InfoCache
Expand Down Expand Up @@ -198,7 +196,7 @@ class StdOutFilter(logging.Filter):
def filter(self,record):
return 1 if record.levelno <= 20 else 0

class LorisResponse(BaseResponse, CommonResponseDescriptorsMixin):
class LorisResponse(Response):
'''Similar to Response, but IIIF Compliance Link and
Access-Control-Allow-Origin Headers are added and none of the
ETagResponseMixin, ResponseStreamMixin, or WWWAuthenticateMixin
Expand Down
16 changes: 8 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
# with MDID. If not, see http://www.gnu.org/licenses/.

Celery==5.2.7
Django==3.2.17
PyPDF2==1.27.5
Django==3.2.20
PyPDF2==1.27.9
amqp==5.0.9
attrs==21.4.0
b2sdk==1.14.1
Expand All @@ -30,8 +30,8 @@ click-didyoumean==0.3.0
click-plugins==1.1.1
click-repl==0.2.0
click==8.0.3
configobj==5.0.6
cryptography==39.0.1
configobj==5.0.8
cryptography==41.0.0
django-appconf==1.0.5
django-cas-ng==4.3.0
django-celery-results==2.4.0
Expand Down Expand Up @@ -63,13 +63,13 @@ pymysql==1.0.2
python-ldap==3.4.0
python-memcached
python-pptx==0.6.21
reportlab==3.6.5
requests==2.27.1
reportlab==4.0.8
requests==2.31.0
setuptools>=65.5.1
sqlparse==0.4.2
sqlparse==0.4.4
unicodecsv==0.14.1
vine==5.0.0
wcwidth==0.2.5
werkzeug==2.0.2
werkzeug==2.2.3
wfastcgi==3.0.0
wheel>=0.38.1
8 changes: 6 additions & 2 deletions rooibos/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ def main():
for path in paths:
sys.path.append(path)

if len(sys.argv) > 1 and sys.argv[1] == 'init':
args = sys.argv[:]
if len(args) > 1 and args[1] == 'init':
init()
sys.exit(0)

Expand All @@ -88,4 +89,7 @@ def main():
except ImportError:
print('Could not find MDID settings, have you run "mdid init"?')
sys.exit(1)
sys.exit(execute_from_command_line())

if args[1] == 'runserver_plus' and '--keep-meta-shutdown' not in args[2:]:
args.insert(2, '--keep-meta-shutdown')
sys.exit(execute_from_command_line(args))

0 comments on commit 15bbcc0

Please sign in to comment.