Skip to content

Commit 51189d6

Browse files
authored
Merge branch 'next' into feat/schemas
2 parents 62f0a15 + da2b977 commit 51189d6

File tree

6 files changed

+85
-18
lines changed

6 files changed

+85
-18
lines changed

CHANGELOG.md

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

33

44

5+
## v3.3.0-rc.1 (2024-01-17)
6+
7+
### Chore
8+
9+
* chore(licence): happy new year 2024 ([`da50872`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/da50872cdacaf45eb3560d8c60af23306402e01b))
10+
11+
### Feature
12+
13+
* feat(geode_objects): Add LightRegularGrid 2 & 3D ([`be319e4`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/be319e4bbcf09d3fe9fe271e8cced2c81d23557f))
14+
15+
### Unknown
16+
17+
* Merge pull request #62 from Geode-solutions/feat/LightRegularGrid
18+
19+
Feat/LightRegularGrid ([`8d129aa`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/8d129aa386fbf6e6a7162637b9b975c6ab22c4ae))
20+
21+
* upgrade dependencies, tests passing ([`cc9a25d`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/cc9a25ddd158dbcf9f3e61af66aced5064a9eee2))
22+
23+
* "is_viewable": True ([`b6a20e5`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/b6a20e54147ed8307d95ab50ee21974d9805e1d2))
24+
25+
* fix PointSet2D keys ([`2c7fee0`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/2c7fee0cb0e2210ef00d678aacf95e94661fbf4f))
26+
27+
* add back PointSet2D ([`ad304a9`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/ad304a91119f3ca963944cd2d425e25f3b52a99f))
28+
29+
* add test data ([`e647f36`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/e647f36546150dd8502174420cb4423cb44ac296))
30+
31+
* update dependencies ([`8f2f92f`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/8f2f92f1c64a8c32438cca48d25066bf9870f63b))
32+
33+
* ([`b8358b2`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/b8358b2516bf2ab5626ac3ba5ac796948c17b7f2))
34+
35+
* Merge pull request #61 from Geode-solutions/next
36+
37+
Next ([`e6deea0`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/e6deea04cb41dc3cc444bfbd78b3cbbb45c50091))
38+
39+
* Merge pull request #60 from Geode-solutions/chore/update_licence
40+
41+
chore(licence): happy new year 2024 ([`3969dda`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/3969dda9f1abc737c6f56bcc93999f18aa93ec12))
42+
43+
* ([`3368611`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/3368611b58a85683a769cae58b0cc0d51d178cee))
44+
45+
546
## v3.2.0 (2023-12-20)
647

