Skip to content

Commit 75ab1d1

Browse files
committed
Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into fix/database
2 parents d324cba + 1ff6974 commit 75ab1d1

File tree

9 files changed

+57
-35
lines changed

9 files changed

+57
-35
lines changed

.github/workflows/config.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"node": true
3+
}

.github/workflows/deploy.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ jobs:
77
deploy:
88
uses: Geode-solutions/actions/.github/workflows/py-deploy.yml@master
99
with:
10-
node: true
10+
repos: ${{ vars.REPOS }}
1111
secrets: inherit
12-

.github/workflows/schedule.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Schedule
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
branch:
7+
type: string
8+
default: "next"
9+
schedule:
10+
- cron: 0 23 * * *
11+
12+
jobs:
13+
schedule:
14+
uses: Geode-solutions/actions/.github/workflows/py-schedule.yml@master
15+
with:
16+
repos: ${{ vars.REPOS }}
17+
branch: ${{ inputs.branch || 'next' }}
18+
secrets: inherit

.github/workflows/test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ jobs:
1111
uses: Geode-solutions/actions/.github/workflows/py-test.yml@master
1212
with:
1313
repos: ${{ vars.REPOS }}
14-
node: true
1514
secrets: inherit

.github/workflows/test_pr.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ jobs:
99
uses: Geode-solutions/actions/.github/workflows/py-test-pr.yml@master
1010
with:
1111
repos: ${{ vars.REPOS }}
12-
node: true
1312
secrets: inherit

mypy.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[mypy]
22
strict = True
3-
files = src/
3+
files = src/
4+
disallow_untyped_decorators = False

requirements-internal.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
opengeodeweb-microservice

requirements.in

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
OpenGeode-core==15.24.2
2-
OpenGeode-IO==7.3.2
3-
OpenGeode-Inspector==6.7.0
4-
OpenGeode-Geosciences==9.2.2
5-
OpenGeode-GeosciencesIO==5.7.2
6-
Geode-Viewables==3.2.0
1+
opengeode-core==15.27.4
2+
opengeode-io==7.4.0
3+
opengeode-inspector==6.8.1
4+
opengeode-geosciences==9.4.1
5+
opengeode-geosciencesio==5.8.0
6+
geode-common==33.11.0
7+
geode-viewables==3.3.0
78
Flask[async]==3.0.3
89
Flask-Cors==6.0.1
910
werkzeug==3.0.3
10-
Flask-SQLAlchemy==3.1.1
11-
OpenGeodeWeb-Microservice
11+
Flask-SQLAlchemy==3.1.1

requirements.txt

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,45 @@
22
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
5-
# pip-compile --pre requirements.in
5+
# pip-compile --output-file=./requirements.txt --pre ./requirements-internal.in ./requirements.in
66
#
7-
asgiref==3.9.1
7+
asgiref==3.*,>=3.9.2
88
# via flask
9-
blinker==1.9.0
9+
blinker==1.*,>=1.9.0
1010
# via flask
11-
click==8.2.1
11+
click==8.*,>=8.3.0
1212
# via flask
13-
fastjsonschema==2.21.1
13+
fastjsonschema==2.*,>=2.21.1
1414
# via opengeodeweb-microservice
1515
flask[async]==3.0.3
1616
# via
1717
# -r requirements.in
1818
# flask
1919
# flask-cors
2020
# flask-sqlalchemy
21-
flask-cors==6.0.1
21+
flask-cors==6.*,>=6.0.1
2222
# via -r requirements.in
23-
flask-sqlalchemy==3.1.1
23+
flask-sqlalchemy==3.*,>=3.1.1
2424
# via
2525
# -r requirements.in
2626
# opengeodeweb-microservice
27-
geode-common==33.9.0
28-
# via geode-viewables
29-
geode-viewables==3.2.0
27+
geode-common==33.11.0
28+
# via
29+
# -r requirements.in
30+
# geode-viewables
31+
geode-viewables==3.3.0
3032
# via -r requirements.in
31-
greenlet==3.2.4
33+
greenlet==3.*,>=3.2.4
3234
# via sqlalchemy
33-
itsdangerous==2.2.0
35+
itsdangerous==2.*,>=2.2.0
3436
# via flask
35-
jinja2==3.1.6
37+
jinja2==3.*,>=3.1.6
3638
# via flask
37-
markupsafe==3.0.2
39+
markupsafe==3.*,>=3.0.3
3840
# via
3941
# jinja2
4042
# werkzeug
41-
opengeode-core==15.24.2
43+
opengeode-core==15.27.4
4244
# via
4345
# -r requirements.in
4446
# geode-common
@@ -47,27 +49,27 @@ opengeode-core==15.24.2
4749
# opengeode-geosciencesio
4850
# opengeode-inspector
4951
# opengeode-io
50-
opengeode-geosciences==9.2.2
52+
opengeode-geosciences==9.4.1
5153
# via
5254
# -r requirements.in
5355
# geode-viewables
5456
# opengeode-geosciencesio
55-
opengeode-geosciencesio==5.7.2
57+
opengeode-geosciencesio==5.8.0
5658
# via -r requirements.in
57-
opengeode-inspector==6.7.0
59+
opengeode-inspector==6.8.1
5860
# via -r requirements.in
59-
opengeode-io==7.3.2
61+
opengeode-io==7.4.0
6062
# via
6163
# -r requirements.in
6264
# geode-viewables
6365
# opengeode-geosciencesio
6466
opengeodeweb-microservice==1.*,>=1.0.0
65-
# via -r requirements.in
66-
sqlalchemy==2.0.43
67+
# via -r requirements-internal.in
68+
sqlalchemy==2.*,>=2.0.43
6769
# via
6870
# flask-sqlalchemy
6971
# opengeodeweb-microservice
70-
typing-extensions==4.15.0
72+
typing-extensions==4.*,>=4.15.0
7173
# via sqlalchemy
7274
werkzeug==3.0.3
7375
# via

0 commit comments

Comments
 (0)