codesalatdev · codesalatdev · Mar 13, 2025 · Mar 13, 2025 · Mar 13, 2025 · Mar 13, 2025
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -7,25 +7,22 @@
 	"features": {
 		//"ghcr.io/devcontainers-extra/features/poetry:2": {}
 	},
-
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
-
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
-
 	// Use 'postCreateCommand' to run commands after the container is created.
 	// "postCreateCommand": "pip3 install --user -r requirements.txt",
-
 	// Configure tool-specific properties.
 	"customizations": {
 		"vscode": {
-			"extensions": ["charliermarsh.ruff", "-ms-python.vscode-pylance"]
+			"extensions": [
+				"charliermarsh.ruff",
+				"-ms-python.vscode-pylance"
+			]
 		}
 	},
-
-	"postAttachCommand": "python -m pip install --upgrade pip && python -m pip install poetry==2.1.1 && python -m poetry install"
-
+	"postAttachCommand": "python -m pip install --upgrade pip && python -m pip install uv==0.6.6 && python -m uv sync"
 	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
 	// "remoteUser": "root"
-}
+}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [3.11,3.12]
-        poetry-version: [2.1.1]
+        uv-version: [0.6.6]
 
     runs-on: ubuntu-latest
 
@@ -24,27 +24,27 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Install poetry ${{ matrix.poetry-version }}
+    - name: Install uv ${{ matrix.uv-version }}
       run: |
         python -m ensurepip
         python -m pip install --upgrade pip
-        python -m pip install poetry==${{ matrix.poetry-version }}  
+        python -m pip install uv==${{ matrix.uv-version }}  
 
     - name: Install dependencies
       shell: bash
-      run: python -m poetry install
+      run: uv sync
 
     - name: Test with pytest
       env:
         USERNAME: ${{ secrets.PICNIC_USERNAME }}
         PASSWORD: ${{ secrets.PICNIC_PASSWORD }}
         COUNTRY_CODE: ${{ secrets.PICNIC_COUNTRY_CODE }}
       run: |
-        python -m poetry run pytest tests/ --cov --cov-report=xml
+        uv run pytest tests/ --cov --cov-report=xml
 
     - name: Lint with ruff
       run: |
-        python -m poetry run ruff check --output-format=github --ignore FIX
+        uv run ruff check --output-format=github --ignore FIX
 
     - name: Upload coverage reports to Codecov
       uses: codecov/codecov-action@v5

diff --git a/.github/workflows/it.yaml b/.github/workflows/it.yaml
@@ -18,21 +18,21 @@ jobs:
       with:
         python-version: 3.12
 
-    - name: Install poetry 2.1.1
+    - name: Install uv 0.6.6
       run: |
         python -m ensurepip
         python -m pip install --upgrade pip
-     
10000
   python -m pip install poetry==2.1.1  
+        python -m pip install uv==0.6.6 
 
     - name: Install dependencies
       shell: bash
-      run: python -m poetry install
+      run: uv sync
 
     - name: Test with pytest
       env:
         USERNAME: ${{ secrets.PICNIC_USERNAME }}
         PASSWORD: ${{ secrets.PICNIC_PASSWORD }}
         COUNTRY_CODE: ${{ secrets.PICNIC_COUNTRY_CODE }}
       run: |
-        python -m poetry run python -m pytest -v integration_tests
+        uv run pytest -v integration_tests
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,19 +11,19 @@ jobs:
       with:
         python-version: 3.11
 
-    - name: Install poetry 2.1.1
+    - name: Install uv 0.6.6
       run: |
         python -m ensurepip
         python -m pip install --upgrade pip
-        python -m pip install poetry==2.1.1
+        python -m pip install uv==0.6.6
 
     - name: Install dependencies
       shell: bash
-      run: python -m poetry install
+      run: uv sync
 
     - name: Build package
       shell: bash
-      run: python -m poetry build
+      run: uv build
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,7 +3,7 @@ name = "python-picnic-api2"
 version = "1.2.2"
 description = ""
 readme = "README.rst"
-license = "Apache-2.0"
+license = {text = "Apache-2.0"}
 maintainers = [
   { name = "CodeSalat", email = "pypi@codesalat.dev"}
 ]
@@ -18,12 +18,6 @@ dependencies = [
   "typing_extensions>=4.12.2"
 ]
 
-[tool.poetry.group.dev.dependencies]
-pytest = "^8.3"
-ruff = "^0.9.6"
-python-dotenv = "^0.15.0"
-pytest-cov = "6.0.0"
-
 [tool.ruff]
 line-length = 88
 indent-width = 4
@@ -47,6 +41,14 @@ select = [
   "FIX"
 ]
 
+[dependency-groups]
+dev = [
+    "pytest>=8.3.5",
+    "pytest-cov>=6.0.0",
+    "python-dotenv>=1.0.1",
+    "ruff>=0.9.10",
+]
+
 [build-system]
-requires = ["poetry-core&
A3DB
quot;]
-build-backend = "poetry.core.masonry.api"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
diff --git a/python_picnic_api2/__init__.py → src/python_picnic_api2/__init__.py b/python_picnic_api2/__init__.py → src/python_picnic_api2/__init__.py
diff --git a/python_picnic_api2/client.py → src/python_picnic_api2/client.py b/python_picnic_api2/client.py → src/python_picnic_api2/client.py
diff --git a/python_picnic_api2/helper.py → src/python_picnic_api2/helper.py b/python_picnic_api2/helper.py → src/python_picnic_api2/helper.py
diff --git a/python_picnic_api2/session.py → src/python_picnic_api2/session.py b/python_picnic_api2/session.py → src/python_picnic_api2/session.py
diff --git a/uv.lock b/uv.lock