Skip to content

Commit 023866e

Browse files
authored
Merge pull request #128 from ComputerScienceHouse/develop
dev -> master
2 parents 817c783 + 7208b04 commit 023866e

4 files changed

Lines changed: 14 additions & 12 deletions

File tree

gallery/_version.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
from os import environ as env
2+
from setuptools.config.setupcfg import read_configuration
23

3-
__version__ = "2.2.0"
4+
config = read_configuration('setup.cfg')
5+
__version__ = config["metadata"]["version"]
46

57
BUILD_REFERENCE = env.get("OPENSHIFT_BUILD_REFERENCE")
68
COMMIT_HASH = env.get("OPENSHIFT_BUILD_COMMIT")

gallery/templates/view_dir.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% endblock %}
55

66
{% block extraHead %}
7-
<link rel="stylesheet" href="https://rawgit.com/enyo/dropzone/master/dist/dropzone.css">
7+
<link rel="stylesheet" href="https://unpkg.com/dropzone@5/dist/min/dropzone.min.css" type="text/css" />
88
<link href="https://mbraak.github.io/jqTree/jqtree.css" rel="stylesheet">
99
{% endblock %}
1010
{% block body %}
@@ -233,7 +233,7 @@ <h4 class="modal-title">Upload</h4>
233233

234234
{% block extraFooter %}
235235
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqtree/1.3.5/tree.jquery.min.js"></script>
236-
<script src="https://rawgit.com/enyo/dropzone/master/dist/dropzone.js"></script>
236+
<script src="https://unpkg.com/dropzone@5/dist/min/dropzone.min.js"></script>
237237
<script>
238238
$(function() {
239239
populateDirTree();

gallery/templates/view_filtered.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% endblock %}
55

66
{% block extraHead %}
7-
<link rel="stylesheet" href="https://rawgit.com/enyo/dropzone/master/dist/dropzone.css">
7+
<link rel="stylesheet" href="https://unpkg.com/dropzone@5/dist/min/dropzone.min.css" type="text/css" />
88
{% endblock %}
99
{% block body %}
1010

requirements.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ ddtrace==3.2.1
1717
decorator==4.4.2
1818
defusedxml==0.7.1
1919
Deprecated==1.2.18
20-
dnspython==2.1.0
20+
dnspython==2.6.1
2121
envier==0.6.1
22-
Flask==3.1.0
22+
Flask==3.1.1
2323
Flask-Migrate==2.3.1
2424
Flask-pyoidc==3.14.3
2525
Flask-SQLAlchemy==3.1.1
26-
future==0.18.2
26+
future==1.0.0
2727
greenlet==3.1.1
2828
gunicorn==23.0.0
29-
idna==3.3
29+
idna==3.7
3030
imageio==2.4.0
3131
importlib-metadata==4.8.1
3232
importlib-resources==5.3.0
@@ -47,7 +47,7 @@ psycopg2-binary==2.9.10
4747
pyasn1==0.4.8
4848
pyasn1-modules==0.2.8
4949
pycparser==2.20
50-
pycryptodomex==3.11.0
50+
pycryptodomex==3.19.1
5151
pydantic==2.10.6
5252
pydantic-settings==2.8.1
5353
pydantic_core==2.27.2
@@ -57,16 +57,16 @@ python-dateutil==2.8.2
5757
python-dotenv==1.0.1
5858
python-ldap==3.4.0
5959
python-magic==0.4.15
60-
requests==2.26.0
60+
requests==2.32.4
6161
s3transfer==0.10.4
6262
six==1.16.0
6363
SQLAlchemy==2.0.39
6464
srvlookup==2.0.0
6565
tqdm==4.62.3
6666
typing_extensions==4.12.2
67-
urllib3==1.26.7
67+
urllib3==2.5.0
6868
Wand==0.6.13
6969
Werkzeug==3.1.3
7070
wrapt==1.17.2
7171
xmltodict==0.14.2
72-
zipp==3.6.0
72+
zipp==3.19.1

0 commit comments

Comments
 (0)