From 0fac4c7b08105c3570567d7943399cf78aa9f3a4 Mon Sep 17 00:00:00 2001
From: Matthew Evans <git@ml-evs.science>
Date: Thu, 27 Feb 2025 17:03:57 +0000
Subject: [PATCH] Bump deps and uv version

---
 .github/workflows/ci.yml |  2 +-
 Dockerfile               |  2 +-
 pyproject.toml           |  4 ++--
 uv.lock                  | 22 ++++++++++++++++------
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 10fe3f9..37ac6e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Set up uv
       uses: astral-sh/setup-uv@v3
       with:
-        version: "0.5.x"
+        version: "0.6.x"
         enable-cache: true
 
     - name: Install latest compatible versions of immediate dependencies
diff --git a/Dockerfile b/Dockerfile
index 132390f..6360b2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,7 +46,7 @@ FROM base-packages AS python-setup
 WORKDIR /opt/csd-optimade
 
 # Install uv for Python package management
-COPY --from=ghcr.io/astral-sh/uv:0.5.22 /uv /usr/local/bin/uv
+COPY --from=ghcr.io/astral-sh/uv:0.6.3 /uv /usr/local/bin/uv
 ENV UV_LINK_MODE=copy \
     UV_COMPILE_BYTECODE=1 \
     UV_PYTHON_DOWNLOADS=manual \
diff --git a/pyproject.toml b/pyproject.toml
index 0adb7a1..20f6a78 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,8 +20,8 @@ classifiers = [
 ]
 requires-python = ">= 3.11, < 3.12"
 dependencies = [
-    "optimade @ git+https://github.com/Materials-Consortia/optimade-python-tools.git",
-    "optimade-maker @ git+https://github.com/materialscloud-org/optimade-maker.git@ml-evs/qol-server",
+    "optimade ~= 1.2",
+    "optimade-maker ~= 0.4",
     "tqdm ~= 4.66",
     "pymongo >= 4, < 5",
 ]
diff --git a/uv.lock b/uv.lock
index 1998c10..3d2d283 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1,4 +1,5 @@
 version = 1
+revision = 1
 requires-python = "==3.11.*"
 
 [[package]]
@@ -166,8 +167,8 @@ ingest = [
 requires-dist = [
     { name = "csd-python-api", marker = "extra == 'ingest'", specifier = ">=3,<4" },
     { name = "mypy", marker = "extra == 'dev'", specifier = "~=1.0" },
-    { name = "optimade", git = "https://github.com/Materials-Consortia/optimade-python-tools.git" },
-    { name = "optimade-maker", git = "https://github.com/materialscloud-org/optimade-maker.git?rev=ml-evs%2Fqol-server" },
+    { name = "optimade", specifier = "~=1.2" },
+    { name = "optimade-maker", specifier = "~=0.4" },
     { name = "pre-commit", marker = "extra == 'dev'", specifier = "~=3.0" },
     { name = "psutil", marker = "extra == 'ingest'", specifier = "~=6.1" },
     { name = "pymongo", specifier = ">=4,<5" },
@@ -176,6 +177,7 @@ requires-dist = [
     { name = "ruff", marker = "extra == 'dev'", specifier = "~=0.5" },
     { name = "tqdm", specifier = "~=4.66" },
 ]
+provides-extras = ["dev", "ingest"]
 
 [[package]]
 name = "csd-python-api"
@@ -607,14 +609,18 @@ wheels = [
 
 [[package]]
 name = "optimade"
-version = "1.1.11"
-source = { git = "https://github.com/Materials-Consortia/optimade-python-tools.git#2affb50d0593a8d9d4229970b034c0d317778c51" }
+version = "1.2.0"
+source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "lark" },
     { name = "pydantic", extra = ["email"] },
     { name = "pydantic-settings" },
     { name = "requests" },
 ]
+sdist = { url = "https://files.pythonhosted.org/packages/9a/e2/f51940b4e602952bf4c83e36e530a85566fd24e2ad846f2e98ddc3005344/optimade-1.2.0.tar.gz", hash = "sha256:6fdb76a92e22f26d26e8f29890ba11f663dd7dd8ebd9587c851b9ddc71096037", size = 187565 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c1/3b/ebf777076092d652dd4e117f880471937d47e3e767b294daa5736277cf9e/optimade-1.2.0-py3-none-any.whl", hash = "sha256:8ae5e15254babbc465e2bb6f8bb6407c5d5ba20681015e7bac8c8895d7afc004", size = 235693 },
+]
 
 [package.optional-dependencies]
 server = [
@@ -628,8 +634,8 @@ server = [
 
 [[package]]
 name = "optimade-maker"
-version = "0.3.0"
-source = { git = "https://github.com/materialscloud-org/optimade-maker.git?rev=ml-evs%2Fqol-server#0248484c899140503e770ae7ef5e46b63cffcafa" }
+version = "0.4.0"
+source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "click" },
     { name = "numpy" },
@@ -639,6 +645,10 @@ dependencies = [
     { name = "requests" },
     { name = "tqdm" },
 ]
+sdist = { url = "https://files.pythonhosted.org/packages/07/71/5dee0bcb1e9bdefc477db05f5bfacd687c4f2ccf791f3455f190476327a8/optimade_maker-0.4.0.tar.gz", hash = "sha256:ac25006e9021b6375e05f7837f0953d07c0298134b6a0b9fd3d9890ddc9ee061", size = 24494 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/a9/1a/c5a77714dd23557ae35ffb5018ecb05a0f591bb1838108e9a42a9f1deed6/optimade_maker-0.4.0-py3-none-any.whl", hash = "sha256:fba4c3c8ccb12e95b35a4ea70e7c34567e2d9c23dcc6fce1dab75468e94590b2", size = 23050 },
+]
 
 [[package]]
 name = "packaging"