This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 9161259745a provider migrate cloudant (#46405)
9161259745a is described below
commit 9161259745ac1f759c115fb1c83de21c49c65122
Author: Niko Oliveira <[email protected]>
AuthorDate: Wed Feb 5 12:12:34 2025 -0800
provider migrate cloudant (#46405)
* Update provider schema to include excluded-python-versions
The provider schema previously supported this field but it was dropped
during the provider migration project. Cloudant is the only provider at
the time of writing which makes use of this mechanism
* Migrate Cloudant provider to new structure
* Updates from PR feedback
* Add wildcard for all patch releases of an excluded python version
If it is not already present add a wild card for all patch releases of
an excluded python version
* Fix install_airflow script to remove cloudant on 3.9
* Remove more spaces
* Remove the fix for version exclusions
With functional version exclusion in requires-python working, many
things in our CI are not setup to support this. So go back to "soft"
or non-functional exclusions. This will at least update the classifiers
---
.github/boring-cyborg.yml | 4 +-
airflow/new_provider.yaml.schema.json | 7 +
.../prepare_providers/provider_documentation.py | 1 +
.../templates/pyproject_TEMPLATE.toml.jinja2 | 2 +-
dev/breeze/src/airflow_breeze/utils/packages.py | 8 +
docs/.gitignore | 1 +
.../changelog.rst | 25 ---
generated/provider_dependencies.json | 2 +-
.../index.rst => providers/cloudant/README.rst | 57 ++----
.../docs}/.latest-doc-only-change.txt | 0
.../CHANGELOG.rst => cloudant/docs/changelog.rst} | 0
.../cloudant/docs}/commits.rst | 0
.../cloudant/docs}/index.rst | 0
.../docs}/installing-providers-from-sources.rst | 0
.../cloudant/docs/integration-logos}/Cloudant.png | Bin
.../cloudant/docs}/security.rst | 0
.../airflow/providers => }/cloudant/provider.yaml | 8 +-
.../cloudant/pyproject.toml | 69 ++-----
.../src/airflow/providers/cloudant/LICENSE | 201 +++++++++++++++++++++
.../src/airflow/providers/cloudant/__init__.py | 0
.../airflow/providers/cloudant/cloudant_fake.py | 0
.../providers/cloudant/get_provider_info.py | 78 ++++++++
.../airflow/providers/cloudant/hooks/__init__.py | 0
.../airflow/providers/cloudant/hooks/cloudant.py | 0
.../tests/conftest.py} | 22 +--
.../tests/provider_tests}/__init__.py | 2 +-
.../tests/provider_tests}/cloudant/__init__.py | 0
.../provider_tests}/cloudant/hooks/__init__.py | 0
.../cloudant/hooks/test_cloudant.py | 0
pyproject.toml | 3 +
scripts/ci/docker-compose/remove-sources.yml | 1 +
scripts/ci/docker-compose/tests-sources.yml | 1 +
32 files changed, 350 insertions(+), 142 deletions(-)
diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml
index 045a49b4f6e..6410440739c 100644
--- a/.github/boring-cyborg.yml
+++ b/.github/boring-cyborg.yml
@@ -99,9 +99,7 @@ labelPRBasedOnFilePath:
- providers/celery/**
provider:cloudant:
- - providers/src/airflow/providers/cloudant/**/*
- - docs/apache-airflow-providers-cloudant/**/*
- - providers/tests/cloudant/**/*
+ - providers/cloudant/**
provider:cncf-kubernetes:
- airflow/example_dags/example_kubernetes_executor.py
diff --git a/airflow/new_provider.yaml.schema.json
b/airflow/new_provider.yaml.schema.json
index 83f98abb038..4b5e16cedc0 100644
--- a/airflow/new_provider.yaml.schema.json
+++ b/airflow/new_provider.yaml.schema.json
@@ -31,6 +31,13 @@
"removed"
]
},
+ "excluded-python-versions": {
+ "description": "List of python versions excluded for that
provider",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
"integrations": {
"description": "List of integrations supported by the provider.",
"type": "array",
diff --git
a/dev/breeze/src/airflow_breeze/prepare_providers/provider_documentation.py
b/dev/breeze/src/airflow_breeze/prepare_providers/provider_documentation.py
index 6b705148c94..98936310c3c 100644
--- a/dev/breeze/src/airflow_breeze/prepare_providers/provider_documentation.py
+++ b/dev/breeze/src/airflow_breeze/prepare_providers/provider_documentation.py
@@ -1231,6 +1231,7 @@ def _regenerate_pyproject_toml(context: dict[str, Any],
provider_details: Provid
trim_blocks=True,
keep_trailing_newline=True,
)
+
get_pyproject_toml_path.write_text(get_pyproject_toml_content)
get_console().print(
f"[info]Generated {get_pyproject_toml_path} for the
{provider_details.provider_id} provider\n"
diff --git
a/dev/breeze/src/airflow_breeze/templates/pyproject_TEMPLATE.toml.jinja2
b/dev/breeze/src/airflow_breeze/templates/pyproject_TEMPLATE.toml.jinja2
index 5da149fa0d5..62560249e23 100644
--- a/dev/breeze/src/airflow_breeze/templates/pyproject_TEMPLATE.toml.jinja2
+++ b/dev/breeze/src/airflow_breeze/templates/pyproject_TEMPLATE.toml.jinja2
@@ -68,7 +68,7 @@ classifiers = [
{% endfor %}
"Topic :: System :: Monitoring",
]
-requires-python = "~=3.9"
+requires-python = "{{ REQUIRES_PYTHON }}"
# The dependencies should be modified in place in the generated file
# Any change in the dependencies is preserved when the file is regenerated
diff --git a/dev/breeze/src/airflow_breeze/utils/packages.py
b/dev/breeze/src/airflow_breeze/utils/packages.py
index fec5ed898d6..022f093871e 100644
--- a/dev/breeze/src/airflow_breeze/utils/packages.py
+++ b/dev/breeze/src/airflow_breeze/utils/packages.py
@@ -32,6 +32,7 @@ from rich.syntax import Syntax
from airflow_breeze.global_constants import (
ALLOWED_PYTHON_MAJOR_MINOR_VERSIONS,
+ DEFAULT_PYTHON_MAJOR_MINOR_VERSION,
PROVIDER_DEPENDENCIES,
PROVIDER_RUNTIME_DATA_SCHEMA_PATH,
REGULAR_DOC_PACKAGES,
@@ -788,6 +789,12 @@ def get_provider_jinja_context(
p for p in ALLOWED_PYTHON_MAJOR_MINOR_VERSIONS if p not in
provider_details.excluded_python_versions
]
cross_providers_dependencies =
get_cross_provider_dependent_packages(provider_package_id=provider_id)
+
+ # Most providers require the same python versions, but some may have
exclusions
+ requires_python_version: str = f"~={DEFAULT_PYTHON_MAJOR_MINOR_VERSION}"
+ for excluded_python_version in provider_details.excluded_python_versions:
+ requires_python_version += f",!={excluded_python_version}"
+
context: dict[str, Any] = {
"PROVIDER_ID": provider_details.provider_id,
"PACKAGE_PIP_NAME": get_pip_package_name(provider_details.provider_id),
@@ -825,6 +832,7 @@ def get_provider_jinja_context(
"PIP_REQUIREMENTS_TABLE_RST": convert_pip_requirements_to_table(
get_provider_requirements(provider_id), markdown=False
),
+ "REQUIRES_PYTHON": requires_python_version,
}
return context
diff --git a/docs/.gitignore b/docs/.gitignore
index 2125d28bc1c..9d9b6416854 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -18,6 +18,7 @@ apache-airflow-providers-apprise
apache-airflow-providers-asana
apache-airflow-providers-atlassian-jira
apache-airflow-providers-celery
+apache-airflow-providers-cloudant
apache-airflow-providers-cohere
apache-airflow-providers-common-compat
apache-airflow-providers-common-io
diff --git a/docs/apache-airflow-providers-cloudant/changelog.rst
b/docs/apache-airflow-providers-cloudant/changelog.rst
deleted file mode 100644
index d969e082c17..00000000000
--- a/docs/apache-airflow-providers-cloudant/changelog.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-
- .. Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- .. http://www.apache.org/licenses/LICENSE-2.0
-
- .. Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
- .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE
- OVERWRITTEN WHEN PREPARING PACKAGES.
-
- .. IF YOU WANT TO MODIFY THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
- `PROVIDER_CHANGELOG_TEMPLATE.rst.jinja2` IN the
`dev/breeze/src/airflow_breeze/templates` DIRECTORY
-
-.. include:: ../../providers/src/airflow/providers/cloudant/CHANGELOG.rst
diff --git a/generated/provider_dependencies.json
b/generated/provider_dependencies.json
index a67e67bfd14..787ced4abb2 100644
--- a/generated/provider_dependencies.json
+++ b/generated/provider_dependencies.json
@@ -352,7 +352,7 @@
"cloudant": {
"deps": [
"apache-airflow>=2.9.0",
- "ibmcloudant==0.9.1 ; python_version >= \"3.10\""
+ "ibmcloudant==0.9.1;python_version>=\"3.10\""
],
"devel-deps": [],
"plugins": [],
diff --git a/docs/apache-airflow-providers-cloudant/index.rst
b/providers/cloudant/README.rst
similarity index 53%
copy from docs/apache-airflow-providers-cloudant/index.rst
copy to providers/cloudant/README.rst
index aaec6134438..84bef64ed23 100644
--- a/docs/apache-airflow-providers-cloudant/index.rst
+++ b/providers/cloudant/README.rst
@@ -16,68 +16,47 @@
specific language governing permissions and limitations
under the License.
-``apache-airflow-providers-cloudant``
-=====================================
+ .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
+ .. IF YOU WANT TO MODIFY TEMPLATE FOR THIS FILE, YOU SHOULD MODIFY THE
TEMPLATE
+ `PROVIDER_README_TEMPLATE.rst.jinja2` IN the
`dev/breeze/src/airflow_breeze/templates` DIRECTORY
-.. toctree::
- :hidden:
- :maxdepth: 1
- :caption: Basics
- Home <self>
- Changelog <changelog>
- Security <security>
+Package ``apache-airflow-providers-cloudant``
-.. toctree::
- :hidden:
- :maxdepth: 1
- :caption: References
+Release: ``4.1.0``
- Python API <_api/airflow/providers/cloudant/index>
- PyPI Repository
<https://pypi.org/project/apache-airflow-providers-cloudant/>
- Installing from sources <installing-providers-from-sources>
-
-.. THE REMAINDER OF THE FILE IS AUTOMATICALLY GENERATED. IT WILL BE
OVERWRITTEN AT RELEASE TIME!
-
-
-.. toctree::
- :hidden:
- :maxdepth: 1
- :caption: Commits
-
- Detailed list of commits <commits>
-
-
-apache-airflow-providers-cloudant package
-------------------------------------------------------
`IBM Cloudant <https://www.ibm.com/cloud/cloudant>`__
-Release: 4.1.0
-
Provider package
----------------
-This package is for the ``cloudant`` provider.
-All classes for this package are included in the
``airflow.providers.cloudant`` python package.
+This is a provider package for ``cloudant`` provider. All classes for this
provider package
+are in ``airflow.providers.cloudant`` python package.
+
+You can find package information and changelog for the provider
+in the `documentation
<https://airflow.apache.org/docs/apache-airflow-providers-cloudant/4.1.0/>`_.
Installation
------------
-You can install this package on top of an existing Airflow 2 installation via
-``pip install apache-airflow-providers-cloudant``.
-For the minimum Airflow version supported, see ``Requirements`` below.
+You can install this package on top of an existing Airflow 2 installation (see
``Requirements`` below
+for the minimum Airflow version supported) via
+``pip install apache-airflow-providers-cloudant``
+
+The package supports the following python versions: 3.10,3.11,3.12
Requirements
------------
-The minimum Apache Airflow version supported by this provider package is
``2.9.0``.
-
================== =====================================
PIP package Version required
================== =====================================
``apache-airflow`` ``>=2.9.0``
``ibmcloudant`` ``==0.9.1; python_version >= "3.10"``
================== =====================================
+
+The changelog for the provider package can be found in the
+`changelog
<https://airflow.apache.org/docs/apache-airflow-providers-cloudant/4.1.0/changelog.html>`_.
diff --git
a/providers/src/airflow/providers/cloudant/.latest-doc-only-change.txt
b/providers/cloudant/docs/.latest-doc-only-change.txt
similarity index 100%
rename from providers/src/airflow/providers/cloudant/.latest-doc-only-change.txt
rename to providers/cloudant/docs/.latest-doc-only-change.txt
diff --git a/providers/src/airflow/providers/cloudant/CHANGELOG.rst
b/providers/cloudant/docs/changelog.rst
similarity index 100%
rename from providers/src/airflow/providers/cloudant/CHANGELOG.rst
rename to providers/cloudant/docs/changelog.rst
diff --git a/docs/apache-airflow-providers-cloudant/commits.rst
b/providers/cloudant/docs/commits.rst
similarity index 100%
rename from docs/apache-airflow-providers-cloudant/commits.rst
rename to providers/cloudant/docs/commits.rst
diff --git a/docs/apache-airflow-providers-cloudant/index.rst
b/providers/cloudant/docs/index.rst
similarity index 100%
rename from docs/apache-airflow-providers-cloudant/index.rst
rename to providers/cloudant/docs/index.rst
diff --git
a/docs/apache-airflow-providers-cloudant/installing-providers-from-sources.rst
b/providers/cloudant/docs/installing-providers-from-sources.rst
similarity index 100%
rename from
docs/apache-airflow-providers-cloudant/installing-providers-from-sources.rst
rename to providers/cloudant/docs/installing-providers-from-sources.rst
diff --git a/docs/integration-logos/cloudant/Cloudant.png
b/providers/cloudant/docs/integration-logos/Cloudant.png
similarity index 100%
rename from docs/integration-logos/cloudant/Cloudant.png
rename to providers/cloudant/docs/integration-logos/Cloudant.png
diff --git a/docs/apache-airflow-providers-cloudant/security.rst
b/providers/cloudant/docs/security.rst
similarity index 100%
rename from docs/apache-airflow-providers-cloudant/security.rst
rename to providers/cloudant/docs/security.rst
diff --git a/providers/src/airflow/providers/cloudant/provider.yaml
b/providers/cloudant/provider.yaml
similarity index 86%
rename from providers/src/airflow/providers/cloudant/provider.yaml
rename to providers/cloudant/provider.yaml
index dbbabf157a8..8a4944a2f62 100644
--- a/providers/src/airflow/providers/cloudant/provider.yaml
+++ b/providers/cloudant/provider.yaml
@@ -49,12 +49,6 @@ versions:
- 1.0.1
- 1.0.0
-dependencies:
- - apache-airflow>=2.9.0
- # Even though 3.9 is excluded below, we need to make this python_version
aware so that `uv` can generate a
- # full lock file when building lock file from provider sources
- - 'ibmcloudant==0.9.1 ; python_version >= "3.10"'
-
excluded-python-versions:
# ibmcloudant transitively brings in urllib3 2.x, but the snowflake provider
has a dependency that pins
# urllib3 to 1.x on Python 3.9; thus we exclude those Python versions from
taking the update
@@ -65,7 +59,7 @@ excluded-python-versions:
integrations:
- integration-name: IBM Cloudant
external-doc-url: https://www.ibm.com/cloud/cloudant
- logo: /integration-logos/cloudant/Cloudant.png
+ logo: /docs/integration-logos/Cloudant.png
tags: [service]
hooks:
diff --git
a/dev/breeze/src/airflow_breeze/templates/pyproject_TEMPLATE.toml.jinja2
b/providers/cloudant/pyproject.toml
similarity index 51%
copy from dev/breeze/src/airflow_breeze/templates/pyproject_TEMPLATE.toml.jinja2
copy to providers/cloudant/pyproject.toml
index 5da149fa0d5..61f2ce3c0ea 100644
--- a/dev/breeze/src/airflow_breeze/templates/pyproject_TEMPLATE.toml.jinja2
+++ b/providers/cloudant/pyproject.toml
@@ -1,22 +1,3 @@
-{#
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
-#}
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -43,9 +24,9 @@ requires = ["flit_core==3.10.1"]
build-backend = "flit_core.buildapi"
[project]
-name = "{{ PACKAGE_PIP_NAME }}"
-version = "{{RELEASE}}{{ VERSION_SUFFIX }}"
-description = "Provider package {{ PACKAGE_PIP_NAME }} for Apache Airflow"
+name = "apache-airflow-providers-cloudant"
+version = "4.1.0"
+description = "Provider package apache-airflow-providers-cloudant for Apache
Airflow"
readme = "README.rst"
authors = [
{name="Apache Software Foundation", email="[email protected]"},
@@ -53,7 +34,7 @@ authors = [
maintainers = [
{name="Apache Software Foundation", email="[email protected]"},
]
-keywords = [ "airflow-provider", "{{ PROVIDER_ID }}", "airflow", "integration"
]
+keywords = [ "airflow-provider", "cloudant", "airflow", "integration" ]
classifiers = [
"Development Status :: 5 - Production/Stable",
"Environment :: Console",
@@ -63,36 +44,25 @@ classifiers = [
"Framework :: Apache Airflow",
"Framework :: Apache Airflow :: Provider",
"License :: OSI Approved :: Apache Software License",
- {% for python_version in SUPPORTED_PYTHON_VERSIONS %}
- "Programming Language :: Python :: {{ python_version }}",
- {% endfor %}
+ "Programming Language :: Python :: 3.10",
+ "Programming Language :: Python :: 3.11",
+ "Programming Language :: Python :: 3.12",
"Topic :: System :: Monitoring",
]
-requires-python = "~=3.9"
+requires-python = "~=3.9,!=3.9"
# The dependencies should be modified in place in the generated file
# Any change in the dependencies is preserved when the file is regenerated
dependencies = [
-{{ INSTALL_REQUIREMENTS }}
+ "apache-airflow>=2.9.0",
+ # Even though 3.9 is excluded below, we need to make this python_version
aware so that `uv` can generate a
+ # full lock file when building lock file from provider sources
+ "ibmcloudant==0.9.1;python_version>=\"3.10\"",
]
-{% if EXTRAS_REQUIREMENTS %}
-
-# The optional dependencies should be modified in place in the generated file
-# Any change in the dependencies is preserved when the file is regenerated
-[project.optional-dependencies]
-{{ EXTRAS_REQUIREMENTS }}
-{% endif %}
-{% if DEPENDENCY_GROUPS %}
-
-# The dependency groups should be modified in place in the generated file
-# Any change in the dependencies is preserved when the file is regenerated
-[dependency-groups]
-{{ DEPENDENCY_GROUPS }}
-{% endif %}
[project.urls]
-"Documentation" = "https://airflow.apache.org/docs/{{ PACKAGE_PIP_NAME
}}/{{RELEASE}}"
-"Changelog" = "https://airflow.apache.org/docs/{{ PACKAGE_PIP_NAME
}}/{{RELEASE}}/changelog.html"
+"Documentation" =
"https://airflow.apache.org/docs/apache-airflow-providers-cloudant/4.1.0";
+"Changelog" =
"https://airflow.apache.org/docs/apache-airflow-providers-cloudant/4.1.0/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";
@@ -100,17 +70,10 @@ dependencies = [
"YouTube" = "https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/";
[project.entry-points."apache_airflow_provider"]
-provider_info = "airflow.providers.{{ PROVIDER_ID
}}.get_provider_info:get_provider_info"
-{% if PLUGINS %}
-
-[project.entry-points."airflow.plugins"]
-{% for plugin in PLUGINS %}
-{{ plugin.name }} = "{{ plugin.package_name }}:{{ plugin.class_name }}"
-{% endfor %}
-{% endif %}
+provider_info =
"airflow.providers.cloudant.get_provider_info:get_provider_info"
[tool.flit.module]
-name = "airflow.providers.{{ PROVIDER_ID }}"
+name = "airflow.providers.cloudant"
[tool.pytest.ini_options]
ignore = "tests/system/"
diff --git a/providers/cloudant/src/airflow/providers/cloudant/LICENSE
b/providers/cloudant/src/airflow/providers/cloudant/LICENSE
new file mode 100644
index 00000000000..11069edd790
--- /dev/null
+++ b/providers/cloudant/src/airflow/providers/cloudant/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/providers/src/airflow/providers/cloudant/__init__.py
b/providers/cloudant/src/airflow/providers/cloudant/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/cloudant/__init__.py
rename to providers/cloudant/src/airflow/providers/cloudant/__init__.py
diff --git a/providers/src/airflow/providers/cloudant/cloudant_fake.py
b/providers/cloudant/src/airflow/providers/cloudant/cloudant_fake.py
similarity index 100%
copy from providers/src/airflow/providers/cloudant/cloudant_fake.py
copy to providers/cloudant/src/airflow/providers/cloudant/cloudant_fake.py
diff --git
a/providers/cloudant/src/airflow/providers/cloudant/get_provider_info.py
b/providers/cloudant/src/airflow/providers/cloudant/get_provider_info.py
new file mode 100644
index 00000000000..b8935323687
--- /dev/null
+++ b/providers/cloudant/src/airflow/providers/cloudant/get_provider_info.py
@@ -0,0 +1,78 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
+#
+# IF YOU WANT TO MODIFY THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
+# `get_provider_info_TEMPLATE.py.jinja2` IN the
`dev/breeze/src/airflow_breeze/templates` DIRECTORY
+
+
+def get_provider_info():
+ return {
+ "package-name": "apache-airflow-providers-cloudant",
+ "name": "IBM Cloudant",
+ "description": "`IBM Cloudant
<https://www.ibm.com/cloud/cloudant>`__\n",
+ "state": "ready",
+ "source-date-epoch": 1734529058,
+ "versions": [
+ "4.1.0",
+ "4.0.3",
+ "4.0.2",
+ "4.0.1",
+ "4.0.0",
+ "3.6.0",
+ "3.5.2",
+ "3.5.1",
+ "3.5.0",
+ "3.4.1",
+ "3.4.0",
+ "3.3.0",
+ "3.2.1",
+ "3.2.0",
+ "3.1.0",
+ "3.0.0",
+ "2.0.4",
+ "2.0.3",
+ "2.0.2",
+ "2.0.1",
+ "2.0.0",
+ "1.0.1",
+ "1.0.0",
+ ],
+ "excluded-python-versions": ["3.9"],
+ "integrations": [
+ {
+ "integration-name": "IBM Cloudant",
+ "external-doc-url": "https://www.ibm.com/cloud/cloudant";,
+ "logo": "/docs/integration-logos/Cloudant.png",
+ "tags": ["service"],
+ }
+ ],
+ "hooks": [
+ {
+ "integration-name": "IBM Cloudant",
+ "python-modules":
["airflow.providers.cloudant.hooks.cloudant"],
+ }
+ ],
+ "connection-types": [
+ {
+ "hook-class-name":
"airflow.providers.cloudant.hooks.cloudant.CloudantHook",
+ "connection-type": "cloudant",
+ }
+ ],
+ "dependencies": ["apache-airflow>=2.9.0",
'ibmcloudant==0.9.1;python_version>="3.10"'],
+ }
diff --git a/providers/src/airflow/providers/cloudant/hooks/__init__.py
b/providers/cloudant/src/airflow/providers/cloudant/hooks/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/cloudant/hooks/__init__.py
rename to providers/cloudant/src/airflow/providers/cloudant/hooks/__init__.py
diff --git a/providers/src/airflow/providers/cloudant/hooks/cloudant.py
b/providers/cloudant/src/airflow/providers/cloudant/hooks/cloudant.py
similarity index 100%
rename from providers/src/airflow/providers/cloudant/hooks/cloudant.py
rename to providers/cloudant/src/airflow/providers/cloudant/hooks/cloudant.py
diff --git a/providers/src/airflow/providers/cloudant/cloudant_fake.py
b/providers/cloudant/tests/conftest.py
similarity index 61%
rename from providers/src/airflow/providers/cloudant/cloudant_fake.py
rename to providers/cloudant/tests/conftest.py
index 91b97c72a91..068fe6bbf5a 100644
--- a/providers/src/airflow/providers/cloudant/cloudant_fake.py
+++ b/providers/cloudant/tests/conftest.py
@@ -16,19 +16,17 @@
# under the License.
from __future__ import annotations
+import pathlib
-class CloudantV1:
- """Phony class to pass mypy when real class is not imported."""
+import pytest
- def __init__(self, authenticator):
- pass
+pytest_plugins = "tests_common.pytest_plugin"
- def set_service_url(self, service_url: str):
- pass
-
-class CouchDbSessionAuthenticator:
- """Phony class to pass mypy when real class is not imported."""
-
- def __init__(self, username: str, password: str):
- pass
[email protected](tryfirst=True)
+def pytest_configure(config: pytest.Config) -> None:
+ deprecations_ignore_path =
pathlib.Path(__file__).parent.joinpath("deprecations_ignore.yml")
+ dep_path = [deprecations_ignore_path] if deprecations_ignore_path.exists()
else []
+ config.inicfg["airflow_deprecations_ignore"] = (
+ config.inicfg.get("airflow_deprecations_ignore", []) + dep_path #
type: ignore[assignment,operator]
+ )
diff --git a/providers/tests/cloudant/hooks/__init__.py
b/providers/cloudant/tests/provider_tests/__init__.py
similarity index 90%
copy from providers/tests/cloudant/hooks/__init__.py
copy to providers/cloudant/tests/provider_tests/__init__.py
index 217e5db9607..e8fd2285643 100644
--- a/providers/tests/cloudant/hooks/__init__.py
+++ b/providers/cloudant/tests/provider_tests/__init__.py
@@ -1,4 +1,3 @@
-#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,3 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type:
ignore
diff --git a/providers/tests/cloudant/__init__.py
b/providers/cloudant/tests/provider_tests/cloudant/__init__.py
similarity index 100%
rename from providers/tests/cloudant/__init__.py
rename to providers/cloudant/tests/provider_tests/cloudant/__init__.py
diff --git a/providers/tests/cloudant/hooks/__init__.py
b/providers/cloudant/tests/provider_tests/cloudant/hooks/__init__.py
similarity index 100%
rename from providers/tests/cloudant/hooks/__init__.py
rename to providers/cloudant/tests/provider_tests/cloudant/hooks/__init__.py
diff --git a/providers/tests/cloudant/hooks/test_cloudant.py
b/providers/cloudant/tests/provider_tests/cloudant/hooks/test_cloudant.py
similarity index 100%
rename from providers/tests/cloudant/hooks/test_cloudant.py
rename to
providers/cloudant/tests/provider_tests/cloudant/hooks/test_cloudant.py
diff --git a/pyproject.toml b/pyproject.toml
index 8f024bf37b6..48e5ff48ef8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -656,6 +656,7 @@ dev = [
"apache-airflow-providers-asana",
"apache-airflow-providers-atlassian-jira",
"apache-airflow-providers-celery",
+ "apache-airflow-providers-cloudant",
"apache-airflow-providers-cohere",
"apache-airflow-providers-common-compat",
"apache-airflow-providers-common-io",
@@ -744,6 +745,7 @@ apache-airflow-providers-apprise = { workspace = true }
apache-airflow-providers-asana = { workspace = true }
apache-airflow-providers-atlassian-jira = { workspace = true }
apache-airflow-providers-celery = {workspace = true}
+apache-airflow-providers-cloudant = { workspace = true }
apache-airflow-providers-cohere = { workspace = true }
apache-airflow-providers-common-compat = { workspace = true }
apache-airflow-providers-common-io = { workspace = true }
@@ -830,6 +832,7 @@ members = [
"providers/asana",
"providers/atlassian/jira",
"providers/celery",
+ "providers/cloudant",
"providers/cohere",
"providers/common/compat",
"providers/common/io",
diff --git a/scripts/ci/docker-compose/remove-sources.yml
b/scripts/ci/docker-compose/remove-sources.yml
index 056da8cf4fa..ec4f9955060 100644
--- a/scripts/ci/docker-compose/remove-sources.yml
+++ b/scripts/ci/docker-compose/remove-sources.yml
@@ -50,6 +50,7 @@ services:
- ../../../empty:/opt/airflow/providers/asana/src
- ../../../empty:/opt/airflow/providers/atlassian/jira/src
- ../../../empty:/opt/airflow/providers/celery/src
+ - ../../../empty:/opt/airflow/providers/cloudant/src
- ../../../empty:/opt/airflow/providers/cohere/src
- ../../../empty:/opt/airflow/providers/common/compat/src
- ../../../empty:/opt/airflow/providers/common/io/src
diff --git a/scripts/ci/docker-compose/tests-sources.yml
b/scripts/ci/docker-compose/tests-sources.yml
index a1214bfb322..c26e5441f48 100644
--- a/scripts/ci/docker-compose/tests-sources.yml
+++ b/scripts/ci/docker-compose/tests-sources.yml
@@ -57,6 +57,7 @@ services:
- ../../../providers/asana/tests:/opt/airflow/providers/asana/tests
-
../../../providers/atlassian/jira/tests:/opt/airflow/providers/atlassian/jira/tests
- ../../../providers/celery/tests:/opt/airflow/providers/celery/tests
+ - ../../../providers/cloudant/tests:/opt/airflow/providers/cloudant/tests
- ../../../providers/cohere/tests:/opt/airflow/providers/cohere/tests
-
../../../providers/common/compat/tests:/opt/airflow/providers/common/compat/tests
-
../../../providers/common/io/tests:/opt/airflow/providers/common/io/tests