748
### Unknown

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.2.0"
8+
version = "3.3.0-rc.1"
99
dynamic = ["dependencies"]
1010
authors = [
1111
{ name="Geode-solutions", email="[email protected]" },

requirements.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
asgiref==3.7.2
88
# via flask
9-
attrs==23.1.0
9+
attrs==23.2.0
1010
# via
1111
# jsonschema
1212
# referencing
@@ -20,12 +20,12 @@ flask[async]==3.0.0
2020
# flask-cors
2121
flask-cors==4.0.0
2222
# via -r requirements.in
23-
geode-background==7.4.9
23+
geode-background==7.6.1
2424
# via
2525
# geode-explicit
2626
# geode-implicit
2727
# geode-simplex
28-
geode-common==30.0.5
28+
geode-common==30.0.12
2929
# via
3030
# -r requirements.in
3131
# geode-background
@@ -34,38 +34,38 @@ geode-common==30.0.5
3434
# geode-numerics
3535
# geode-simplex
3636
# geode-viewables
37-
geode-conversion==5.1.7
37+
geode-conversion==5.1.8
3838
# via
3939
# geode-explicit
4040
# geode-implicit
41-
geode-explicit==4.3.10
41+
geode-explicit==4.3.11
4242
# via
4343
# -r requirements.in
4444
# geode-implicit
45-
geode-implicit==2.5.4
45+
geode-implicit==2.5.5
4646
# via -r requirements.in
47-
geode-numerics==4.2.3
47+
geode-numerics==4.2.5
4848
# via
4949
# -r requirements.in
5050
# geode-implicit
5151
# geode-simplex
52-
geode-simplex==6.3.0
52+
geode-simplex==6.3.4
5353
# via -r requirements.in
54-
geode-viewables==2.1.8
54+
geode-viewables==2.2.0
5555
# via -r requirements.in
5656
itsdangerous==2.1.2
5757
# via flask
58-
jinja2==3.1.2
58+
jinja2==3.1.3
5959
# via flask
60-
jsonschema==4.20.0
60+
jsonschema==4.21.0
6161
# via -r requirements.in
62-
jsonschema-specifications==2023.11.2
62+
jsonschema-specifications==2023.12.1
6363
# via jsonschema
6464
markupsafe==2.1.3
6565
# via
6666
# jinja2
6767
# werkzeug
68-
opengeode-core==14.10.3
68+
opengeode-core==14.12.1
6969
# via
7070
# -r requirements.in
7171
# geode-background
@@ -80,7 +80,7 @@ opengeode-core==14.10.3
8080
# opengeode-geosciencesio
8181
# opengeode-inspector
8282
# opengeode-io
83-
opengeode-geosciences==7.3.3
83+
opengeode-geosciences==7.3.4
8484
# via
8585
# -r requirements.in
8686
# geode-implicit
@@ -95,16 +95,16 @@ opengeode-inspector==4.0.5
9595
# -r requirements.in
9696
# geode-explicit
9797
# geode-implicit
98-
opengeode-io==6.2.5
98+
opengeode-io==6.3.0
9999
# via
100100
# -r requirements.in
101101
# geode-implicit
102102
# geode-viewables
103-
referencing==0.32.0
103+
referencing==0.32.1
104104
# via
105105
# jsonschema
106106
# jsonschema-specifications
107-
rpds-py==0.13.2
107+
rpds-py==0.17.1
108108
# via
109109
# jsonschema
110110
# referencing

src/opengeodeweb_back/geode_objects.py

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,32 @@ def geode_objects_dict():
122122
"save_viewable": g_v.save_viewable_hybrid_solid3D,
123123
"inspector": og_inspector.SolidMeshInspector3D,
124124
},
125+
"LightRegularGrid2D": {
126+
"input_factory": og.LightRegularGridInputFactory2D,
127+
"output_factory": og.LightRegularGridOutputFactory2D,
128+
"missing_files": og.check_light_regular_grid_missing_files2D,
129+
"is_loadable": og.is_light_regular_grid_loadable2D,
130+
"load": og.load_light_regular_grid2D,
131+
"is_saveable": og.is_light_regular_grid_saveable2D,
132+
"save": og.save_light_regular_grid2D,
133+
"is_model": False,
134+
"is_3D": False,
135+
"is_viewable": True,
136+
"save_viewable": g_v.save_viewable_light_regular_grid2D,
137+
},
138+
"LightRegularGrid3D": {
139+
"input_factory": og.LightRegularGridInputFactory3D,
140+
"output_factory": og.LightRegularGridOutputFactory3D,
141+
"missing_files": og.check_light_regular_grid_missing_files3D,
142+
"is_loadable": og.is_light_regular_grid_loadable3D,
143+
"load": og.load_light_regular_grid3D,
144+
"is_saveable": og.is_light_regular_grid_saveable3D,
145+
"save": og.save_light_regular_grid3D,
146+
"is_model": False,
147+
"is_3D": True,
148+
"is_viewable": True,
149+
"save_viewable": g_v.save_viewable_light_regular_grid3D,
150+
},
125151
"PointSet2D": {
126152
"input_factory": og.PointSetInputFactory2D,
127153
"output_factory": og.PointSetOutputFactory2D,

tests/data/test.og_lrgd2d

141 Bytes
Binary file not shown.

tests/data/test.og_lrgd3d

6.11 KB
Binary file not shown.

0 commit comments

Comments
 (0)