From e5acec4ba290d2679194c0b8fd1733356ddbcc93 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 25 May 2019 22:18:18 +0200 Subject: [PATCH] ++stuff --- Pipfile | 2 ++ Pipfile.lock | 35 ++++++++++++++++++++++++++++------- game-server-new.py | 2 ++ 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/Pipfile b/Pipfile index b046be9..0326fdf 100644 --- a/Pipfile +++ b/Pipfile @@ -9,6 +9,8 @@ flask-jsonpify = "*" flask-sqlalchemy = "*" flask-restful = "*" psycopg2 = "*" +python-etcd = "*" + [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 1561a2a..496aad8 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "e480f6e4921aea429b583cddf2491e5c7b9dd7872be4663dddc917e3fdaf9249" + "sha256": "3a4b0e16a97795721cc169fa6f26982a8bd080805660c08c26052712cd8814e4" }, "pipfile-spec": 6, "requires": { @@ -30,13 +30,20 @@ ], "version": "==7.0" }, + "dnspython": { + "hashes": [ + "sha256:36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01", + "sha256:f69c21288a962f4da86e56c4905b49d11aba7938d3d740e80d9e366ee4f1632d" + ], + "version": "==1.16.0" + }, "flask": { "hashes": [ - "sha256:2271c0070dbcb5275fad4a82e29f23ab92682dc45f9dfbc22c02ba9b9322ce48", - "sha256:a080b744b7e345ccfcbc77954861cb05b3c63786e93f2b3875e0913d44b43f05" + "sha256:ad7c6d841e64296b962296c2c2dabc6543752985727af86a975072dea984b6f3", + "sha256:e7d32475d1de5facaa55e3958bc4ec66d3762076b074296aa50ef8fdc5b9df61" ], "index": "pypi", - "version": "==1.0.2" + "version": "==1.0.3" }, "flask-jsonpify": { "hashes": [ @@ -125,6 +132,13 @@ "index": "pypi", "version": "==2.8.2" }, + "python-etcd": { + "hashes": [ + "sha256:f1b5ebb825a3e8190494f5ce1509fde9069f2754838ed90402a8c11e1f52b8cb" + ], + "index": "pypi", + "version": "==0.4.5" + }, "pytz": { "hashes": [ "sha256:303879e36b721603cc54604edcac9d20401bdbe31e1e4fdee5b9f98d5d31dfda", @@ -145,12 +159,19 @@ ], "version": "==1.3.3" }, + "urllib3": { + "hashes": [ + "sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1", + "sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232" + ], + "version": "==1.25.3" + }, "werkzeug": { "hashes": [ - "sha256:0a73e8bb2ff2feecfc5d56e6f458f5b99290ef34f565ffb2665801ff7de6af7a", - "sha256:7fad9770a8778f9576693f0cc29c7dcc36964df916b83734f4431c0e612a7fbc" + "sha256:865856ebb55c4dcd0630cdd8f3331a1847a819dda7e8c750d3db6f2aa6c0209c", + "sha256:a0b915f0815982fb2a09161cb8f31708052d0951c3ba433ccc5e1aa276507ca6" ], - "version": "==0.15.2" + "version": "==0.15.4" } }, "develop": {} diff --git a/game-server-new.py b/game-server-new.py index 5758fe1..77cb1ec 100644 --- a/game-server-new.py +++ b/game-server-new.py @@ -22,6 +22,8 @@ engine = create_engine('postgresql://localhost:5432/ungleichgame?host=/var/run/p db_session = scoped_session(sessionmaker(autocommit=False, autoflush=False, bind=engine)) + + Base = declarative_base() Base.query = db_session.query_property()