airflow-postgres-csv 0.2.0__tar.gz → 0.3.0__tar.gz

{airflow_postgres_csv-0.2.0 → airflow_postgres_csv-0.3.0}/.github/workflows/publish.yml

@@ -46,6 +46,9 @@ jobs:
   verify:
     needs: publish
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        airflow: ["2", "3"]
     steps:
       - uses: actions/checkout@v4
 
@@ -54,13 +57,11 @@ jobs:
         with:
           python-version: "3.12"
 
+      - name: Install tox
+        run: pip install tox
+
       - name: Wait for PyPI to update
         run: sleep 30
 
-      - name: Install from PyPI and test dependencies
-        run: |
-          pip install airflow-postgres-csv pytest
-          pip show airflow-postgres-csv
-
-      - name: Run tests against installed package
-        run: pytest tests/ -v
+      - name: Run tests against published package (Airflow ${{ matrix.airflow }})
+        run: tox -e verify-airflow${{ matrix.airflow }}

airflow_postgres_csv-0.3.0/.github/workflows/test.yml

@@ -0,0 +1,42 @@
+name: Tests
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10", "3.11", "3.12"]
+        tox-env: ["airflow2", "airflow3"]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        run: uv python install ${{ matrix.python-version }}
+
+      - name: Install tox
+        run: |
+          uv venv .venv --python ${{ matrix.python-version }}
+          uv pip install tox tox-uv --python .venv/bin/python
+
+      - name: Run ${{ matrix.tox-env }} tests
+        run: .venv/bin/tox -e ${{ matrix.tox-env }}
+
+      - name: Upload coverage to Codecov
+        if: matrix.python-version == '3.12' && matrix.tox-env == 'airflow3'
+        uses: codecov/codecov-action@v4
+        with:
+          files: coverage.xml
+          fail_ci_if_error: false
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

