From 1eb838edd0de89003051097cca0966d18b82e276 Mon Sep 17 00:00:00 2001
From: Zsolt Ero <zsolt.ero@gmail.com>
Date: Wed, 3 Jan 2024 14:37:18 +0100
Subject: [PATCH] setup.py work

---
 init-server.py                            |  4 +++-
 prepare-virtualenv.sh                     |  6 +++++-
 scripts/http_host/setup.py                | 10 ++++++++--
 scripts/prepare-virtualenv.sh             |  1 -
 scripts/tile_gen/setup.py                 | 13 +++++++++++++
 scripts/tile_gen/tile_gen_lib/__init__.py |  0
 setup.py                                  |  6 +++---
 7 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 scripts/tile_gen/setup.py
 create mode 100644 scripts/tile_gen/tile_gen_lib/__init__.py

diff --git a/init-server.py b/init-server.py
index a792a81..5dc4864 100755
--- a/init-server.py
+++ b/init-server.py
@@ -12,7 +12,7 @@ from ssh_lib.nginx import certbot, nginx
 from ssh_lib.pkg_base import pkg_base, pkg_upgrade
 from ssh_lib.planetiler import planetiler
 from ssh_lib.rclone import rclone
-from ssh_lib.utils import add_user, enable_sudo, put, reboot, sudo_cmd
+from ssh_lib.utils import add_user, enable_sudo, put, put_dir, reboot, sudo_cmd
 
 
 def prepare_shared(c):
@@ -100,6 +100,8 @@ def prepare_http_host(c):
     upload_https_host_files(c)
     upload_certificates(c)
 
+    c.sudo('/data/ofm/venv/bin/pip install -e /data/ofm/http_host/bin')
+
 
 def upload_https_host_files(c):
     c.sudo(f'mkdir -p {HTTP_HOST_BIN}')
diff --git a/prepare-virtualenv.sh b/prepare-virtualenv.sh
index 4ff80d5..9c67b1c 100755
--- a/prepare-virtualenv.sh
+++ b/prepare-virtualenv.sh
@@ -9,6 +9,10 @@ python3 -m venv venv
 source venv/bin/activate
 
 pip install -U pip wheel setuptools
-pip install -e .
 
+pip install -e .
 pip install -e scripts/http_host
+pip install -e scripts/tile_gen
+
+
+
diff --git a/scripts/http_host/setup.py b/scripts/http_host/setup.py
index 870df9c..44bebe8 100644
--- a/scripts/http_host/setup.py
+++ b/scripts/http_host/setup.py
@@ -1,7 +1,13 @@
-from setuptools import setup
+from setuptools import find_packages, setup
+
+
+requirements = [
+    'click',
+]
 
 
 setup(
     python_requires='>=3.10',
-    packages=['http_host_lib'],
+    install_requires=requirements,
+    packages=find_packages(),
 )
diff --git a/scripts/prepare-virtualenv.sh b/scripts/prepare-virtualenv.sh
index 8e060fe..1c016ff 100755
--- a/scripts/prepare-virtualenv.sh
+++ b/scripts/prepare-virtualenv.sh
@@ -11,6 +11,5 @@ venv/bin/pip -V
 
 venv/bin/pip install -U pip wheel setuptools
 
-venv/bin/pip install click requests
 
 
diff --git a/scripts/tile_gen/setup.py b/scripts/tile_gen/setup.py
new file mode 100644
index 0000000..44bebe8
--- /dev/null
+++ b/scripts/tile_gen/setup.py
@@ -0,0 +1,13 @@
+from setuptools import find_packages, setup
+
+
+requirements = [
+    'click',
+]
+
+
+setup(
+    python_requires='>=3.10',
+    install_requires=requirements,
+    packages=find_packages(),
+)
diff --git a/scripts/tile_gen/tile_gen_lib/__init__.py b/scripts/tile_gen/tile_gen_lib/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/setup.py b/setup.py
index eabd88b..dc4a132 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup
+from setuptools import find_packages, setup
 
 
 requirements = [
@@ -6,12 +6,12 @@ requirements = [
     'fabric',
     'nginxfmt',
     'python-dotenv',
-    'requests',
     'ruff',
 ]
 
+
 setup(
     python_requires='>=3.10',
     install_requires=requirements,
-    packages=['ssh_lib'],
+    packages=find_packages(),
 )