gdal_calc python target?

databrickslabs · Nov 29, 2024 · 3f3781f · 3f3781f
1 parent 1f6d001
commit 3f3781f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/.github/actions/scala_build/action.yml b/.github/actions/scala_build/action.yml
@@ -25,18 +25,18 @@ runs:
               python${{ matrix.python_minor }}-dev \
               python${{ matrix.python_minor }}-venv \
               python${{ matrix.python_minor }}-distutils
-              update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${{ matrix.python_minor }} 1
+#              update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${{ matrix.python_minor }} 1
               mkdir -p /databricks
               chown $USER:$USER /databricks
               chmod -R 766 /databricks/
             EOF
             python3 -m venv /databricks/python3
-            echo "/databricks/python3/bin" >> "$GITHUB_PATH"
+#            echo "/databricks/python3/bin" >> "$GITHUB_PATH"
         - name: Add packaged GDAL dependencies
           shell: bash
           run : |
             which python
-            cd python && pip install .
+            cd python && /databricks/python3/bin/pip install .
 #            sudo dpkg -i python/mosaic/gdal/gdal_3.10.0-1_amd64.deb || :
 #            sudo apt-get update && sudo apt-get install -f -y
 #            sudo dpkg -i python/mosaic/gdal/gdal_3.10.0-1_amd64.deb

diff --git a/python/setup.py b/python/setup.py
@@ -70,14 +70,9 @@ def run(self):
         if not self.am_root():
             prepend.append("sudo")
 
-        env = os.environ.copy()
-        env.pop("PYTHONPATH")
-        env["PATH"] = env["PATH"].replace("/databricks/python3/bin;", "")
-        print(env)
-
         # Install base dependencies
-        subprocess.check_call(prepend + ["apt-get", "update"], env=env)
-        subprocess.check_call(prepend + ["apt-get", "install", "-y", *self.required_os_packages], env=env)
+        subprocess.check_call(prepend + ["apt-get", "update"])
+        subprocess.check_call(prepend + ["apt-get", "install", "-y", *self.required_os_packages])
 
         # Install the .deb file
         deb_file = os.path.join(