Skip to content

Commit 95be868

Browse files
SpliiTSpliiT
committed
Merge branch 'feat/blueprint_routes' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/blueprint_routes
2 parents bfc6ba5 + 57ca416 commit 95be868

File tree

7 files changed

+231
-87
lines changed

7 files changed

+231
-87
lines changed

‎.github/workflows/CD.yml‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,36 @@ name: CD
22

33
on:
44
push:
5-
branches: [ master, next ]
5+
branches: [master, next]
66

77
jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11-
- name: Checkout
12-
uses: actions/checkout@v4
13-
with:
14-
fetch-depth: 0
15-
token: ${{ secrets.TOKEN }}
16-
- name: Python Semantic Release
17-
uses: python-semantic-release/python-semantic-release@master
18-
id: semantic-release
19-
with:
20-
github_token: ${{ secrets.TOKEN }}
21-
- name: Build
22-
run: |
23-
python3 -m pip install --upgrade build
24-
python3 -m build
25-
- name: Upload
26-
if: steps.semantic-release.outputs.released == 'true'
27-
run: |
28-
python3 -m pip install twine
29-
python3 -m twine upload --repository pypi dist/* -u __token__ -p ${{ secrets.PYPI_TOKEN }}
30-
- name: Merge master -> next
31-
if: github.ref == 'ref/head/master'
32-
uses: devmasx/merge-branch@master
33-
with:
34-
type: now
35-
from_branch: master
36-
target_branch: next
37-
github_token: ${{ github.token }}
38-
11+
- name: Checkout
12+
uses: actions/checkout@v4
13+
with:
14+
fetch-depth: 0
15+
token: ${{ secrets.TOKEN }}
16+
- name: Python Semantic Release
17+
uses: python-semantic-release/python-semantic-release@master
18+
id: semantic-release
19+
with:
20+
github_token: ${{ secrets.TOKEN }}
21+
- name: Build
22+
run: |
23+
python3 -m pip install --upgrade build
24+
python3 -m build
25+
- name: Upload
26+
if: steps.semantic-release.outputs.released == 'true'
27+
run: |
28+
python3 -m pip install twine
29+
python3 -m twine upload --repository pypi dist/* -u __token__ -p ${{ secrets.PYPI_TOKEN }}
30+
- name: Merge master -> next
31+
if: github.ref == 'refs/heads/master'
32+
uses: devmasx/merge-branch@master
33+
with:
34+
type: now
35+
from_branch: master
36+
target_branch: next
37+
github_token: ${{ github.token }}

‎CHANGELOG.md‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,98 @@
22

33

44

5+
## v3.1.0 (2023-12-19)
6+
7+
### Unknown
8+
9+
* Merge pull request #56 from Geode-solutions/next
10+
11+
Next ([`645008b`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/645008ba5c8c74cefb0923ff8cf8c2647e4dfec1))
12+
13+
* Merge branch 'master' into next ([`4b640c3`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/4b640c31c59205d744ef3d19ae647277b91f9413))
14+
15+
16+
## v3.0.0-rc.12 (2023-12-19)
17+
18+
### Fix
19+
20+
* fix(workflows): refs/heads/master ([`a39a402`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/a39a4022e01c5ee8583565e9f901ec939381a86e))
21+
22+
23+
## v3.0.0-rc.11 (2023-12-18)
24+
25+
### Feature
26+
27+
* feat(functions): filter_geode_objects ([`d224d8f`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/d224d8f99b79abeee8fa49640c6b52a0395c7eb5))
28+
29+
* feat(list_geode_objects): test is_loadable
30+
31+
BREAKING CHANGE : arg extension -> file_absolute_path ([`241f60d`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/241f60d7a3b49661a31f7bbd3f816215881ba9a1))
32+
33+
### Unknown
34+
35+
* Merge pull request #55 from Geode-solutions/feat/is_loadable
36+
37+
Feat/is loadable ([`7cc9d3b`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/7cc9d3b640c88e105d3c4967df1a6aa7f5f24a5b))
38+
39+
* Merge branch 'next' into feat/is_loadable ([`1c1574d`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/1c1574de89b61efe1bea04ddf2f2ee964a471de4))
40+
41+
* Empty commit test ([`7ecca76`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/7ecca76f8257db3cc7c475926d99893012de2439))
42+
43+
44+
## v3.0.0 (2023-12-15)
45+
46+
### Unknown
47+
48+
* Merge pull request #53 from Geode-solutions/next
49+
50+
Next ([`f8b8784`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/f8b8784e0dccae63e66f1da0b306d5e6386069ce))
51+
52+
53+
## v3.0.0-rc.10 (2023-12-15)
54+
55+
### Fix
56+
57+
* fix(dependencies): update ecosystem ([`cbed29d`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/cbed29dbf0e195f23ef89f7798a155d2c33a56fe))
58+
59+
### Unknown
60+
61+
* Merge pull request #52 from Geode-solutions/chore/update_ecosystem
62+
63+
fix(dependencies): update ecosystem ([`eabfe89`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/eabfe89d98db21f0087f1ca4569ff695e05c9f99))
64+
65+
* Merge pull request #51 from Geode-solutions/revert-49-feat/is_loadable
66+
67+
Revert "Feat/is loadable" ([`d0f03a7`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/d0f03a788c892ea80431d3aff3dadf7f3755240f))
68+
69+
* Revert "Feat/is loadable" ([`2aab775`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/2aab7755049c33843cc120618f1a94e32a3429f3))
70+
71+
72+
## v3.0.0-rc.9 (2023-12-15)
73+
74+
### Feature
75+
76+
* feat(tests): strenghten unit tests 2 ([`9c9ab87`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/9c9ab87bbef54c6524bb26f57d60d8d644c0f8b1))
77+
78+
* feat(tests): strenghten unit tests ([`03b0a00`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/03b0a0055b39a0ceaf3863a7f9a9be1314fa6d06))
79+
80+
* feat(list_geode_objects): test is_loadable
81+
82+
BREAKING CHANGE : arg extension -> file_absolute_path ([`4af7868`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/4af78686c761c1abba86a02df39fc9a75e40e151))
83+
84+
### Unknown
85+
86+
* Merge pull request #49 from Geode-solutions/feat/is_loadable
87+
88+
Feat/is loadable ([`3ee5c1e`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/3ee5c1e3a44d5e9b151564603e89dacb4eff3112))
89+
90+
* update requirements ([`9066879`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/9066879e7b037794bbded4184fdb29765261ebc7))
91+
92+
* Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/is_loadable ([`2de6600`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/2de66004cc3acf735017f7aa41d985af9871bad3))
93+
94+
* update tests & deps ([`4fc793c`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/4fc793cdc1f791f30266706bfc05493f0ef87978))
95+
96+
597
## v3.0.0-rc.8 (2023-12-13)
698

799
### Feature
@@ -42,12 +134,18 @@ Feat/is saveable ([`1636622`](https://github.com/Geode-solutions/OpenGeodeWeb-Ba
42134

43135
BREAKING CHANGE: geode_objects_output_extensions returns a dict ([`1948edd`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/1948eddad186904c4aecc63ed0ecbfa6780fa1b7))
44136

137+
### Feature
138+
139+
* feat(geode_functions): is_loadable key & function ([`27ef421`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/27ef421b945da827c7d65705e6149b2052ce4378))
140+
45141
### Unknown
46142

47143
* Merge pull request #45 from Geode-solutions/feat/is_saveable
48144

49145
feat(functions): add send_file function ([`b1d53a4`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/b1d53a4ab280b74fb4e39a318d26ccd309f7dc68))
50146

147+
* update unit tests ([`78fefe1`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/78fefe13186b96c6e15be6f61441d69a62b15e0a))
148+
51149

52150
## v3.0.0-rc.5 (2023-12-06)
53151

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
55

66
[project]
77
name = "OpenGeodeWeb-Back"
8-
version = "3.0.0-rc.8"
8+
version = "3.1.0"
99
dynamic = ["dependencies"]
1010
authors = [
1111
{ name="Geode-solutions", email="[email protected]" },

‎requirements.in‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ geode-explicit
1010
geode-implicit
1111
geode-common
1212
jsonschema
13-
flask[async]
13+
Flask[async]
14+
Flask-Cors
1415
werkzeug

‎requirements.txt‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,17 @@ click==8.1.7
1717
colorama==0.4.6
1818
# via click
1919
flask[async]==3.0.0
20+
# via
21+
# -r requirements.in
22+
# flask-cors
23+
flask-cors==4.0.0
2024
# via -r requirements.in
21-
geode-background==7.4.8
25+
geode-background==7.4.9
2226
# via
2327
# geode-explicit
2428
# geode-implicit
2529
# geode-simplex
26-
geode-common==30.0.4
30+
geode-common==30.0.5
2731
# via
2832
# -r requirements.in
2933
# geode-background
@@ -32,24 +36,24 @@ geode-common==30.0.4
3236
# geode-numerics
3337
# geode-simplex
3438
# geode-viewables
35-
geode-conversion==5.1.6
39+
geode-conversion==5.1.7
3640
# via
3741
# geode-explicit
3842
# geode-implicit
39-
geode-explicit==4.3.9
43+
geode-explicit==4.3.10
4044
# via
4145
# -r requirements.in
4246
# geode-implicit
43-
geode-implicit==2.5.3
47+
geode-implicit==2.5.4
4448
# via -r requirements.in
45-
geode-numerics==4.2.2
49+
geode-numerics==4.2.3
4650
# via
4751
# -r requirements.in
4852
# geode-implicit
4953
# geode-simplex
50-
geode-simplex==6.2.9
54+
geode-simplex==6.3.0
5155
# via -r requirements.in
52-
geode-viewables==2.1.7
56+
geode-viewables==2.1.8
5357
# via -r requirements.in
5458
importlib-metadata==7.0.0
5559
# via flask
@@ -65,7 +69,7 @@ markupsafe==2.1.3
6569
# via
6670
# jinja2
6771
# werkzeug
68-
opengeode-core==14.10.2
72+
opengeode-core==14.10.3
6973
# via
7074
# -r requirements.in
7175
# geode-background
@@ -80,22 +84,22 @@ opengeode-core==14.10.2
8084
# opengeode-geosciencesio
8185
# opengeode-inspector
8286
# opengeode-io
83-
opengeode-geosciences==7.3.2
87+
opengeode-geosciences==7.3.3
8488
# via
8589
# -r requirements.in
8690
# geode-implicit
8791
# geode-viewables
8892
# opengeode-geosciencesio
89-
opengeode-geosciencesio==4.5.4
93+
opengeode-geosciencesio==4.5.5
9094
# via
9195
# -r requirements.in
9296
# geode-implicit
93-
opengeode-inspector==4.0.4
97+
opengeode-inspector==4.0.5
9498
# via
9599
# -r requirements.in
96100
# geode-explicit
97101
# geode-implicit
98-
opengeode-io==6.2.4
102+
opengeode-io==6.2.5
99103
# via
100104
# -r requirements.in
101105
# geode-implicit
@@ -115,4 +119,4 @@ werkzeug==3.0.1
115119
# -r requirements.in
116120
# flask
117121
zipp==3.17.0
118-
# via importlib-metadata
122+
# via importlib-metadata

0 commit comments

Comments
 (0)