Fix conflict

Author: savannahostrowski

.github/dependabot.yml

@@ -7,10 +7,12 @@ updates:
       interval: "daily"
     commit-message:
       prefix: ⬆
+    labels: [dependencies, internal]
   # Python
-  - package-ecosystem: "pip"
+  - package-ecosystem: "uv"
     directory: "/"
     schedule:
       interval: "daily"
     commit-message:
       prefix: ⬆
+    labels: [dependencies, internal]

.github/workflows/publish.yml

@@ -10,19 +10,20 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       id-token: write
+      contents: read
     steps:
       - name: Dump GitHub context
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
         run: echo "$GITHUB_CONTEXT"
       - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
-          python-version: "3.10"
-      - name: Install build dependencies
-        run: pip install build
+          python-version-file: "pyproject.toml"
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
       - name: Build distribution
-        run: python -m build
+        run: uv build
       - name: Publish
-        uses: pypa/gh-action-pypi-publish@v1.13.0
+        run: uv publish

.github/workflows/test-redistribute.yml

@@ -19,9 +19,9 @@ jobs:
         run: echo "$GITHUB_CONTEXT"
       - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
-          python-version: "3.10"
+          python-version-file: "pyproject.toml"
           # Issue ref: https://github.com/actions/setup-python/issues/436
           # cache: "pip"
           # cache-dependency-path: pyproject.toml
@@ -36,9 +36,7 @@ jobs:
       - name: Install test dependencies
         run: |
           cd dist/fastapi_cloud_cli*/
-          pip install -r requirements-tests.txt
-        env:
-          TIANGOLO_BUILD_PACKAGE: ${{ matrix.package }}
+          pip install --group dev .
       - name: Run source distribution tests
         run: |
           cd dist/fastapi_cloud_cli*/

.github/workflows/test.yml

@@ -23,55 +23,61 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version:
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-          - "3.12"
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        pydantic-version: ["v2"]
+        include:
+          - python-version: "3.8"
+            pydantic-version: "v1"
+          - python-version: "3.9"
+            pydantic-version: "v1"
+          - python-version: "3.10"
+            pydantic-version: "v1"
+          - python-version: "3.11"
+            pydantic-version: "v1"
+          - python-version: "3.12"
+            pydantic-version: "v1"
       fail-fast: false
+    runs-on: ubuntu-latest
     steps:
       - name: Dump GitHub context
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
         run: echo "$GITHUB_CONTEXT"
       - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           # Issue ref: https://github.com/actions/setup-python/issues/436
           # cache: "pip"
           # cache-dependency-path: pyproject.toml
-      - uses: actions/cache@v4
-        id: cache
-        with:
-          path: ${{ env.pythonLocation }}
-          key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml', 'requirements-tests.txt') }}
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
       # Allow debugging with tmate
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
         if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled == 'true' }}
         with:
           limit-access-to-actor: true
       - name: Install Dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: pip install -r requirements-tests.txt
+        run: uv sync --locked --all-extras --dev
+      - name: Install Pydantic v1
+        if: matrix.pydantic-version == 'v1'
+        run: uv pip install "pydantic<2.0.0"
       - name: Lint
-        run: bash scripts/lint.sh
+        run: uv run --no-sync scripts/lint.sh
       - run: mkdir coverage
       - name: Test
-        run: bash scripts/test.sh
+        run: uv run --no-sync scripts/test.sh
         env:
           COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}
           CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}
       - name: Store coverage files
         uses: actions/upload-artifact@v4
         with:
-          name: coverage-${{ matrix.python-version }}
+          name: coverage-${{ matrix.python-version }}-${{ matrix.pydantic-version }}
           path: coverage
           include-hidden-files: true
 
@@ -84,23 +90,25 @@ jobs:
           GITHUB_CONTEXT: ${{ toJson(github) }}
         run: echo "$GITHUB_CONTEXT"
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.8'
+          python-version-file: "pyproject.toml"
           # Issue ref: https://github.com/actions/setup-python/issues/436
           # cache: "pip"
           # cache-dependency-path: pyproject.toml
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
       - name: Get coverage files
         uses: actions/download-artifact@v5
         with:
           pattern: coverage-*
           path: coverage
           merge-multiple: true
-      - run: pip install coverage[toml]
+      - run: uv sync --locked --all-extras --dev
       - run: ls -la coverage
-      - run: coverage combine coverage
-      - run: coverage report
-      - run: coverage html --title "Coverage for ${{ github.sha }}"
+      - run: uv run coverage combine coverage
+      - run: uv run coverage report
+      - run: uv run coverage html --title "Coverage for ${{ github.sha }}"
       - name: Store coverage HTML
         uses: actions/upload-artifact@v4
         with:

.python-version

@@ -0,0 +1 @@
+3.8

pyproject.toml

