Skip to content
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.

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

Next #189

Merged
merged 38 commits into from
Sep 26, 2023
Merged

Next #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
6b0dc18
add docker squash
JulienChampagnol Apr 4, 2023
a71eb5a
retrigger run
JulienChampagnol Apr 4, 2023
7ac2a3c
add branch protection
JulienChampagnol Apr 4, 2023
fa23613
Merge branch 'master' of https://github.com/Geode-solutions/Geode-Bac…
JulienChampagnol May 5, 2023
2f4ec8a
fix : move generated directory in upload folder (#129)
JulienChampagnol May 5, 2023
cab0165
PR to develop (#130)
BotellaA May 5, 2023
5c74379
Feature/error handling (#124)
JulienChampagnol May 9, 2023
4644ad4
Feature/crs (#131)
JulienChampagnol Jun 6, 2023
2ce4fdc
Fix/secure unit tests (#157)
JulienChampagnol Jul 31, 2023
710fac6
Feature refactoring (#162)
JulienChampagnol Aug 9, 2023
f8b65f8
Feature workflows (#164)
Clemamolette Aug 22, 2023
8a531e8
Update port 5000
JulienChampagnol Aug 25, 2023
901c4c8
test config
JulienChampagnol Aug 25, 2023
b046670
remove ID from url_prefix
JulienChampagnol Aug 25, 2023
7c074e3
remove ID in tests
JulienChampagnol Aug 25, 2023
e675169
Feature add viewers (#165)
Clemamolette Aug 26, 2023
b45b3b1
better implicit workflow (#171)
BotellaA Sep 1, 2023
d528723
add log
BotellaA Sep 1, 2023
72daaa4
remove implicit surfaces
BotellaA Sep 1, 2023
a8f7bf8
update implicit points
BotellaA Sep 3, 2023
bd92f7b
update requirements
BotellaA Sep 3, 2023
d4e7c4c
update simplex
BotellaA Sep 4, 2023
4db033a
fix tests
BotellaA Sep 4, 2023
791fac6
update explicit
BotellaA Sep 6, 2023
8a76be6
fix tests
BotellaA Sep 6, 2023
d5b162f
update explicit
BotellaA Sep 6, 2023
03d1ae5
add sharp section
BotellaA Sep 7, 2023
d6925a9
update data
BotellaA Sep 7, 2023
19bdf56
fix tests
BotellaA Sep 7, 2023
12f991e
Merge branch 'master' into develop
BotellaA Sep 7, 2023
4d20d94
fix tests
BotellaA Sep 7, 2023
5a4d4f9
update to next branch convention
JulienChampagnol Sep 20, 2023
3cf33c7
image_name: 'website-back'
JulienChampagnol Sep 20, 2023
cdfa696
/website/createbackend
JulienChampagnol Sep 26, 2023
6643725
update requirements
JulienChampagnol Sep 26, 2023
3271008
Merge branch 'master' into next
JulienChampagnol Sep 26, 2023
3fc2dbd
fix tests
JulienChampagnol Sep 26, 2023
985ad34
Merge branch 'next' of https://github.com/Geode-solutions/Geode-BackE…
JulienChampagnol Sep 26, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/Branch-protection.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ jobs:
check-branch-protection:
uses: Geode-solutions/actions/.github/workflows/branch-protection.yml@master
with:
branch_from: 'develop'
branch_from: 'next'
branch_to: 'master'
2 changes: 1 addition & 1 deletion .github/workflows/CD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
needs: test
uses: Geode-solutions/actions/.github/workflows/docker-build-squash-push.yml@master
with:
image_name: 'geode-backend'
image_name: 'website-back'
tag: ${{ github.ref_name }}
secrets:
TOKEN: ${{secrets.GITHUB_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/udpdate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
if: steps.update.outputs.update == 'true'
with:
source_branch: version-update
destination_branch: develop
destination_branch: next
pr_reviewer: JulienChampagnol
github_token: ${{ secrets.TOKEN }}

2 changes: 1 addition & 1 deletion app.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def handle_exception(e):
return response


@app.route("/tools/createbackend", methods=["POST"])
@app.route("/website/createbackend", methods=["POST"])
def create_backend():
return flask.make_response({"ID": str("123456")}, 200)

Expand Down
36 changes: 21 additions & 15 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile requirements.in
Expand All @@ -10,44 +10,48 @@ blinker==1.6.2
# via flask
click==8.1.7
# via flask
colorama==0.4.6
# via click
flask[async]==2.3.3
# via
# -r requirements.in
# flask-cors
flask-cors==4.0.0
# via -r requirements.in
geode-background==7.3.7
geode-background==7.4.0
# via
# geode-explicit
# geode-implicit
# geode-simplex
geode-common==26.2.1
geode-common==26.3.0
# via
# -r requirements.in
# geode-background
# geode-explicit
# geode-implicit
# geode-simplex
# geode-viewables
geode-conversion==5.0.14
geode-conversion==5.1.0
# via
# geode-explicit
# geode-implicit
geode-explicit==4.2.1
geode-explicit==4.3.0
# via
# -r requirements.in
# geode-implicit
geode-implicit==2.2.2
geode-implicit==2.3.0
# via -r requirements.in
geode-numerics==3.0.11
geode-numerics==3.1.0
# via
# -r requirements.in
# geode-implicit
# geode-simplex
geode-simplex==6.1.7
geode-simplex==6.2.0
# via -r requirements.in
geode-viewables==2.0.5
geode-viewables==2.1.0
# via opengeodeweb-back
importlib-metadata==6.8.0
# via flask
itsdangerous==2.1.2
# via flask
jinja2==3.1.2
Expand All @@ -56,7 +60,7 @@ markupsafe==2.1.3
# via
# jinja2
# werkzeug
opengeode-core==14.6.4
opengeode-core==14.8.0
# via
# -r requirements.in
# geode-background
Expand All @@ -72,7 +76,7 @@ opengeode-core==14.6.4
# opengeode-inspector
# opengeode-io
# opengeodeweb-back
opengeode-geosciences==7.1.8
opengeode-geosciences==7.2.0
# via
# -r requirements.in
# geode-explicit
Expand All @@ -81,20 +85,20 @@ opengeode-geosciences==7.1.8
# opengeode-geosciencesio
# opengeode-inspector
# opengeodeweb-back
opengeode-geosciencesio==4.4.0
opengeode-geosciencesio==4.5.0
# via
# -r requirements.in
# geode-explicit
# geode-implicit
# opengeode-inspector
# opengeodeweb-back
opengeode-inspector==3.0.11
opengeode-inspector==3.1.0
# via
# -r requirements.in
# geode-explicit
# geode-implicit
# opengeodeweb-back
opengeode-io==6.1.1
opengeode-io==6.2.0
# via
# -r requirements.in
# geode-explicit
Expand All @@ -106,9 +110,11 @@ opengeodeweb-back==0.0.16
# via -r requirements.in
python-dotenv==1.0.0
# via -r requirements.in
typing-extensions==4.7.1
typing-extensions==4.8.0
# via asgiref
werkzeug==2.3.7
# via
# -r requirements.in
# flask
zipp==3.17.0
# via importlib-metadata
2 changes: 1 addition & 1 deletion tests/test_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def test_root(client):


def test_createbackend(client):
response = client.post("/tools/createbackend")
response = client.post("/website/createbackend")
assert response.status_code == 200
ID = response.json["ID"]
assert ID == "123456"
Expand Down