dataflow-conda-plugin 0.1.7rc4__tar.gz → 0.1.9__tar.gz

{dataflow_conda_plugin-0.1.7rc4 → dataflow_conda_plugin-0.1.9}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.4
 Name: dataflow-conda-plugin
-Version: 0.1.7rc4
+Version: 0.1.9

{dataflow_conda_plugin-0.1.7rc4 → dataflow_conda_plugin-0.1.9}/dataflow_conda_plugin.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.4
 Name: dataflow-conda-plugin
-Version: 0.1.7rc4
+Version: 0.1.9

{dataflow_conda_plugin-0.1.7rc4 → dataflow_conda_plugin-0.1.9}/plugin/plugin.py

@@ -1,4 +1,4 @@
-import subprocess, sys, pkg_resources, os, requests
+import subprocess, sys, pkg_resources, os, requests, re, sys
 from conda import plugins
 from conda.base.context import context
 from dataflow.utils.logger import CustomLogger
@@ -46,6 +46,8 @@ def install_deps(command: str):
     """Install dataflow dependencies."""
     target_prefix = context.target_prefix
     args = context._argparse_args
+    python_version = args.get("python") 
+    print(f"Installing Dataflow dependencies in the environment with Python version: {python_version}")
     env_name = os.path.basename(target_prefix) if target_prefix else None
 
     should_save_to_db = is_local_environment(target_prefix) and env_name
@@ -77,6 +79,7 @@ def install_deps(command: str):
             print(f"Error in creating environment!!")
             if should_save_to_db and env_name:
                 save_environment(env_name, "Failed")
+            raise RuntimeError(f"Dataflow dependency installation failed! Please make sure compatible python version is used")
         else:
             if env_name and should_save_to_db:
                 save_environment(env_name, "Success")
@@ -86,6 +89,7 @@ def install_deps(command: str):
         logger.error(f"Error installing dependencies: {str(e)}")
         if should_save_to_db and env_name:
             save_environment(env_name, "Failed")
+        raise e
 
 def remove_environment(env_name: str):
     """Remove environment information via API."""
@@ -147,6 +151,25 @@ def package_operations(command: str):
     if should_update_db:
         mark_environment_for_refresh(env_name)
 
+def set_pip_constraint(command: str):
+    """Set PIP_CONSTRAINT environment variable based on Python version."""
+    if "NO_CONDA_PLUGIN_PIP_CONSTRAINT" in os.environ:
+        return
+    for arg in sys.argv:
+        if arg.startswith("python"):
+            # Match python=3.10, python=3.10.1, python=3.11, python=3.11.5, etc.
+            match = re.fullmatch(r"python=(3\.10(\.\d+)?|3\.11(\.\d+)?|3\.12(\.\d+)?)", arg)
+            if not match:
+                raise ValueError(f"Invalid argument: {arg}! Only Python 3.10, 3.11, and 3.12 are supported.")
+            version = match.group(1)
+            major_minor = ".".join(version.split(".")[:2])
+            break
+    else:
+        major_minor = "3.12"
+    # Set PIP_CONSTRAINT environment variable to the appropriate constraint file
+    os.environ["PIP_CONSTRAINT"] = f"/dataflow/tmp/pip_constraints/py{major_minor}-constraints.txt"
+
+
 @plugins.hookimpl
 def conda_post_commands():
     yield plugins.CondaPostCommand(
@@ -158,4 +181,12 @@ def conda_post_commands():
         name=f"package_operations_post_command",
         action=package_operations,
         run_for={"install", "remove", "update"},
+    )
+
+@plugins.hookimpl
+def conda_pre_commands():
+    yield plugins.CondaPreCommand(
+        name="set_pip_constraint",
+        action=set_pip_constraint,
+        run_for={"create"},
     )

{dataflow_conda_plugin-0.1.7rc4 → dataflow_conda_plugin-0.1.9}/plugin/scripts/install_dataflow_deps.sh

@@ -4,13 +4,14 @@ conda_env_path=$1
 
 py_version=$(${conda_env_path}/bin/python -c "import sys; print('.'.join(map(str, sys.version_info[:2])))")
                       
-${conda_env_path}/bin/pip install --index-url https://pypi.org/simple dash==3.0.3 dash-renderer==1.9.1 plotly==6.0.1 typing==3.7.4.3 streamlit==1.45.1 ipython==9.2.0 ipykernel==6.29.5 ipython-sql==0.4.1 jupysql==0.10.14 psycopg2-binary==2.9.10 cryptography==44.0.3 dataflow-core==2.1.14rc2 dataflow-dbt==0.0.3
+# make sure to install dataflow deps from pypi only
+${conda_env_path}/bin/pip install --index-url https://pypi.org/simple/ dash==3.0.3 dash-renderer==1.9.1 plotly==6.0.1 typing==3.7.4.3 streamlit==1.45.1 ipython==8.37.0 ipykernel==6.29.5 ipython-sql==0.4.1 jupysql==0.10.14 psycopg2-binary==2.9.10 dataflow-core==2.1.17 dataflow-dbt==0.0.3
 
 # 3. Install Dataflow Airflow to a separate path in environment 
-${conda_env_path}/bin/pip install --index-url https://pypi.org/simple \
+${conda_env_path}/bin/pip install \
     --force-reinstall --root-user-action ignore \
     --no-warn-conflicts dataflow-airflow==2.10.7 \
-    --constraint https://raw.githubusercontent.com/apache/airflow/constraints-2.10.5/constraints-${py_version}.txt \
+    --constraint /dataflow/setup/pip_constraints/airflow_constraints${py_version}.txt \
     --target ${conda_env_path}/bin/airflow-libraries/
 
 files=(

{dataflow_conda_plugin-0.1.7rc4 → dataflow_conda_plugin-0.1.9}/setup.py

@@ -14,7 +14,7 @@ class PostInstall(install):
 
 setup(
     name="dataflow-conda-plugin",
-    version="0.1.7rc4",
+    version="0.1.9",
     entry_points={"conda": ["dataflow-conda-plugin = plugin.plugin"]},
     packages=find_packages(include=["plugin"]),
     package_data={'plugin': ['scripts/*.sh']},