{airflow_postgres_csv-0.2.0 → airflow_postgres_csv-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: airflow-postgres-csv
-Version: 0.2.0
+Version: 0.3.0
 Summary: Airflow operators for PostgreSQL <-> CSV file transfers using COPY
 Project-URL: Repository, https://github.com/Redevil10/airflow-postgres-csv
 Author: Qing Wan
@@ -10,18 +10,26 @@ Classifier: Framework :: Apache Airflow
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
-Requires-Dist: apache-airflow-providers-postgres>=6.0.0
-Requires-Dist: apache-airflow>=3.0.0
+Requires-Dist: apache-airflow-providers-postgres>=5.0
+Requires-Dist: apache-airflow>=2.9
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == 'dev'
 Requires-Dist: pytest-cov; extra == 'dev'
 Requires-Dist: pytest>=8.0; extra == 'dev'
 Requires-Dist: ruff; extra == 'dev'
+Requires-Dist: tox>=4.0; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # airflow-postgres-csv
 
-Airflow 3 operators for bulk PostgreSQL <-> CSV transfers using `COPY`.
+[![lint](https://github.com/Redevil10/airflow-postgres-csv/actions/workflows/lint.yml/badge.svg)](https://github.com/Redevil10/airflow-postgres-csv/actions/workflows/lint.yml)
+[![tests](https://github.com/Redevil10/airflow-postgres-csv/actions/workflows/test.yml/badge.svg)](https://github.com/Redevil10/airflow-postgres-csv/actions/workflows/test.yml)
+[![codecov](https://codecov.io/github/Redevil10/airflow-postgres-csv/graph/badge.svg)](https://codecov.io/gh/Redevil10/airflow-postgres-csv)
+[![python](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12-blue.svg)](https://www.python.org/downloads/)
+[![airflow](https://img.shields.io/badge/airflow-2.9%2B%20%7C%203.x-blue.svg)](https://airflow.apache.org/)
+[![PyPI](https://img.shields.io/pypi/v/airflow-postgres-csv)](https://pypi.org/project/airflow-postgres-csv/)
+
+Airflow operators for bulk PostgreSQL <-> CSV transfers using `COPY`. Supports Airflow 2.9+ and Airflow 3.
 
 ## Operators
 
@@ -126,10 +134,29 @@ CsvToPostgresOperator(
 | `null_string` | String representing NULL | `""` |
 | `timeout` | Query timeout in minutes | `60` |
 
+## Development
+
+### Running tests
+
+Tests can be run against both supported Airflow versions using [tox](https://tox.wiki):
+
+```bash
+pip install tox
+
+tox -e airflow2   # test against Airflow 2.x
+tox -e airflow3   # test against Airflow 3.x
+tox               # run both
+```
+
+Each environment installs the correct Airflow and provider versions automatically — no manual dependency management needed.
+
 ## Requirements
 
-- Apache Airflow >= 3.0.0
-- apache-airflow-providers-postgres >= 6.0.0
+| | Airflow 2 | Airflow 3 |
+|---|---|---|
+| `apache-airflow` | `>=2.9, <3.0` | `>=3.0` |
+| `apache-airflow-providers-postgres` | `>=5.0, <6.0` | `>=6.0` |
+| Python | 3.10 – 3.12 | 3.10 – 3.12 |
 
 ## License
 

{airflow_postgres_csv-0.2.0 → airflow_postgres_csv-0.3.0}/README.md

@@ -1,6 +1,13 @@
 # airflow-postgres-csv
 
-Airflow 3 operators for bulk PostgreSQL <-> CSV transfers using `COPY`.
+[![lint](https://github.com/Redevil10/airflow-postgres-csv/actions/workflows/lint.yml/badge.svg)](https://github.com/Redevil10/airflow-postgres-csv/actions/workflows/lint.yml)
+[![tests](https://github.com/Redevil10/airflow-postgres-csv/actions/workflows/test.yml/badge.svg)](https://github.com/Redevil10/airflow-postgres-csv/actions/workflows/test.yml)
+[![codecov](https://codecov.io/github/Redevil10/airflow-postgres-csv/graph/badge.svg)](https://codecov.io/gh/Redevil10/airflow-postgres-csv)
+[![python](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12-blue.svg)](https://www.python.org/downloads/)
+[![airflow](https://img.shields.io/badge/airflow-2.9%2B%20%7C%203.x-blue.svg)](https://airflow.apache.org/)
+[![PyPI](https://img.shields.io/pypi/v/airflow-postgres-csv)](https://pypi.org/project/airflow-postgres-csv/)
+
+Airflow operators for bulk PostgreSQL <-> CSV transfers using `COPY`. Supports Airflow 2.9+ and Airflow 3.
 
 ## Operators
 
@@ -105,10 +112,29 @@ CsvToPostgresOperator(
 | `null_string` | String representing NULL | `""` |
 | `timeout` | Query timeout in minutes | `60` |
 
+## Development
+
+### Running tests
+
+Tests can be run against both supported Airflow versions using [tox](https://tox.wiki):
+
+```bash
+pip install tox
+
+tox -e airflow2   # test against Airflow 2.x
+tox -e airflow3   # test against Airflow 3.x
+tox               # run both
+```
+
+Each environment installs the correct Airflow and provider versions automatically — no manual dependency management needed.
+
 ## Requirements
 
-- Apache Airflow >= 3.0.0
-- apache-airflow-providers-postgres >= 6.0.0
+| | Airflow 2 | Airflow 3 |
+|---|---|---|
+| `apache-airflow` | `>=2.9, <3.0` | `>=3.0` |
+| `apache-airflow-providers-postgres` | `>=5.0, <6.0` | `>=6.0` |
+| Python | 3.10 – 3.12 | 3.10 – 3.12 |
 
 ## License
 

airflow_postgres_csv-0.3.0/pyproject.toml

@@ -0,0 +1,96 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "airflow-postgres-csv"
+version = "0.3.0"
+description = "Airflow operators for PostgreSQL <-> CSV file transfers using COPY"
+readme = "README.md"
+license = "MIT"
+requires-python = ">=3.10"
+authors = [{ name = "Qing Wan" }]
+classifiers = [
+    "Framework :: Apache Airflow",
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+]
+
+dependencies = [
+    "apache-airflow>=2.9",
+    "apache-airflow-providers-postgres>=5.0",
+]
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=8.0",
+    "pytest-cov",
+    "ruff",
+    "pre-commit",
+    "tox>=4.0",
+]
+
+[project.urls]
+Repository = "https://github.com/Redevil10/airflow-postgres-csv"
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/airflow_postgres_csv"]
+
+[tool.ruff]
+target-version = "py310"
+line-length = 99
+
+[tool.ruff.lint]
+select = ["E", "F", "I", "UP"]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+
+[tool.tox]
+env_list = ["airflow2", "airflow3"]
+
+[tool.tox.env.airflow2]
+description = "Test against Apache Airflow 2.x (requires Python 3.10–3.12)"
+skip_install = true
+set_env = "PYTHONPATH = {toxinidir}/src"
+deps = [
+    "apache-airflow>=2.9,<3.0",
+    "apache-airflow-providers-postgres>=5.0,<6.0",
+    "pytest>=8.0",
+    "pytest-cov",
+]
+commands = [["pytest", "--cov=airflow_postgres_csv", "--cov-report=xml", "{posargs:tests/}"]]
+
+[tool.tox.env.airflow3]
+description = "Test against Apache Airflow 3.x"
+skip_install = true
+set_env = "PYTHONPATH = {toxinidir}/src"
+deps = [
+    "apache-airflow>=3.0",
+    "apache-airflow-providers-postgres>=6.0",
+    "pytest>=8.0",
+    "pytest-cov",
+]
+commands = [["pytest", "--cov=airflow_postgres_csv", "--cov-report=xml", "{posargs:tests/}"]]
+
+[tool.tox.env.verify-airflow2]
+description = "Verify the published PyPI package works with Airflow 2.x"
+skip_install = true
+deps = [
+    "airflow-postgres-csv",
+    "apache-airflow>=2.9,<3.0",
+    "apache-airflow-providers-postgres>=5.0,<6.0",
+    "pytest>=8.0",
+]
+commands = [["pytest", "{posargs:tests/}"]]
+
+[tool.tox.env.verify-airflow3]
+description = "Verify the published PyPI package works with Airflow 3.x"
+skip_install = true
+deps = [
+    "airflow-postgres-csv",
+    "apache-airflow>=3.0",
+    "apache-airflow-providers-postgres>=6.0",
+    "pytest>=8.0",
+]
+commands = [["pytest", "{posargs:tests/}"]]

{airflow_postgres_csv-0.2.0 → airflow_postgres_csv-0.3.0}/src/airflow_postgres_csv/operators.py

@@ -6,7 +6,11 @@ from collections.abc import Sequence
 
 from airflow.exceptions import AirflowException
 from airflow.providers.postgres.hooks.postgres import PostgresHook
-from airflow.sdk.bases.operator import BaseOperator
+
+try:
+    from airflow.sdk.bases.operator import BaseOperator  # Airflow 3
+except ImportError:
+    from airflow.models import BaseOperator  # Airflow 2
 
 
 class PostgresToCsvOperator(BaseOperator):

{airflow_postgres_csv-0.2.0 → airflow_postgres_csv-0.3.0}/tests/test_operators.py

@@ -194,3 +194,81 @@ class TestCsvToPostgresOperator:
         result = op.execute(context={})
         assert result == 42  # mocked rowcount
         mock_pg_hook["cursor"].copy_expert.assert_called_once()
+
+
+# ---------------------------------------------------------------------------
+# Airflow 2 compatibility tests
+#
+# In Airflow 3, airflow.models.BaseOperator is a re-export of
+# airflow.sdk.bases.operator.BaseOperator, so these tests run in either version.
+# The try/except in operators.py is what enables the code to import on a real
+# Airflow 2 install where airflow.sdk does not exist.
+# ---------------------------------------------------------------------------
+
+
+class TestAirflow2Compatibility:
+    """
+    Verify that operators are compatible with the Airflow 2 import path
+    (``airflow.models.BaseOperator``).
+
+    A real Airflow 2 environment cannot be simulated in an Airflow 3 process
+    because Airflow 3 re-exports ``BaseOperator`` through the same ``airflow.sdk``
+    machinery from both import paths.  These tests confirm that:
+
+    * ``from airflow.models import BaseOperator`` resolves successfully (the
+      fallback import the operators use on Airflow 2).
+    * Both operators are subclasses of that ``BaseOperator``.
+    * Both operators execute correctly when invoked the Airflow 2 way.
+    """
+
+    def test_fallback_import_target_is_accessible(self):
+        """airflow.models.BaseOperator can be imported (the Airflow 2 fallback path)."""
+        from airflow.models import BaseOperator
+
+        assert BaseOperator is not None
+
+    def test_operators_subclass_models_baseoperator(self):
+        """Both operators are subclasses of airflow.models.BaseOperator."""
+        from airflow.models import BaseOperator
+
+        from airflow_postgres_csv.operators import CsvToPostgresOperator, PostgresToCsvOperator
+
+        assert issubclass(PostgresToCsvOperator, BaseOperator)
+        assert issubclass(CsvToPostgresOperator, BaseOperator)
+
+    def test_postgres_to_csv_is_instance_of_models_baseoperator(self, mock_pg_hook, tmp_path):
+        """A PostgresToCsvOperator instance is recognised as a BaseOperator on Airflow 2."""
+        from airflow.models import BaseOperator
+
+        from airflow_postgres_csv.operators import PostgresToCsvOperator
+
+        csv_path = str(tmp_path / "out.csv")
+        op = PostgresToCsvOperator(
+            task_id="test_af2",
+            conn_id="test_conn",
+            csv_file_path=csv_path,
+            sql="SELECT 1",
+        )
+        assert isinstance(op, BaseOperator)
+        result = op.execute(context={})
+        assert result == csv_path
+        mock_pg_hook["cursor"].copy_expert.assert_called_once()
+
+    def test_csv_to_postgres_is_instance_of_models_baseoperator(self, mock_pg_hook, tmp_path):
+        """A CsvToPostgresOperator instance is recognised as a BaseOperator on Airflow 2."""
+        from airflow.models import BaseOperator
+
+        from airflow_postgres_csv.operators import CsvToPostgresOperator
+
+        csv_file = tmp_path / "data.csv"
+        csv_file.write_text("a,b\n1,2\n")
+        op = CsvToPostgresOperator(
+            task_id="test_af2",
+            conn_id="test_conn",
+            table_name="my_table",
+            csv_file_path=str(csv_file),
+        )
+        assert isinstance(op, BaseOperator)
+        result = op.execute(context={})
+        assert result == 42  # mocked rowcount
+        mock_pg_hook["cursor"].copy_expert.assert_called_once()

airflow_postgres_csv-0.2.0/.github/workflows/test.yml

@@ -1,30 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.10", "3.11", "3.12"]
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v4
-
-      - name: Set up Python ${{ matrix.python-version }}
-        run: uv python install ${{ matrix.python-version }}
-
-      - name: Install dependencies
-        run: |
-          uv venv .venv --python ${{ matrix.python-version }}
-          uv pip install -e ".[dev]" --python .venv/bin/python
-
-      - name: Test
-        run: .venv/bin/pytest -v

airflow_postgres_csv-0.2.0/pyproject.toml

@@ -1,46 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "airflow-postgres-csv"
-version = "0.2.0"
-description = "Airflow operators for PostgreSQL <-> CSV file transfers using COPY"
-readme = "README.md"
-license = "MIT"
-requires-python = ">=3.10"
-authors = [{ name = "Qing Wan" }]
-classifiers = [
-    "Framework :: Apache Airflow",
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: MIT License",
-]
-
-dependencies = [
-    "apache-airflow>=3.0.0",
-    "apache-airflow-providers-postgres>=6.0.0",
-]
-
-[project.optional-dependencies]
-dev = [
-    "pytest>=8.0",
-    "pytest-cov",
-    "ruff",
-    "pre-commit",
-]
-
-[project.urls]
-Repository = "https://github.com/Redevil10/airflow-postgres-csv"
-
-[tool.hatch.build.targets.wheel]
-packages = ["src/airflow_postgres_csv"]
-
-[tool.ruff]
-target-version = "py310"
-line-length = 99
-
-[tool.ruff.lint]
-select = ["E", "F", "I", "UP"]
-
-[tool.pytest.ini_options]
-testpaths = ["tests"]