From cc7ac99bb826da3e64c974228074bb8ca3da9a02 Mon Sep 17 00:00:00 2001 From: Johan Larsson Date: Thu, 10 Apr 2025 13:58:35 +0200 Subject: [PATCH 1/6] MNT add python version requirement My development tools (uv) were complaining about the missing `requires-python` field in `pyproject.toml`. This adds a dependency on at least 3.11, which is what scipy and numpy currently demands. --- pyproject.toml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index a7529dbf..b831efe5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,6 +22,14 @@ dependencies = [ ] dynamic = ["version"] +requires-python = ">=3.11" + +classifiers = [ + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", +] [tool.setuptools.dynamic] version = {attr = "skglm.__version__"} From 2e76d1ea3832fe3c95b76ab52356c6ef35ca9cf9 Mon Sep 17 00:00:00 2001 From: Johan Larsson Date: Thu, 10 Apr 2025 15:07:18 +0200 Subject: [PATCH 2/6] fixup! MNT add python version requirement --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b831efe5..fc9cf703 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,10 +22,13 @@ dependencies = [ ] dynamic = ["version"] -requires-python = ">=3.11" +requires-python = ">=3.8" classifiers = [ "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", From 2823746cd1ee79471b5f231e05286c6f94b9f185 Mon Sep 17 00:00:00 2001 From: mathurinm Date: Thu, 10 Apr 2025 15:30:55 +0200 Subject: [PATCH 3/6] Apply suggestions from code review --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fc9cf703..419a601c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,11 +22,10 @@ dependencies = [ ] dynamic = ["version"] -requires-python = ">=3.8" +requires-python = ">=3.9" classifiers = [ "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", From 9bf706a2a49f141d61b8adf7004898d67dd51e3c Mon Sep 17 00:00:00 2001 From: mathurinm Date: Thu, 10 Apr 2025 15:38:43 +0200 Subject: [PATCH 4/6] bump python version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fe5ac1f1..85598d91 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build_docs: docker: - - image: circleci/python:3.8.1-buster + - image: cimg/python:3.10 steps: - checkout - run: From 77cec39c0442237e25f7f55e2451a4e7fe97b40f Mon Sep 17 00:00:00 2001 From: mathurinm Date: Thu, 10 Apr 2025 15:43:05 +0200 Subject: [PATCH 5/6] xvfb --- .circleci/config.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 85598d91..8d579ada 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,6 +32,13 @@ jobs: keys: - pip-cache + # Install Xvfb and related dependencies + - run: + name: Install Xvfb and dependencies + command: | + sudo apt-get update + sudo apt-get install -y xvfb + - run: name: Spin up Xvfb command: | From 26397cc384c73486fa12c60c99484ffcdcb0be7a Mon Sep 17 00:00:00 2001 From: mathurinm Date: Thu, 10 Apr 2025 16:07:30 +0200 Subject: [PATCH 6/6] indent --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8d579ada..9aec8baa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,10 +34,10 @@ jobs: # Install Xvfb and related dependencies - run: - name: Install Xvfb and dependencies - command: | - sudo apt-get update - sudo apt-get install -y xvfb + name: Install Xvfb and dependencies + command: | + sudo apt-get update + sudo apt-get install -y xvfb - run: name: Spin up Xvfb