Merge pull request #23 from Never-Over/more-flexible-python-build

Support poetry, Pipenv dependencies

bridge/cli/init/install_deps.py

@@ -0,0 +1,35 @@
+# [Generated by Bridge]
+import os
+import subprocess
+
+
+def install_dependencies():
+    # Check for requirements.txt and install using pip
+    if os.path.exists("requirements.txt"):
+        print("requirements.txt found. Installing dependencies...")
+        subprocess.run(["pip", "install", "-r", "requirements.txt"], check=True)
+
+    # Check for Pipfile.lock and install using Pipenv
+    elif os.path.exists("Pipfile.lock"):
+        print("Pipfile.lock found. Installing Pipenv and dependencies...")
+        subprocess.run(["pip", "install", "pipx"], check=True)
+        subprocess.run(["pipx", "install", "pipenv"], check=True)
+        subprocess.run(["pipenv", "sync"], check=True)
+
+    # Check for poetry.lock and install using Poetry
+    elif os.path.exists("poetry.lock"):
+        print("poetry.lock found. Installing Poetry and dependencies...")
+        subprocess.run(["pip", "install", "pipx"], check=True)
+        subprocess.run(["pipx", "install", "poetry"], check=True)
+        subprocess.run(["poetry", "install"], check=True)
+
+    else:
+        print(
+            "No dependency file found."
+            " Please make sure you have a"
+            " requirements.txt, Pipfile.lock, or poetry.lock file in the root of your project"
+        )
+
+
+if __name__ == "__main__":
+    install_dependencies()

bridge/cli/init/render.py

@@ -1,4 +1,5 @@
 import os
+import shutil
 from abc import ABC, abstractmethod
 from importlib.util import find_spec
 from pathlib import Path
@@ -251,7 +252,17 @@ def add_deploy_render_button_to_readme():
             f.write(deploy_to_render_button_template())
 
 
+def add_install_deps_script(config: RenderPlatformInitConfig):
+    # Assuming 'install_deps.py' is in the same directory as this file
+    src_path = Path(__file__).parent / "install_deps.py"
+    if not src_path.exists():
+        raise FileNotFoundError("install_deps.py not found in the expected location.")
+    dst_path = Path(config.script_dir) / "install_deps.py"
+    shutil.copyfile(src_path, dst_path)
+
+
 def initialize_render_platform(config: RenderPlatformInitConfig):
     add_deploy_render_button_to_readme()
+    add_install_deps_script(config)
     for file in TEMPLATED_FILES:
         file.write(config)

bridge/cli/init/templates/build__sh.py

@@ -4,8 +4,12 @@
 # Exit on error
 set -o errexit
 
-# Modify this line as needed for your package manager (pip, poetry, etc.)
-pip install -r requirements.txt
+# Get the directory of the current script.
+DIR=$(dirname "$0")
+
+# Use our Python script to install dependencies
+INSTALL_DEPS_SCRIPT="$DIR/install_deps.py"
+python "$INSTALL_DEPS_SCRIPT"
 
 # Install additional dependencies
 pip install gunicorn uvicorn psycopg-binary whitenoise[brotli]

docs/getting-started.md

@@ -87,7 +87,7 @@ Bridge assumes the following project structure:
 │   ├── [wsgi.py | asgi.py]
 │   ├── ...
 ├── manage.py
-├── [requirements.txt | pyproject.toml | setup.py]
+├── [requirements.txt | poetry.lock | Pipfile.lock]
 ├── ...
 ```
 

tests/django/django_bridge/bridge-django-render/build.sh

@@ -2,8 +2,12 @@
 # Exit on error
 set -o errexit
 
-# Modify this line as needed for your package manager (pip, poetry, etc.)
-pip install -r requirements.txt
+# Get the directory of the current script.
+DIR=$(dirname "$0")
+
+# Use our Python script to install dependencies
+INSTALL_DEPS_SCRIPT="$DIR/install_deps.py"
+python "$INSTALL_DEPS_SCRIPT"
 
 # Install additional dependencies
 pip install gunicorn uvicorn psycopg-binary whitenoise[brotli]

tests/django/django_bridge/bridge-django-render/install_deps.py

@@ -0,0 +1,34 @@
+# [Generated by Bridge]
+import os
+import subprocess
+
+
+def install_dependencies():
+    # Check for requirements.txt and install using pip
+    if os.path.exists("requirements.txt"):
+        print("requirements.txt found. Installing dependencies...")
+        subprocess.run(["pip", "install", "-r", "requirements.txt"], check=True)
+
+    # Check for Pipfile.lock and install using Pipenv
+    elif os.path.exists("Pipfile.lock"):
+        print("Pipfile.lock found. Installing Pipenv and dependencies...")
+        subprocess.run(["pip", "install", "pipx"], check=True)
+        subprocess.run(["pipx", "install", "pipenv"], check=True)
+        subprocess.run(["pipenv", "sync"], check=True)
+
+    # Check for poetry.lock and install using Poetry
+    elif os.path.exists("poetry.lock"):
+        print("poetry.lock found. Installing Poetry and dependencies...")
+        subprocess.run(["pip", "install", "pipx"], check=True)
+        subprocess.run(["pipx", "install", "poetry"], check=True)
+        subprocess.run(["poetry", "install"], check=True)
+
+    else:
+        print(
+            "No dependency file found."
+            "Please ensure your dependency file is in the current directory."
+        )
+
+
+if __name__ == "__main__":
+    install_dependencies()