Merge pull request #201 from introlab/dev

Update requirements for examples.
introlab · Mar 7, 2023 · 53fe459 · 53fe459
2 parents 1c3caba + 18fce6d
commit 53fe459
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 247 deletions.
diff --git a/teraserver/python/examples/service_with_assets/libservice/db/Base.py b/teraserver/python/examples/service_with_assets/libservice/db/Base.py
diff --git a/teraserver/python/examples/service_with_assets/libservice/db/DBManager.py b/teraserver/python/examples/service_with_assets/libservice/db/DBManager.py
@@ -1,8 +1,8 @@
 # Using same base as TeraServer
 # FIXME: Uncomment on OpenTera package 1.2.0 release
-# from opentera.db.Base import BaseModel
+from opentera.db.Base import BaseModel
 # FIXME: Comment on OpenTera package 1.2.0 release
-from libservice.db.Base import BaseModel
+# from libservice.db.Base import BaseModel
 from flask_sqlalchemy import SQLAlchemy
 
 from sqlalchemy.engine.reflection import Inspector

diff --git a/teraserver/python/examples/service_with_assets/libservice/db/models/AssetFileData.py b/teraserver/python/examples/service_with_assets/libservice/db/models/AssetFileData.py
@@ -1,7 +1,7 @@
 # FIXME: Uncomment on OpenTera package 1.2.0 release
-# from opentera.db.Base import BaseModel
+from opentera.db.Base import BaseModel
 # FIXME: Comment on OpenTera package 1.2.0 release
-from libservice.db.Base import BaseModel
+# from libservice.db.Base import BaseModel
 
 from sqlalchemy import exc
 from sqlalchemy import Column, ForeignKey, Sequence, Integer, String, BigInteger, TIMESTAMP

diff --git a/teraserver/python/examples/service_with_assets/requirements.txt b/teraserver/python/examples/service_with_assets/requirements.txt
@@ -1,3 +1 @@
-opentera==1.1.3
-Babel==2.9.1
-werkzeug==2.0.3
+opentera