Skip to content

Commit 6492fa9

Browse files
Merge pull request #14 from Geode-solutions/next
Next
2 parents 7fe2621 + 1893dc3 commit 6492fa9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1576
-126
lines changed

.dockerignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/workflows/CD.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: CD
2+
3+
on:
4+
push:
5+
branches: [master, next, json_import_viewer]
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
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 PYPI
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: Setup NODE
31+
uses: actions/setup-node@v3
32+
with:
33+
registry-url: "https://registry.npmjs.org"
34+
node-version: "20.x"
35+
- name: Upload NPM
36+
if: steps.semantic-release.outputs.released == 'true'
37+
run: |
38+
pwd
39+
cd ${{ github.workspace }}
40+
npm i
41+
npm run json
42+
jq '.version="${{steps.semantic-release.outputs.version}}"' package.json > temp && mv temp package.json
43+
cat package.json
44+
npm publish
45+
env:
46+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
47+
- name: Merge master -> next
48+
if: github.ref == 'refs/heads/master'
49+
uses: devmasx/merge-branch@master
50+
with:
51+
type: now
52+
from_branch: master
53+
target_branch: next
54+
github_token: ${{ github.token }}

.github/workflows/docker-images.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@ env/
44
venv/
55
.vscode/
66
__pycache__/
7+
.env
78
data/
9+
/node_modules
10+
latest_logs
11+
schemas.json

.pypirc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[distutils]
2+
index-servers = pypi
3+
4+
[pypi]
5+
username = __token__
6+
password = <PyPI token>

CHANGELOG.md

