Skip to content

dev -> master #128

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.

Sign up for GitHub

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

Merged
costowell merged 6 commits into from
Jan 30, 2026
Merged

dev -> master #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c194d6
Bump future from 0.18.2 to 1.0.0 in the pip group across 1 directory
dependabot[bot] Sep 22, 2025
95a8b76
Merge pull request #122 from ComputerScienceHouse/dependabot/pip/pip-…
costowell Sep 22, 2025
4410d01
Use setup.cfg as version source of truth
mxmeinhold Sep 24, 2025
cbf51cf
Merge pull request #123 from ComputerScienceHouse/version-bump
costowell Oct 19, 2025
afbecf2
fix dropzone links
BigSpaceships Jan 24, 2026
7208b04
Merge pull request #127 from ComputerScienceHouse/fix-dropzone
tallen42 Jan 28, 2026
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: 3 additions & 1 deletion gallery/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from os import environ as env
from setuptools.config.setupcfg import read_configuration

__version__ = "2.2.0"
config = read_configuration('setup.cfg')
__version__ = config["metadata"]["version"]

BUILD_REFERENCE = env.get("OPENSHIFT_BUILD_REFERENCE")
COMMIT_HASH = env.get("OPENSHIFT_BUILD_COMMIT")
Expand Down
4 changes: 2 additions & 2 deletions gallery/templates/view_dir.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% endblock %}

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

{% block extraFooter %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqtree/1.3.5/tree.jquery.min.js"></script>
<script src="https://rawgit.com/enyo/dropzone/master/dist/dropzone.js"></script>
<script src="https://unpkg.com/dropzone@5/dist/min/dropzone.min.js"></script>
<script>
$(function() {
populateDirTree();
Expand Down
2 changes: 1 addition & 1 deletion gallery/templates/view_filtered.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% endblock %}

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

Expand Down
16 changes: 8 additions & 8 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ ddtrace==3.2.1
decorator==4.4.2
defusedxml==0.7.1
Deprecated==1.2.18
dnspython==2.1.0
dnspython==2.6.1
envier==0.6.1
Flask==3.1.0
Flask==3.1.1
Flask-Migrate==2.3.1
Flask-pyoidc==3.14.3
Flask-SQLAlchemy==3.1.1
future==0.18.2
future==1.0.0
greenlet==3.1.1
gunicorn==23.0.0
idna==3.3
idna==3.7
imageio==2.4.0
importlib-metadata==4.8.1
importlib-resources==5.3.0
Expand All @@ -47,7 +47,7 @@ psycopg2-binary==2.9.10
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycparser==2.20
pycryptodomex==3.11.0
pycryptodomex==3.19.1
pydantic==2.10.6
pydantic-settings==2.8.1
pydantic_core==2.27.2
Expand All @@ -57,16 +57,16 @@ python-dateutil==2.8.2
python-dotenv==1.0.1
python-ldap==3.4.0
python-magic==0.4.15
requests==2.26.0
requests==2.32.4
s3transfer==0.10.4
six==1.16.0
SQLAlchemy==2.0.39
srvlookup==2.0.0
tqdm==4.62.3
typing_extensions==4.12.2
urllib3==1.26.7
urllib3==2.5.0
Wand==0.6.13
Werkzeug==3.1.3
wrapt==1.17.2
xmltodict==0.14.2
zipp==3.6.0
zipp==3.19.1