prefect-gitlab 0.2.7__tar.gz → 0.3.0__tar.gz

{prefect_gitlab-0.2.7/prefect_gitlab.egg-info → prefect_gitlab-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect-gitlab
-Version: 0.2.7
+Version: 0.3.0
 Summary: A Prefect collection for working with GitLab repositories.
 Author-email: "Prefect Technologies, Inc." <help@prefect.io>
 License: Apache License 2.0
@@ -11,16 +11,15 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: prefect<3.0.0,>=2.20.0
+Requires-Dist: prefect>=3.0.0rc1
 Requires-Dist: python-gitlab>=3.12.0
 Requires-Dist: tenacity>=8.2.3
 Provides-Extra: dev
@@ -31,12 +30,12 @@ Requires-Dist: mkdocs-gen-files; extra == "dev"
 Requires-Dist: mkdocs-material; extra == "dev"
 Requires-Dist: mkdocs; extra == "dev"
 Requires-Dist: mkdocstrings[python]; extra == "dev"
-Requires-Dist: mock; python_version < "3.8" and extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pillow; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-env; extra == "dev"
 Requires-Dist: pytest-xdist; extra == "dev"
 
 # prefect-gitlab
@@ -56,7 +55,7 @@ Requires-Dist: pytest-xdist; extra == "dev"
 
 ### Python setup
 
-Requires an installation of Python 3.8 or higher.
+Requires an installation of Python 3.9 or higher.
 
 We recommend using a Python virtual environment manager such as pipenv, conda, or virtualenv.
 

{prefect_gitlab-0.2.7 → prefect_gitlab-0.3.0}/README.md

@@ -15,7 +15,7 @@
 
 ### Python setup
 
-Requires an installation of Python 3.8 or higher.
+Requires an installation of Python 3.9 or higher.
 
 We recommend using a Python virtual environment manager such as pipenv, conda, or virtualenv.
 

{prefect_gitlab-0.2.7 → prefect_gitlab-0.3.0}/prefect_gitlab/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.2.7'
-__version_tuple__ = version_tuple = (0, 2, 7)
+__version__ = version = '0.3.0'
+__version_tuple__ = version_tuple = (0, 3, 0)

{prefect_gitlab-0.2.7 → prefect_gitlab-0.3.0}/prefect_gitlab/credentials.py

@@ -1,15 +1,12 @@
 """Module used to enable authenticated interactions with GitLab"""
 
+from typing import Optional
+
 from gitlab import Gitlab
-from pydantic import VERSION as PYDANTIC_VERSION
+from pydantic import Field, SecretStr
 
 from prefect.blocks.core import Block
 
-if PYDANTIC_VERSION.startswith("2."):
-    from pydantic.v1 import Field, HttpUrl, SecretStr
-else:
-    from pydantic import Field, HttpUrl, SecretStr
-
 
 class GitLabCredentials(Block):
     """
@@ -29,17 +26,14 @@ class GitLabCredentials(Block):
     """
 
     _block_type_name = "GitLab Credentials"
-    _logo_url = HttpUrl(
-        url="https://images.ctfassets.net/gm98wzqotmnx/55edIimT4g9gbjhkh5a3Sp/dfdb9391d8f45c2e93e72e3a4d350771/gitlab-logo-500.png?h=250",  # noqa
-        scheme="https",
-    )
+    _logo_url = "https://images.ctfassets.net/gm98wzqotmnx/55edIimT4g9gbjhkh5a3Sp/dfdb9391d8f45c2e93e72e3a4d350771/gitlab-logo-500.png?h=250"
 
-    token: SecretStr = Field(
-        name="Personal Access Token",
+    token: Optional[SecretStr] = Field(
+        title="Personal Access Token",
         default=None,
         description="A GitLab Personal Access Token with read_repository scope.",
     )
-    url: str = Field(
+    url: Optional[str] = Field(
         default=None, title="URL", description="URL to self-hosted GitLab instances."
     )
 

{prefect_gitlab-0.2.7 → prefect_gitlab-0.3.0}/prefect_gitlab/repositories.py

@@ -48,19 +48,12 @@ from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Optional, Tuple, Union
 
-from pydantic import VERSION as PYDANTIC_VERSION
+from pydantic import Field
 from tenacity import retry, stop_after_attempt, wait_fixed, wait_random
 
-from prefect.exceptions import InvalidRepositoryURLError
 from prefect.filesystems import ReadableDeploymentStorage
 from prefect.utilities.asyncutils import sync_compatible
 from prefect.utilities.processutils import run_process
-
-if PYDANTIC_VERSION.startswith("2."):
-    from pydantic.v1 import Field, HttpUrl, validator
-else:
-    from pydantic import Field, HttpUrl, validator
-
 from prefect_gitlab.credentials import GitLabCredentials
 
 # Create get_directory retry settings
@@ -80,10 +73,7 @@ class GitLabRepository(ReadableDeploymentStorage):
     """
 
     _block_type_name = "GitLab Repository"
-    _logo_url = HttpUrl(
-        url="https://images.ctfassets.net/gm98wzqotmnx/55edIimT4g9gbjhkh5a3Sp/dfdb9391d8f45c2e93e72e3a4d350771/gitlab-logo-500.png?h=250",  # noqa
-        scheme="https",
-    )
+    _logo_url = "https://images.ctfassets.net/gm98wzqotmnx/55edIimT4g9gbjhkh5a3Sp/dfdb9391d8f45c2e93e72e3a4d350771/gitlab-logo-500.png?h=250"
     _description = "Interact with files stored in GitLab repositories."
 
     repository: str = Field(
@@ -108,29 +98,6 @@ class GitLabRepository(ReadableDeploymentStorage):
         "private GitLab repos.",
     )
 
-    @validator("credentials")
-    def _ensure_credentials_go_with_http(cls, v: str, values: dict) -> str:
-        """Ensure that credentials are not provided with 'SSH' formatted GitLub URLs.
-        Note: validates `access_token` specifically so that it only fires when
-        private repositories are used.
-        """
-        if v is not None:
-            if urllib.parse.urlparse(values["repository"]).scheme not in [
-                "https",
-                "http",
-            ]:
-                raise InvalidRepositoryURLError(
-                    (
-                        "Credentials can only be used with GitLab repositories "
-                        "using the 'HTTPS'/'HTTP' format. You must either remove the "
-                        "credential if you wish to use the 'SSH' format and are not "
-                        "using a private repository, or you must change the repository "
-                        "URL to the 'HTTPS'/'HTTP' format."
-                    )
-                )
-
-        return v
-
     def _create_repo_url(self) -> str:
         """Format the URL provided to the `git clone` command.
         For private repos: https://<oauth-key>@gitlab.com/<username>/<repo>.git

{prefect_gitlab-0.2.7 → prefect_gitlab-0.3.0/prefect_gitlab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect-gitlab
-Version: 0.2.7
+Version: 0.3.0
 Summary: A Prefect collection for working with GitLab repositories.
 Author-email: "Prefect Technologies, Inc." <help@prefect.io>
 License: Apache License 2.0
@@ -11,16 +11,15 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: prefect<3.0.0,>=2.20.0
+Requires-Dist: prefect>=3.0.0rc1
 Requires-Dist: python-gitlab>=3.12.0
 Requires-Dist: tenacity>=8.2.3
 Provides-Extra: dev
@@ -31,12 +30,12 @@ Requires-Dist: mkdocs-gen-files; extra == "dev"
 Requires-Dist: mkdocs-material; extra == "dev"
 Requires-Dist: mkdocs; extra == "dev"
 Requires-Dist: mkdocstrings[python]; extra == "dev"
-Requires-Dist: mock; python_version < "3.8" and extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pillow; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-env; extra == "dev"
 Requires-Dist: pytest-xdist; extra == "dev"
 
 # prefect-gitlab
@@ -56,7 +55,7 @@ Requires-Dist: pytest-xdist; extra == "dev"
 
 ### Python setup
 
-Requires an installation of Python 3.8 or higher.
+Requires an installation of Python 3.9 or higher.
 
 We recommend using a Python virtual environment manager such as pipenv, conda, or virtualenv.
 

{prefect_gitlab-0.2.7 → prefect_gitlab-0.3.0}/prefect_gitlab.egg-info/requires.txt

@@ -1,4 +1,4 @@
-prefect<3.0.0,>=2.20.0
+prefect>=3.0.0rc1
 python-gitlab>=3.12.0
 tenacity>=8.2.3
 
@@ -15,7 +15,5 @@ pillow
 pre-commit
 pytest-asyncio
 pytest
+pytest-env
 pytest-xdist
-
-[dev:python_version < "3.8"]
-mock

{prefect_gitlab-0.2.7 → prefect_gitlab-0.3.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "prefect-gitlab"
 description = "A Prefect collection for working with GitLab repositories."
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 license = { text = "Apache License 2.0" }
 keywords = ["prefect"]
 authors = [{ name = "Prefect Technologies, Inc.", email = "help@prefect.io" }]
@@ -16,7 +16,6 @@ classifiers = [
   "Intended Audience :: System Administrators",
   "License :: OSI Approved :: Apache Software License",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
@@ -24,7 +23,7 @@ classifiers = [
   "Topic :: Software Development :: Libraries",
 ]
 dependencies = [
-  "prefect>=2.20.0, < 3.0.0",
+  "prefect>=3.0.0rc1",
   "python-gitlab>=3.12.0",
   "tenacity>=8.2.3",
 ]
@@ -39,12 +38,12 @@ dev = [
   "mkdocs-material",
   "mkdocs",
   "mkdocstrings[python]",
-  "mock; python_version < '3.8'",
   "mypy",
   "pillow",
   "pre-commit",
   "pytest-asyncio",
   "pytest",
+  "pytest-env",
   "pytest-xdist",
 ]
 
@@ -57,7 +56,7 @@ prefect_gitlab = "prefect_gitlab"
 [tool.setuptools_scm]
 version_file = "prefect_gitlab/_version.py"
 root = "../../.."
-tag_regex = "^prefect-gitlab-(?P<version>\\d+\\.\\d+\\.\\d+)$"
+tag_regex = "^prefect-gitlab-(?P<version>\\d+\\.\\d+\\.\\d+(?:[a-zA-Z0-9]+(?:\\.[a-zA-Z0-9]+)*)?)$"
 fallback_version = "0.0.0"
 git_describe_command = 'git describe --dirty --tags --long --match "prefect-gitlab-*[0-9]*"'
 
@@ -77,3 +76,6 @@ show_missing = true
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
+env = [
+  "PREFECT_TEST_MODE=1",
+]

{prefect_gitlab-0.2.7 → prefect_gitlab-0.3.0}/tests/conftest.py

@@ -10,14 +10,3 @@ def prefect_db():
     """
     with prefect_test_harness():
         yield
-
-
-@pytest.fixture(autouse=True)
-def reset_object_registry():
-    """
-    Ensures each test has a clean object registry.
-    """
-    from prefect.context import PrefectObjectRegistry
-
-    with PrefectObjectRegistry():
-        yield

{prefect_gitlab-0.2.7 → prefect_gitlab-0.3.0}/tests/test_repositories.py

@@ -3,20 +3,13 @@ from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Set, Tuple
 
-import pytest
-from pydantic import VERSION as PYDANTIC_VERSION
-
-from prefect.exceptions import InvalidRepositoryURLError
-from prefect.testing.utilities import AsyncMock
-
-if PYDANTIC_VERSION.startswith("2."):
-    from pydantic.v1 import SecretStr
-else:
-    from pydantic import SecretStr
-
 import prefect_gitlab
+import pytest
 from prefect_gitlab.credentials import GitLabCredentials
 from prefect_gitlab.repositories import GitLabRepository  # noqa: E402
+from pydantic import SecretStr
+
+from prefect.testing.utilities import AsyncMock
 
 
 class TestGitLab:
@@ -170,30 +163,6 @@ class TestGitLab:
         ]
         assert mock.await_args[0][0][: len(expected_cmd)] == expected_cmd
 
-    async def test_ssh_fails_with_credential(self, monkeypatch):
-        """Ensure that credentials cannot be passed in if the URL is not in the HTTPS/HTTP
-        format.
-        """
-
-        class p:
-            returncode = 0
-
-        mock = AsyncMock(return_value=p())
-        monkeypatch.setattr(prefect_gitlab.repositories, "run_process", mock)
-        credential = "XYZ"
-        error_msg = (
-            "Credentials can only be used with GitLab repositories "
-            "using the 'HTTPS'/'HTTP' format. You must either remove the "
-            "credential if you wish to use the 'SSH' format and are not "
-            "using a private repository, or you must change the repository "
-            "URL to the 'HTTPS'/'HTTP' format."
-        )
-        with pytest.raises(InvalidRepositoryURLError, match=error_msg):
-            GitLabRepository(
-                repository="git@gitlab.com:PrefectHQ/prefect.git",
-                credentials=GitLabCredentials(token=SecretStr(credential)),
-            )
-
     async def test_dir_contents_copied_correctly_with_get_directory(self, monkeypatch):  # noqa
         """Check that `get_directory` is able to correctly copy contents from src->dst"""  # noqa