fix: correct TOML structure and dependencies placement

Co-Authored-By: Aaron <AJ> Steers <[email protected]>
airbytehq · Jan 28, 2025 · 0bbf1aa · 0bbf1aa
1 parent df25f1c
commit 0bbf1aa
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 45 deletions.
diff --git a/.github/workflows/python_pytest.yml b/.github/workflows/python_pytest.yml
@@ -27,24 +27,22 @@ jobs:
     # Common steps:
     - name: Checkout code
       uses: actions/checkout@v4
-    - name: Set up Poetry
-      uses: Gr1N/setup-poetry@v9
-      with:
-        poetry-version: "2.0.1"
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: '3.10'
-        cache: 'poetry'
+        cache: 'pip'
+    - name: Install uv
+      run: curl -LsSf https://astral.sh/uv/install.sh | sh
     - name: Install dependencies
-      run: poetry install
+      run: uv pip install -e ".[dev]"
 
     - name: Run Pytest with Coverage (Fast Tests Only)
       timeout-minutes: 60
       env:
         GCP_GSM_CREDENTIALS: ${{ secrets.GCP_GSM_CREDENTIALS }}
       run: >
-        poetry run coverage run -m pytest
+        uv run coverage run -m pytest
         --durations=5 --exitfirst
         -m "not slow and not requires_creds and not linting and not flaky"
 
@@ -54,19 +52,19 @@ jobs:
       env:
         GCP_GSM_CREDENTIALS: ${{ secrets.GCP_GSM_CREDENTIALS }}
       run: >
-        poetry run coverage run -m pytest
+        uv run coverage run -m pytest
         --durations=5 --exitfirst
         -m "flaky and not slow and not requires_creds"
 
     - name: Print Coverage Report
       if: always()
-      run: poetry run coverage report
+      run: uv run coverage report
 
     - name: Create Coverage Artifacts
       if: always()
       run: |
-        poetry run coverage html -d htmlcov
-        poetry run coverage xml -o htmlcov/coverage.xml
+        uv run coverage html -d htmlcov
+        uv run coverage xml -o htmlcov/coverage.xml
 
     - name: Upload coverage to GitHub Artifacts
       if: always()
@@ -82,17 +80,15 @@ jobs:
     # Common steps:
     - name: Checkout code
       uses: actions/checkout@v4
-    - name: Set up Poetry
-      uses: Gr1N/setup-poetry@v9
-      with:
-        poetry-version: "1.7.1"
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: '3.10'
-        cache: 'poetry'
+        cache: 'pip'
+    - name: Install uv
+      run: curl -LsSf https://astral.sh/uv/install.sh | sh
     - name: Install dependencies
-      run: poetry install
+      run: uv pip install -e ".[dev]"
 
     # Job-specific step(s):
     - name: Run Pytest (No-Creds)
@@ -101,19 +97,19 @@ jobs:
         # Force this to a blank value.
         GCP_GSM_CREDENTIALS: ""
       run: >
-        poetry run coverage run -m pytest
+        uv run coverage run -m pytest
         --durations=5 --exitfirst
         -m "not requires_creds and not linting and not super_slow and not flaky"
 
     - name: Print Coverage Report
       if: always()
-      run: poetry run coverage report
+      run: uv run coverage report
 
     - name: Create Coverage Artifacts
       if: always()
       run: |
-        poetry run coverage html -d htmlcov
-        poetry run coverage xml -o htmlcov/coverage.xml
+        uv run coverage html -d htmlcov
+        uv run coverage xml -o htmlcov/coverage.xml
 
     - name: Upload coverage to GitHub Artifacts
       if: always()
@@ -149,37 +145,35 @@ jobs:
     # Common steps:
     - name: Checkout code
       uses: actions/checkout@v4
-    - name: Set up Poetry
-      uses: Gr1N/setup-poetry@v9
-      with:
-        poetry-version: "1.7.1"
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-        cache: 'poetry'
+        cache: 'pip'
+    - name: Install uv
+      run: curl -LsSf https://astral.sh/uv/install.sh | sh
     - name: Install dependencies
-      run: poetry install
+      run: uv pip install -e ".[dev]"
 
     # Job-specific step(s):
     - name: Run Pytest
       timeout-minutes: 60
       env:
         GCP_GSM_CREDENTIALS: ${{ secrets.GCP_GSM_CREDENTIALS }}
       run: >
-        poetry run coverage run -m pytest
+        uv run coverage run -m pytest
         --verbose
         -m "not linting and not super_slow and not flaky"
 
     - name: Print Coverage Report
       if: always()
-      run: poetry run coverage report
+      run: uv run coverage report
 
     - name: Create Coverage Artifacts
       if: always()
       run: |
-        poetry run coverage html -d htmlcov
-        poetry run coverage xml -o htmlcov/coverage.xml
+        uv run coverage html -d htmlcov
+        uv run coverage xml -o htmlcov/coverage.xml
 
     - name: Upload coverage to GitHub Artifacts
       if: always()
@@ -198,14 +192,13 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: '3.10'
-    - name: Set up Poetry
-      uses: Gr1N/setup-poetry@v9
-      with:
-        poetry-version: "1.7.1"
+        cache: 'pip'
+    - name: Install uv
+      run: curl -LsSf https://astral.sh/uv/install.sh | sh
     - name: Install dependencies
-      run: poetry install
+      run: uv pip install -e ".[dev]"
 
     # Job-specific step(s):
     - name: Run Deptry
       run: |
-        poetry run deptry .
+        uv run deptry .
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,13 +7,8 @@ authors = [
 ]
 readme = "README.md"
 packages = [{ include = "airbyte" }]
-urls = {
-    homepage = "https://airbyte.com",
-    repository = "https://github.com/airbytehq/pyairbyte",
-    documentation = "https://docs.airbyte.io/"
-}
+requires-python = ">=3.10,<3.13"
 dependencies = [
-    "python>=3.10,<3.13",
     "airbyte-api>=0.52.1,<1.0.0",
     "airbyte-cdk>=6.9.0,<7.0.0",
     "airbyte-protocol-models-pdv2>=0.13.0,<0.14.0",
@@ -43,9 +38,7 @@ dependencies = [
     "snowflake-connector-python>=3.12.2,<4.0.0",
     "snowflake-sqlalchemy>=1.6.1,<2.0.0",
     "structlog>=24.4.0,<25.0.0",
-    # TODO: Remove SQLAlchemy version constraint once DuckDB engine bug is fixed (issue #423)
     "sqlalchemy>=1.4.51,!=2.0.36,<3.0",
-    # TODO: Remove this arbitrary python constraint once `sqlalchemy-bigquery` has done so.
     "sqlalchemy-bigquery==1.12.0; python_version < '3.13'",
     "typing-extensions>=4.9.0",
     "uuid7>=0.1.0,<0.2.0"