Lines changed: 210 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,210 @@
1+
# CHANGELOG
2+
3+
4+
5+
## v0.1.0-rc.2 (2024-03-07)
6+
7+
### Fix
8+
9+
* fix(dependencies): add forgotten dependencies ([`8426ea4`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/8426ea49d0e5b97a42c37292b2e3c48afde27455))
10+
11+
### Unknown
12+
13+
* Merge pull request #15 from Geode-solutions/fix/dependencies
14+
15+
Fix/dependencies ([`4be8888`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/4be888818c48996ad5634306c43016c8bebec1ea))
16+
17+
* args ([`df57ea2`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/df57ea2431743c30acdec5a695488c9803a8f39e))
18+
19+
* cleanup code 2 ([`9721838`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/9721838b87944cd498851dd11c4664b4e0fa5b9a))
20+
21+
* cleanup code ([`94516bd`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/94516bdc2e92701531f04d3b04b94b34388c0506))
22+
23+
* remove log ([`c75ef6f`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/c75ef6f4ff183152eadaa6c6eb7700f126acb1f6))
24+
25+
* save ([`bd25d0f`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/bd25d0f1eea38f90f2728f6fbcb84de80e57fe21))
26+
27+
* CC Attribution ([`f27d64c`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/f27d64cf63208bb67e67958d119c14ba883dd735))
28+
29+
* Merge pull request #13 from Geode-solutions/feat/unit_tests
30+
31+
Feat/unit tests ([`48e800f`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/48e800fdac30485df0a9a252be9aff6ff90bfa34))
32+
33+
* fix protocols self.render() ([`b2bbc8c`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/b2bbc8c4d2a715d385b084cb4ba43212ef4e3ff4))
34+
35+
* remove unused datas ([`212930c`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/212930c5dda15ef51a0f2fd8a8dc7f83391569a5))
36+
37+
* delete penguin ([`ddb87c6`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/ddb87c6971afe104855c92549a8331c2f4e39e1b))
38+
39+
* cleanup ([`41e5ac1`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/41e5ac11e16d3f1491a0f4ddd0425241221812cf))
40+
41+
* full from next ([`0e6316d`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/0e6316d136e3f167454802f938714959444aa67d))
42+
43+
44+
## v0.1.0-rc.1 (2024-03-05)
45+
46+
### Chore
47+
48+
* chore(licence): happy new year 2024 ([`a69cefe`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/a69cefe053e43a170db48ea31bbc3619feb49bc6))
49+
50+
### Feature
51+
52+
* feat(schemas): remove dockerfile + a few changes ([`e81296a`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/e81296af2510c975c1d98034f269a5c94e4b89f5))
53+
54+
* feat(schemas): test2 ([`53dfa45`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/53dfa45953b098f8ecda5d8773e37fe064b4e7e3))
55+
56+
* feat(schemas): test ([`6088534`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/6088534e990f44559575f2d4631bc731210e2243))
57+
58+
* feat(unit tests): run server ([`11291b8`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/11291b8e808e52e1f4e6d0ab11b739ffd1542ecb))
59+
60+
* feat(delete_object_pipeline): add rpc
61+
62+
Enables an object to be deleted from the viewer ([`5a4df6a`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/5a4df6a5d20451491fe27d89886459d9a38f78cd))
63+
64+
### Fix
65+
66+
* fix(schemas): delete image docker ([`ebd416b`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/ebd416b5eceaecfce61d3c5e136cc3d6ed36184b))
67+
68+
* fix(license): add copyleft file ([`a0cfd33`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/a0cfd3335e0b12913947917b631b5e13889a9107))
69+
70+
### Unknown
71+
72+
* Merge pull request #12 from Geode-solutions/json_import_viewer
73+
74+
Json import viewer ([`cd3b4a0`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/cd3b4a0b8e564b81d15dafac82469c9b4ac974d3))
75+
76+
* test_get_point_position ([`c244ca4`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/c244ca461385d2ad212496cc4ca945ea98c45e96))
77+
78+
* Add datas ([`b704167`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/b70416763096d0b999a5b0c21ba93cc4c524f5f1))
79+
80+
* test_apply_textures working ([`07e9ed7`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/07e9ed736246ddf56907d7e6a40a2be3321ff548))
81+
82+
* delete ([`b980258`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/b9802586c302af7e1248eae71c78848193b8f2d6))
83+
84+
* tests ([`7268b09`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/7268b09f82d820402a7f7a6e8733bb402510aaad))
85+
86+
* log ([`8d8a8d5`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/8d8a8d55aabdfda90a88db160c00179b867652e8))
87+
88+
* move json imports ([`f6e3414`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/f6e3414687bb171f80561c04972c6210fecb830f))
89+
90+
* remove dockerignore ([`ea38690`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/ea386903ac824235764b36e5b38fcb299557ccc1))
91+
92+
* edit generate_schemas ([`8a9ddc2`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/8a9ddc2bca30d8ec58af76fa99c1823cb765c99d))
93+
94+
* test ([`1c878be`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/1c878be022ab96cffb7d146f38ffbd5241d264d2))
95+
96+
* fix schemas ([`4da951a`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/4da951a4e1bc11ad3468cecfc00dda94d36f7428))
97+
98+
* remove print ([`954d2c5`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/954d2c53decbcc5cf3419d82263806e63f94357d))
99+
100+
* shemas rpc&#39;s ([`e45df6a`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/e45df6a560a5a8d087f72ad6d1070ba003b8f665))
101+
102+
* added new path into the dockerfile ([`9ce3c0c`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/9ce3c0cf5f3d143ed6fd10cf4815b80c834d2cfe))
103+
104+
* updates json files ([`415f263`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/415f2630ad2053b51e688b46c133c0e714b16698))
105+
106+
* updates json files ([`da04546`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/da0454656e505f52d3b3570fbb5eb3655baee3c7))
107+
108+
* schemas ([`1f62048`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/1f62048fe00335b7d34c298a09e0c0729b7f2cb2))
109+
110+
* test ([`c01871b`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/c01871b30b7916f057dd36d80a9fc1157611f07a))
111+
112+
* route becomes rpc ([`6bacedb`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/6bacedb228f2cda86a8ea093e82dcfb84558ca42))
113+
114+
* rpc changes ([`ceefe04`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/ceefe04853f4ce96ea7465065a27e0ea3b501758))
115+
116+
* dynamic args ([`a40af27`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/a40af270486d894677ea1cf14a6b4b58acaf6edb))
117+
118+
* import json ([`1922ae3`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/1922ae3887db7a2a4e8c52b7c6b3282c5932bfb2))
119+
120+
* dotenv ([`b4fd9a7`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/b4fd9a7f2a230589219e11af57354b67e1d18771))
121+
122+
* os.mkdir(DATA_FOLDER_PATH) ([`dcf7d15`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/dcf7d156310c4aacb2f186a7fe87bdbdf10da79a))
123+
124+
* test_delete_object_pipeline ([`99751e6`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/99751e6de5f75b164185d74a3c54e68aca83f2db))
125+
126+
* fix some tests ([`75c1ed4`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/75c1ed4d8192feb080586acf9ab3fe59c70cb07b))
127+
128+
* clean config ([`6013ae8`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/6013ae8014319a1c170051ee2c2ea574b6eb123f))
129+
130+
* ENV variables ([`a3c104a`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/a3c104a5e209585791a84e92a8d9297788e1c201))
131+
132+
* save create_object_pipeline fail ([`5bb82c0`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/5bb82c02f74d7de349701d9ea7c468ca41067db2))
133+
134+
* class tests ([`f599345`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/f599345018e4aee08bc5a433a57cf47995c7b04a))
135+
136+
* tests ([`bd78c83`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/bd78c83ff6ffe10a9131a0f960b03505995d6781))
137+
138+
* unit tests ([`bd661a8`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/bd661a86445a1442e55e66eae5be7b8c7f2cb8fc))
139+
140+
* import schemas ([`aecdf1e`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/aecdf1e643ed8bf1b53eeb43dc894a9344d245be))
141+
142+
* rename vtkw_server.py ([`31a0265`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/31a0265c4b8786a0007bdf39a21f1d495e841703))
143+
144+
* schemas ([`ac2abe3`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/ac2abe3b392cf91200fe69c94d96cfd5f18e0dc0))
145+
146+
* Merge pull request #10 from Geode-solutions/next
147+
148+
Next ([`7fe2621`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/7fe2621e30cc9d38d3acf60cff61e16946be608f))
149+
150+
* Merge pull request #9 from Geode-solutions/chore/update_licence
151+
152+
Chore/update licence ([`6ab1ce7`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/6ab1ce7eb6c6234bb7a6f74567e90b4cb5190b9b))
153+
154+
* Merge pull request #7 from Geode-solutions/next
155+
156+
Next ([`708f7b0`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/708f7b092c8cac96893b38046ad20a26155c2ff9))
157+
158+
* Merge pull request #6 from Geode-solutions/feat_delete_object_pipeline
159+
160+
Feat delete object pipeline ([`364da90`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/364da90a845d1d7549ba748e521cc43f7c3a321d))
161+
162+
* revert .dockerignore ([`a4d4454`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/a4d4454d8cd4ffdabfd6d3fce4e48ae33772f5de))
163+
164+
* image_name: &#39;opengeodeweb-viewer&#39; ([`129f762`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/129f762db2bab2eabbf1c089835039208916a647))
165+
166+
* Merge pull request #5 from Geode-solutions/next
167+
168+
Next ([`5ee9742`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/5ee97423d576dd2c393fafe5b35726dce2568503))
169+
170+
* Merge pull request #4 from Geode-solutions/add_copyleft
171+
172+
fix(license): add copyleft file ([`8185c9d`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/8185c9d8ac096f2db6b44945b3b79ce6615a9c0b))
173+
174+
* Merge pull request #3 from Geode-solutions/next
175+
176+
Next ([`6f6d6c6`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/6f6d6c63ee268adb731291daa2eab434368d94c6))
177+
178+
* update data and attributes ([`dc1c26d`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/dc1c26d0d0b0990242ae7cc77a8e0484dc276860))
179+
180+
* no marker interaction ([`d1863ba`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/d1863ba610d29f0617c94ebce38419903ce46889))
181+
182+
* add marker ([`4bf740c`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/4bf740ced3679b92e9299b3458d8d4befde0a9a2))
183+
184+
* add vertex attribute ([`11f0774`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/11f077451b7b6b7a42f95ca15b8d3d028d45de9e))
185+
186+
* Merge pull request #2 from Geode-solutions/fix/pipeline
187+
188+
composite mapper ([`30c3004`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/30c3004efadb48cb87e1990d34a11c91a6437613))
189+
190+
* composite mapper ([`7e7d79c`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/7e7d79c1d8fd5b418f92fd641036ecbb65018426))
191+
192+
* update visibility ([`bf1652a`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/bf1652a885dc6c0e605c3da11a84d28afef5cb36))
193+
194+
* removed CD ([`4877be8`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/4877be897a022889b4ba15d181a3b8090d70e9a4))
195+
196+
* Initialisation ([`eeb263c`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/eeb263c85bbdd99bb711557e017cdcde53371db0))
197+
198+
* Merge pull request #1 from Geode-solutions/Clemamolette-patch-1
199+
200+
Update Branch-protection.yml ([`fb00bc3`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/fb00bc33bfa7815f4e6ce40a7f152648c8ec4ac1))
201+
202+
* Update Branch-protection.yml ([`5225e0a`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/5225e0abb283c9216ab8504822eacb2692e5e6a5))
203+
204+
* add vtk_protocols ([`7dc827f`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/7dc827f186033a348e66da463b33dd41e54e48df))
205+
206+
* Add all ([`1cb965b`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/1cb965bf9ff1f7b99298f96ac189b4835ae11f64))
207+
208+
* add branch protection ([`8ef784e`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/8ef784eb4174bb449b084df2ae2a4b5e33ccacb2))
209+
210+
* Initial commit ([`8293eb6`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/8293eb6973493de95e9f718554b42728d8271a06))

COPYLEFT

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22

33
VTK: BSD-3-Clause
44
Copyright (c) 2008-Present Ken Martin, Will Schroeder, Bill Lorensen.
5+
CC Attribution 2014-present Borgen

Dockerfile

Lines changed: 0 additions & 11 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# OpenGeodeWeb-Viewer
2+
23
OpenSource Python framework for remote visualisation

0 commit comments

Comments
 (0)