Skip to content

Commit

Permalink
Merge pull request #8 from Geode-solutions/next
Browse files Browse the repository at this point in the history
Next
  • Loading branch information
JulienChampagnol authored Jun 24, 2024
2 parents 83710d6 + 1d484a7 commit b83ac7e
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 19 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/CICD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.9"
python-version: "3.10"
- name: Test
run: |
pip install -r requirements.txt
pip install .
pip install pytest
pytest
build:
Expand Down
22 changes: 18 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
# CHANGELOG

## v0.1.1-rc.1 (2024-06-24)

### Fix

* fix(CICD): pip install . ([`5390d02`](https://github.com/Geode-solutions/GeodeApp-Back/commit/5390d0212722fe52cca1d49636ad8fe7f274fea4))

* fix(relative import): test with python 3.10 ([`c5a8093`](https://github.com/Geode-solutions/GeodeApp-Back/commit/c5a80931c431074f184a04355f5669f340a7d410))

* fix(relative import): fix all import bugs ([`79f1708`](https://github.com/Geode-solutions/GeodeApp-Back/commit/79f17084db965aeb2360fbc6bf10edefaa86bc1a))

* fix(relative import): bug in prod ([`06a53a7`](https://github.com/Geode-solutions/GeodeApp-Back/commit/06a53a744260c0bce89b955e06295940934e7353))

### Unknown

* Merge pull request #7 from Geode-solutions/fix/relative_import_bug

fix(relative import): bug in prod ([`2fdf4a5`](https://github.com/Geode-solutions/GeodeApp-Back/commit/2fdf4a5bcf4754999d4adea32549fe352ab7a838))

* ([`f179adb`](https://github.com/Geode-solutions/GeodeApp-Back/commit/f179adb2f985bdd27e067e41372de806abc84f97))

## v0.1.0 (2024-06-14)

Expand All @@ -10,7 +28,6 @@

Next ([`e4bd663`](https://github.com/Geode-solutions/GeodeApp-Back/commit/e4bd6636bd6740ebd51c3bd065b6908c7f478734))


## v0.1.0-rc.1 (2024-06-14)

### Feature
Expand All @@ -31,7 +48,6 @@ Fix ping and run command ([`e248223`](https://github.com/Geode-solutions/GeodeAp

* ([`7791832`](https://github.com/Geode-solutions/GeodeApp-Back/commit/77918325f07a9b267337831d175e5f9eca533687))


## v0.0.1 (2024-06-03)

### Unknown
Expand All @@ -40,7 +56,6 @@ Fix ping and run command ([`e248223`](https://github.com/Geode-solutions/GeodeAp

Next ([`25fc719`](https://github.com/Geode-solutions/GeodeApp-Back/commit/25fc7193fc969a0a697ce83338713cc62de60eda))


## v0.0.1-rc.1 (2024-06-03)

### Fix
Expand All @@ -63,7 +78,6 @@ ogwback ([`7fc34ed`](https://github.com/Geode-solutions/GeodeApp-Back/commit/7fc

* ogwback ([`b65c716`](https://github.com/Geode-solutions/GeodeApp-Back/commit/b65c716d011bac01e5cc9c1ebd393955fe145f6f))


## v0.0.0 (2024-05-17)

### Unknown
Expand Down
Empty file removed __init__.py
Empty file.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "geodeapp_back"
version = "0.1.0"
version = "0.1.1-rc.1"
dynamic = ["dependencies"]
authors = [
{ name="Geode-solutions", email="[email protected]" },
Expand Down
1 change: 0 additions & 1 deletion src/geodeapp_back/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
from .config import *
20 changes: 8 additions & 12 deletions src/geodeapp_back/app.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
""" Packages """

# Global packages
import os
import dotenv
import time

# Third parties
import flask
import flask_cors
import time


from opengeodeweb_back import geode_functions
from opengeodeweb_back.routes import blueprint_routes

from werkzeug.exceptions import HTTPException

from werkzeug.exceptions import HTTPException

from .config import *
from opengeodeweb_back.geode_functions import handle_exception
# Local libraries
from geodeapp_back import config


if os.path.isfile("./.env"):
Expand Down Expand Up @@ -61,9 +57,9 @@ def kill_task():


if FLASK_DEBUG == False:
app.config.from_object(ProdConfig)
app.config.from_object(config.ProdConfig)
else:
app.config.from_object(DevConfig)
app.config.from_object(config.DevConfig)

ID = app.config.get("ID")
PORT = int(app.config.get("PORT"))
Expand All @@ -88,7 +84,7 @@ def kill_task():

@app.errorhandler(HTTPException)
def errorhandler(e):
return handle_exception(e)
return geode_functions.handle_exception(e)

@app.route("/", methods=["POST"])
def root():
Expand Down

0 comments on commit b83ac7e

Please sign in to comment.