Merge pull request #2 from FafnerKeyZee/main

Enjoying Poetry \o/
adulau · Oct 30, 2023 · f09a6e2 · f09a6e2
2 parents 39bae95 + 696f3c6
commit f09a6e2
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -6,12 +6,14 @@ mmdb-server includes a free and open [GeoOpen-Country database](https://data.pub
 
 # Installation
 
-Python 3.8+ is required to run the mmdb-server with some [additional requirements](./REQUIREMENTS).
+Python 3.10+ is required to run the mmdb-server with poetry.
 
-- `pip3 install -r REQUIREMENTS`
+- `curl -sSL https://install.python-poetry.org | python3 -`
+- Log out and Log in again
+- `poetry install`
 - `cp ./etc/server.conf.sample ./etc/server.conf`
 - `cd  ./db; bash update.sh; cd ..` (to get the latest version of the GeoOpen database)
-- `cd bin; python3 server.py`
+- `poetry run serve`
 
 # Usage
 

diff --git a/REQUIREMENTS b/REQUIREMENTS
diff --git a/_config.yml b/_config.yml
diff --git a/mmdb_server/__init__.py b/mmdb_server/__init__.py
diff --git a/bin/server.py → mmdb_server/mmdb_server.py b/bin/server.py → mmdb_server/mmdb_server.py
@@ -17,7 +17,7 @@
 
 version = "0.5"
 config = configparser.ConfigParser()
-config.read('../etc/server.conf')
+config.read('etc/server.conf')
 mmdb_file = config['global'].get('mmdb_file')
 pubsub = config['global'].getboolean('lookup_pubsub')
 port = config['global'].getint('port')
@@ -121,7 +121,12 @@ def on_get(self, req, resp):
 app.add_route('/geolookup/{value}', GeoLookup())
 app.add_route('/', MyGeoLookup())
 
-if __name__ == '__main__':
+def main():
     with make_server('', port, app) as httpd:
         print(f'Serving on port {port}...')
         httpd.serve_forever()
+
+
+if __name__ == '__main__':
+    main()
+
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,19 @@
+[tool.poetry]
+name = "mmdb-server"
+version = "0.5.0"
+description = ""
+authors = ["Alexandre Dulaunoy"]
+readme = "README.md"
+
+[tool.poetry.scripts]
+serve = "mmdb_server.mmdb_server:main"
+
+[tool.poetry.dependencies]
+python = "^3.10"
+falcon = "^3.1.1"
+maxminddb = "^2.4.0"
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"