apache-airflow-providers-git 0.0.1rc1__py3-none-any.whl → 0.0.2rc2__py3-none-any.whl

airflow/providers/git/__init__.py

@@ -29,7 +29,7 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "0.0.1"
+__version__ = "0.0.2"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "3.0.0"

airflow/providers/git/bundles/git.py

@@ -17,6 +17,7 @@
 from __future__ import annotations
 
 import os
+from contextlib import nullcontext
 from pathlib import Path
 from urllib.parse import urlparse
 
@@ -53,7 +54,7 @@ class GitDagBundle(BaseDagBundle):
         *,
         tracking_ref: str,
         subdir: str | None = None,
-        git_conn_id: str = "git_default",
+        git_conn_id: str | None = None,
         repo_url: str | None = None,
         **kwargs,
     ) -> None:
@@ -75,20 +76,26 @@ class GitDagBundle(BaseDagBundle):
             repo_path=self.repo_path,
             versions_path=self.versions_dir,
             git_conn_id=self.git_conn_id,
-            repo_url=self.repo_url,
         )
 
         self._log.debug("bundle configured")
-        try:
-            self.hook = GitHook(git_conn_id=self.git_conn_id, repo_url=self.repo_url)
-            self.repo_url = self.hook.repo_url
-            self._log.debug("repo_url updated from hook", repo_url=self.repo_url)
-        except AirflowException as e:
-            self._log.warning("Could not create GitHook", conn_id=self.git_conn_id, exc=e)
+        self.hook: GitHook | None = None
+        if not repo_url:
+            if not git_conn_id:
+                self._log.debug("Neither git_conn_id nor repo_url provided; loading 'git_default'")
+                git_conn_id = "git_default"
+            try:
+                self.hook = GitHook(git_conn_id=git_conn_id)
+            except AirflowException as e:
+                self._log.warning("Could not create GitHook", conn_id=git_conn_id, exc=e)
+            else:
+                self.repo_url = self.hook.repo_url
+                self._log.debug("repo_url updated from hook")
 
     def _initialize(self):
         with self.lock():
-            with self.hook.configure_hook_env():
+            cm = self.hook.configure_hook_env() if self.hook else nullcontext()
+            with cm:
                 self._clone_bare_repo_if_required()
                 self._ensure_version_in_bare_repo()
 
@@ -134,7 +141,7 @@ class GitDagBundle(BaseDagBundle):
                     url=self.repo_url,
                     to_path=self.bare_repo_path,
                     bare=True,
-                    env=self.hook.env,
+                    env=self.hook.env if self.hook else None,
                 )
             except GitCommandError as e:
                 raise AirflowException("Error cloning repository") from e
@@ -177,10 +184,10 @@ class GitDagBundle(BaseDagBundle):
 
     def _fetch_bare_repo(self):
         refspecs = ["+refs/heads/*:refs/heads/*", "+refs/tags/*:refs/tags/*"]
-        if self.hook.env:
-            with self.bare_repo.git.custom_environment(GIT_SSH_COMMAND=self.hook.env.get("GIT_SSH_COMMAND")):
-                self.bare_repo.remotes.origin.fetch(refspecs)
-        else:
+        cm = nullcontext()
+        if self.hook and (cmd := self.hook.env.get("GIT_SSH_COMMAND")):
+            cm = self.bare_repo.git.custom_environment(GIT_SSH_COMMAND=cmd)
+        with cm:
             self.bare_repo.remotes.origin.fetch(refspecs)
 
     def refresh(self) -> None:
@@ -188,7 +195,8 @@ class GitDagBundle(BaseDagBundle):
             raise AirflowException("Refreshing a specific version is not supported")
 
         with self.lock():
