apache-airflow-providers-git 0.0.5__tar.gz → 0.0.6__tar.gz

{apache_airflow_providers_git-0.0.5 → apache_airflow_providers_git-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-git
-Version: 0.0.5
+Version: 0.0.6
 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.0
 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.5/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.5
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.6/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.6
 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.5``
+Release: ``0.0.6``
 
 Release Date: ``|PypiReleaseDate|``
 
@@ -69,7 +69,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.5/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.6/>`_.
 
 Installation
 ------------
@@ -91,5 +91,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.5/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.6/changelog.html>`_.
 

{apache_airflow_providers_git-0.0.5 → apache_airflow_providers_git-0.0.6}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-git``
 
-Release: ``0.0.5``
+Release: ``0.0.6``
 
 Release Date: ``|PypiReleaseDate|``
 
@@ -37,7 +37,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.5/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.6/>`_.
 
 Installation
 ------------
@@ -59,4 +59,4 @@ 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.5/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.6/changelog.html>`_.

{apache_airflow_providers_git-0.0.5 → apache_airflow_providers_git-0.0.6}/docs/changelog.rst

@@ -15,6 +15,17 @@
     specific language governing permissions and limitations
     under the License.
 
+0.0.6
+.....
+
+Misc
+~~~~
+
+* ``Refactor bundle view_url to not instaniate bundle on server components (#52876)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+
 0.0.5
 .....
 

{apache_airflow_providers_git-0.0.5 → apache_airflow_providers_git-0.0.6}/docs/index.rst

@@ -72,7 +72,7 @@ apache-airflow-providers-git package
 `Distributed version control system (GIT) <https://git-scm.com/>`__
 
 
-Release: 0.0.5
+Release: 0.0.6
 
 Release Date: ``|PypiReleaseDate|``
 

{apache_airflow_providers_git-0.0.5 → apache_airflow_providers_git-0.0.6}/provider.yaml

@@ -22,12 +22,13 @@ description: |
     `Distributed version control system (GIT) <https://git-scm.com/>`__
 
 state: ready
-source-date-epoch: 1753690739
+source-date-epoch: 1754503255
 # Note that those versions are maintained by release manager - do not update them manually
 # with the exception of case where other provider in sources has >= new provider version.
 # In such case adding >= NEW_VERSION and bumping to NEW_VERSION in a provider have
 # to be done in the same PR
 versions:
+  - 0.0.6
   - 0.0.5
   - 0.0.4
   - 0.0.3

{apache_airflow_providers_git-0.0.5 → apache_airflow_providers_git-0.0.6}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-git"
-version = "0.0.5"
+version = "0.0.6"
 description = "Provider package apache-airflow-providers-git for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -95,8 +95,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.5"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.5/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.6"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-git/0.0.6/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"

{apache_airflow_providers_git-0.0.5 → apache_airflow_providers_git-0.0.6}/src/airflow/providers/git/__init__.py

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

{apache_airflow_providers_git-0.0.5 → apache_airflow_providers_git-0.0.6}/src/airflow/providers/git/bundles/git.py

@@ -25,9 +25,7 @@ import structlog
 from git import Repo
 from git.exc import BadName, GitCommandError, NoSuchPathError
 
-from airflow.dag_processing.bundles.base import (
-    BaseDagBundle,
-)
+from airflow.dag_processing.bundles.base import BaseDagBundle
 from airflow.exceptions import AirflowException
 from airflow.providers.git.hooks.git import GitHook
 
@@ -215,32 +213,58 @@ class GitDagBundle(BaseDagBundle):
         return f"{domain}/{repo_path}"
 
     def view_url(self, version: str | None = None) -> str | None:
+        """
+        Return a URL for viewing the DAGs in the repository.
+
+        This method is deprecated and will be removed when the minimum supported Airflow version is 3.1.
+        Use `view_url_template` instead.
+        """
         if not version:
             return None
-        url = self.repo_url
-        if not url:
+        template = self.view_url_template()
+        if not template:
             return None
+        if not self.subdir:
+            # remove {subdir} from the template if subdir is not set
+            template = template.replace("/{subdir}", "")
+        return template.format(version=version, subdir=self.subdir)
+
+    def view_url_template(self) -> str | None:
+        if hasattr(self, "_view_url_template") and self._view_url_template:
+            # Because we use this method in the view_url method, we need to handle
+            # backward compatibility for Airflow versions that doesn't have the
+            # _view_url_template attribute. Should be removed when we drop support for Airflow 3.0
+            return self._view_url_template
+
+        if not self.repo_url:
+            return None
+
+        url = self.repo_url
         if url.startswith("git@"):
             url = self._convert_git_ssh_url_to_https(url)
         if url.endswith(".git"):
             url = url[:-4]
+
         parsed_url = urlparse(url)
         host = parsed_url.hostname
         if not host:
             return None
+
         if parsed_url.username or parsed_url.password:
             new_netloc = host
             if parsed_url.port:
                 new_netloc += f":{parsed_url.port}"
             url = parsed_url._replace(netloc=new_netloc).geturl()
+
         host_patterns = {
-            "github.com": f"{url}/tree/{version}",
-            "gitlab.com": f"{url}/-/tree/{version}",
-            "bitbucket.org": f"{url}/src/{version}",
+            "github.com": f"{url}/tree/{{version}}",
+            "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}"):
+                if self.subdir:
+                    return f"{template}/{self.subdir}"
                 return template
         return None

{apache_airflow_providers_git-0.0.5 → apache_airflow_providers_git-0.0.6}/tests/unit/git/bundles/test_git.py

@@ -35,6 +35,7 @@ from airflow.providers.git.bundles.git import GitDagBundle
 from airflow.providers.git.hooks.git import GitHook
 
 from tests_common.test_utils.config import conf_vars
+from tests_common.test_utils.version_compat import AIRFLOW_V_3_1_PLUS
 
 
 @pytest.fixture(autouse=True)
@@ -522,6 +523,100 @@ class TestGitDagBundle:
         assert view_url == expected_url
         bundle.initialize.assert_not_called()
 
+    @pytest.mark.skipif(not AIRFLOW_V_3_1_PLUS, reason="Airflow 3.0 does not support view_url_template")
+    @pytest.mark.parametrize(
+        "repo_url, extra_conn_kwargs, expected_url",
+        [
+            (
+                "git@github.com:apache/airflow.git",
+                None,
+                "https://github.com/apache/airflow/tree/{version}/subdir",
+            ),
+            (
+                "git@github.com:apache/airflow",
+                None,
+                "https://github.com/apache/airflow/tree/{version}/subdir",
+            ),
+            (
+                "https://github.com/apache/airflow",
+                None,
+                "https://github.com/apache/airflow/tree/{version}/subdir",
+            ),
+            (
+                "https://github.com/apache/airflow.git",
+                None,
+                "https://github.com/apache/airflow/tree/{version}/subdir",
+            ),
+            (
+                "git@gitlab.com:apache/airflow.git",
+                None,
+                "https://gitlab.com/apache/airflow/-/tree/{version}/subdir",
+            ),
+            (
+                "git@bitbucket.org:apache/airflow.git",
+                None,
+                "https://bitbucket.org/apache/airflow/src/{version}/subdir",
+            ),
+            (
+                "git@myorg.github.com:apache/airflow.git",
+                None,
+                "https://myorg.github.com/apache/airflow/tree/{version}/subdir",
+            ),
+            (
+                "https://myorg.github.com/apache/airflow.git",
+                None,
+                "https://myorg.github.com/apache/airflow/tree/{version}/subdir",
+            ),
+            (
+                "https://github.com/apache/airflow",
+                {"password": "abc123"},
+                "https://github.com/apache/airflow/tree/{version}/subdir",
+            ),
+            (
+                "https://github.com/apache/airflow",
+                {"login": "abc123"},
+                "https://github.com/apache/airflow/tree/{version}/subdir",
+            ),
+            (
+                "https://github.com/apache/airflow",
+                {"login": "abc123", "password": "def456"},
+                "https://github.com/apache/airflow/tree/{version}/subdir",
+            ),
+            (
+                "https://github.com:443/apache/airflow",
+                None,
+                "https://github.com:443/apache/airflow/tree/{version}/subdir",
+            ),
+            (
+                "https://github.com:443/apache/airflow",
+                {"password": "abc123"},
+                "https://github.com:443/apache/airflow/tree/{version}/subdir",
+            ),
+        ],
+    )
+    @mock.patch("airflow.providers.git.bundles.git.Repo")
+    def test_view_url_template_subdir(
+        self, mock_gitrepo, repo_url, extra_conn_kwargs, expected_url, create_connection_without_db
+    ):
+        create_connection_without_db(
+            Connection(
+                conn_id="git_default",
+                host=repo_url,
+                conn_type="git",
+                **(extra_conn_kwargs or {}),
+            )
+        )
+        bundle = GitDagBundle(
+            name="test",
+            tracking_ref="main",
+            subdir="subdir",
+            git_conn_id="git_default",
+        )
+        bundle.initialize = mock.MagicMock()
+        view_url_template = bundle.view_url_template()
+        assert view_url_template == expected_url
+        bundle.initialize.assert_not_called()
+
     @mock.patch("airflow.providers.git.bundles.git.Repo")
     def test_view_url_returns_none_when_no_version_in_view_url(self, mock_gitrepo):
         bundle = GitDagBundle(