diff --git a/.github/workflows/Branch-protection.yml b/.github/workflows/Branch-protection.yml index 0bfa6a4..c18d3a6 100644 --- a/.github/workflows/Branch-protection.yml +++ b/.github/workflows/Branch-protection.yml @@ -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' diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 475f9c3..45fe2fe 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -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}} diff --git a/.github/workflows/udpdate.yml b/.github/workflows/udpdate.yml index a4c07ef..d01a24e 100644 --- a/.github/workflows/udpdate.yml +++ b/.github/workflows/udpdate.yml @@ -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 }} \ No newline at end of file diff --git a/app.py b/app.py index 6d8a09e..efb9199 100644 --- a/app.py +++ b/app.py @@ -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) diff --git a/requirements.txt b/requirements.txt index c34af21..578abf2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 @@ -10,18 +10,20 @@ 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 @@ -29,25 +31,27 @@ geode-common==26.2.1 # 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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/tests/test_functions.py b/tests/test_functions.py index 216925d..b4f3c67 100644 --- a/tests/test_functions.py +++ b/tests/test_functions.py @@ -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"