-            with self.hook.configure_hook_env():
+            cm = self.hook.configure_hook_env() if self.hook else nullcontext()
+            with cm:
                 self._fetch_bare_repo()
                 self.repo.remotes.origin.fetch(
                     ["+refs/heads/*:refs/remotes/origin/*", "+refs/tags/*:refs/tags/*"]
@@ -233,6 +241,8 @@ class GitDagBundle(BaseDagBundle):
             "gitlab.com": f"{url}/-/tree/{version}",
             "bitbucket.org": f"{url}/src/{version}",
         }
+        if self.subdir:
+            host_patterns = {k: f"{v}/{self.subdir}" for k, v in host_patterns.items()}
         for allowed_host, template in host_patterns.items():
             if host == allowed_host or host.endswith(f".{allowed_host}"):
                 return template

{apache_airflow_providers_git-0.0.1rc1.dist-info → apache_airflow_providers_git-0.0.2rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-git
-Version: 0.0.1rc1
+Version: 0.0.2rc2
 Summary: Provider package apache-airflow-providers-git for Apache Airflow
 Keywords: airflow-provider,git,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -23,8 +23,8 @@ Classifier: Topic :: System :: Monitoring
 Requires-Dist: apache-airflow>=3.0.0rc0
 Requires-Dist: GitPython>=3.1.44
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.1/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.1
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.2/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.2
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -55,7 +55,7 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-git``
 
-Release: ``0.0.1``
+Release: ``0.0.2``
 
 
 `Distributed version control system (GIT) <https://git-scm.com/>`__
@@ -68,7 +68,7 @@ This is a provider package for ``git`` provider. All classes for this provider p
 are in ``airflow.providers.git`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.2/>`_.
 
 Installation
 ------------
@@ -90,5 +90,5 @@ PIP package         Version required
 ==================  ==================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.2/changelog.html>`_.
 

{apache_airflow_providers_git-0.0.1rc1.dist-info → apache_airflow_providers_git-0.0.2rc2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 airflow/providers/git/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850
-airflow/providers/git/__init__.py,sha256=zNgp9rHGoc5roLS_cYTHNnTO1yjoAJCqdYAGmKhEuQ4,1490
+airflow/providers/git/__init__.py,sha256=jllQ1mZczFIYO53Gb9mCS8ySzj6s5yrgjtCWQv_3198,1490
 airflow/providers/git/get_provider_info.py,sha256=6xC_Jru3CMrhO7r5aX03J4HR6Jl62rp9BWVcLKFjxQQ,1809
 airflow/providers/git/bundles/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/git/bundles/git.py,sha256=rN6C9t0cltaDcKNZnYsXgbia6CFsiXtA0TsFPijpplw,9157
+airflow/providers/git/bundles/git.py,sha256=vYerC80phtGd26P2Jv8VxxL3kj4liW8UM2mbgdOELZI,9599
 airflow/providers/git/hooks/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
 airflow/providers/git/hooks/git.py,sha256=RIhvVfd3J-GW9itJ0V1tXeEQSMxZFsMqqmLZGiUBfM4,3908
-apache_airflow_providers_git-0.0.1rc1.dist-info/entry_points.txt,sha256=k9QR9MAaAm9yDsRDBIK3QOt5Fos3fBCqCngNFPaJnKs,99
-apache_airflow_providers_git-0.0.1rc1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-apache_airflow_providers_git-0.0.1rc1.dist-info/METADATA,sha256=aE88ziqAEK9HIpvT7mhBKSzqDbXegYroD_ea6P8bL6s,3845
-apache_airflow_providers_git-0.0.1rc1.dist-info/RECORD,,
+apache_airflow_providers_git-0.0.2rc2.dist-info/entry_points.txt,sha256=k9QR9MAaAm9yDsRDBIK3QOt5Fos3fBCqCngNFPaJnKs,99
+apache_airflow_providers_git-0.0.2rc2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+apache_airflow_providers_git-0.0.2rc2.dist-info/METADATA,sha256=eb1LZ8-MjKUJyB11vh0BiXhkpQaXmyv5M4uaxv5JFtE,3845
+apache_airflow_providers_git-0.0.2rc2.dist-info/RECORD,,