@@ -28,7 +28,6 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
-    "License :: OSI Approved :: MIT License",
 ]
 dependencies = [
     "typer >= 0.12.3",
@@ -38,11 +37,23 @@ dependencies = [
     "rich-toolkit >= 0.14.5",
     "pydantic[email] >= 1.6.1",
     "sentry-sdk >= 2.20.0",
+    "fastar >= 0.8.0",
 ]
 
 [project.optional-dependencies]
 standard = ["uvicorn[standard] >= 0.15.0"]
 
+[dependency-groups]
+dev = [
+    "pre-commit>=2.17.0,<5.0.0",
+    "pytest>=4.4.0,<9.0.0",
+    "coverage[toml]>=6.2,<8.0",
+    "mypy==1.14.1",
+    "ruff==0.13.0",
+    "respx==0.22.0",
+    "time-machine==2.15.0",
+]
+
 [project.urls]
 Homepage = "https://github.com/fastapilabs/fastapi-cloud-cli"
 Documentation = "https://fastapi.tiangolo.com/fastapi-cloud-cli/"
@@ -59,7 +70,7 @@ version = { source = "file", path = "src/fastapi_cloud_cli/__init__.py" }
 distribution = true
 
 [tool.pdm.build]
-source-includes = ["tests/", "requirements*.txt", "scripts/"]
+source-includes = ["tests/", "scripts/"]
 
 [tool.pytest.ini_options]
 addopts = ["--strict-config", "--strict-markers"]
@@ -108,10 +119,6 @@ ignore = [
     "W191", # indentation contains tabs
 ]
 
-# [tool.ruff.lint.per-file-ignores]
-# "__init__.py" = ["F401"]
-
-
 [tool.ruff.lint.isort]
 known-third-party = ["typer", "fastapi"]
 

release-notes.md

@@ -2,6 +2,60 @@
 
 ## Latest Changes
 
+## 0.7.0
+
+### Features
+
+* ✨ Add upload cancellation notification on keyboard interrupt. PR [#129](https://github.com/fastapilabs/fastapi-cloud-cli/pull/129) by [@patrick91](https://github.com/patrick91).
+
+### Fixes
+
+* 🐛 Handle TimeoutError when waiting for deployment. PR [#131](https://github.com/fastapilabs/fastapi-cloud-cli/pull/131) by [@buurro](https://github.com/buurro).
+
+### Internal
+
+* ✅ Fix test coverage. PR [#130](https://github.com/fastapilabs/fastapi-cloud-cli/pull/130) by [@patrick91](https://github.com/patrick91).
+
+## 0.6.0
+
+### Features
+
+* ⚡️ Compress code archives to speed up uploads. PR [#125](https://github.com/fastapilabs/fastapi-cloud-cli/pull/125) by [@DoctorJohn](https://github.com/DoctorJohn).
+
+### Refactors
+
+* ⬆️ Migrate to uv. PR [#127](https://github.com/fastapilabs/fastapi-cloud-cli/pull/127) by [@DoctorJohn](https://github.com/DoctorJohn).
+* 🔥 Remove path confirmation on first deployment. PR [#123](https://github.com/fastapilabs/fastapi-cloud-cli/pull/123) by [@buurro](https://github.com/buurro).
+
+## 0.5.2
+
+### Fixes
+
+* 🐛 Fix archive file was not closed after upload. PR [#122](https://github.com/fastapilabs/fastapi-cloud-cli/pull/122) by [@DoctorJohn](https://github.com/DoctorJohn).
+
+## 0.5.1
+
+### Fixes
+
+* ✏️ Fix logout suggestion message. PR [#118](https://github.com/fastapilabs/fastapi-cloud-cli/pull/118) by [@buurro](https://github.com/buurro).
+
+### Refactors
+
+* ♻️ Improve waitlist success command. PR [#117](https://github.com/fastapilabs/fastapi-cloud-cli/pull/117) by [@patrick91](https://github.com/patrick91).
+
+## 0.5.0
+
+### Features
+
+* ✨ Resume build log stream if interrupted. PR [#109](https://github.com/fastapilabs/fastapi-cloud-cli/pull/109) by [@buurro](https://github.com/buurro).
+
+### Internal
+
+* 👷 Add support for Pydantic v1. PR [#116](https://github.com/fastapilabs/fastapi-cloud-cli/pull/116) by [@patrick91](https://github.com/patrick91).
+* 🔧 Add labels to Dependabot updates. PR [#113](https://github.com/fastapilabs/fastapi-cloud-cli/pull/113) by [@alejsdev](https://github.com/alejsdev).
+
+## 0.4.0
+
 ### Features
 
 * ✨ Add fastapi cloud sub-command. PR [#104](https://github.com/fastapilabs/fastapi-cloud-cli/pull/104) by [@buurro](https://github.com/buurro).
@@ -10,8 +64,14 @@
 
 ### Fixes
 
+* 🐛 Include hidden files in app archive. PR [#115](https://github.com/fastapilabs/fastapi-cloud-cli/pull/115) by [@buurro](https://github.com/buurro).
 * ♻️  Clean up code archives after uploading. PR [#106](https://github.com/fastapilabs/fastapi-cloud-cli/pull/106) by [@DoctorJohn](https://github.com/DoctorJohn).
 
+### Refactors
+
+* 🧑‍💻 Handle already logged in state. PR [#103](https://github.com/fastapilabs/fastapi-cloud-cli/pull/103) by [@alejsdev](https://github.com/alejsdev).
+* ⚡️ Speed up archive creation. PR [#111](https://github.com/fastapilabs/fastapi-cloud-cli/pull/111) by [@DoctorJohn](https://github.com/DoctorJohn).
+
 ## 0.3.1
 
 ### Fixes

requirements-tests.txt

@@ -1 +1 @@
-__version__ = "0.3.1"
+__version__ = "0.7.0"