Pyproject migration

.gitlab-ci.yml

@@ -112,4 +112,4 @@ bump-python-deps:
     - schedules
 
   script:
-    - devops python-deps requirements.txt test-requirements.txt training-requirements.txt
+    - devops python-deps pyproject.toml

Dockerfile

@@ -3,9 +3,10 @@ FROM nvidia/cuda:12.2.0-base-ubuntu22.04
 # Add python3 in cuda image
 ENV DEBIAN_FRONTEND=non-interactive
 RUN apt-get update -q -y && apt-get install -q -y --no-install-recommends python3-pip
+RUN pip3 install --upgrade pip
 
 # Setup doc-ufcn library
 WORKDIR /src
-COPY requirements.txt training-requirements.txt LICENSE setup.py MANIFEST.in README.md VERSION /src/
+COPY LICENSE README.md pyproject.toml /src/
 COPY doc_ufcn /src/doc_ufcn
 RUN pip3 install .[training] --no-cache-dir

MANIFEST.in

-include requirements.txt
-include training-requirements.txt
-include VERSION

Makefile

 .PHONY: release
 
 release:
-	$(eval version:=$(shell cat VERSION))
-	git commit VERSION -m "Version $(version)"
+	# Grep the version from pyproject.toml, squeeze multiple spaces, delete double and single quotes, get 3rd val.
+	# This command tolerates multiple whitespace sequences around the version number.
+	$(eval version:=$(shell grep -m 1 version pyproject.toml | tr -s ' ' | tr -d '"' | tr -d "'" | cut -d' ' -f3))
+	echo Releasing version $(version)
+	git commit pyproject.toml -m "Version $(version)"
 	git tag $(version)
 	git push origin main $(version)

VERSION

-0.2.0rc2

pyproject.toml

+[build-system]
+requires = ["setuptools >= 61.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "doc-ufcn"
+version = "0.2.0rc2"
+description = "Doc-UFCN"
+readme = { file = "README.md", content-type = "text/markdown" }
+requires-python = ">= 3.10, < 3.11"
+authors = [
+    { name = "Mélodie Boillet", email = "boillet@teklia.com" },
+]
+dependencies = [
+    "huggingface-hub==0.20.2",
+    "numpy==1.26.2",
+    "opencv-python-headless==4.7.0.72",
+    "pyyaml==6.0.1",
+    "requests>=2,<3",
+    "teklia_toolbox==0.1.3",
+    "torch==2.1.0",
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    # Specify the Python versions you support here.
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    # Topics
+    "Topic :: Scientific/Engineering :: Artificial Intelligence",
+    "Topic :: Scientific/Engineering :: Image Recognition",
+]
+
+[project.urls]
+Source = "https://gitlab.teklia.com/dla/doc-ufcn/"
+Tracker = "https://gitlab.teklia.com/dla/doc-ufcn/issues/"
+
+[project.optional-dependencies]
+training = [
+    "imageio==2.27.0",
+    "matplotlib==3.8.1",
+    "mlflow==2.2.1",
+    "Shapely==2.0.3",
+    "teklia-toolbox==0.1.3",
+    "tensorboard==2.15.1",
+    "torchvision==0.16.0",
+    "tqdm==4.66.1",
+]
+test = [
+    "scikit-image==0.22.0",
+    "pytest==8.1.1",
+    "pytest-lazy-fixtures==1.0.7",
+]
+
+[tool.setuptools.packages]
+find = {}

requirements.txt

-huggingface-hub==0.20.2
-numpy==1.26.2
-opencv-python-headless==4.7.0.72
-pyyaml==6.0.1
-requests>=2,<3
-teklia_toolbox==0.1.3
-torch==2.1.0

setup.py

-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from pathlib import Path
-
-from setuptools import find_packages, setup
-
-
-def parse_requirements(name):
-    path = Path(__file__).parent.resolve() / name
-    assert path.exists(), f"Missing requirements: {path}"
-    return list(map(str.strip, path.read_text().splitlines()))
-
-
-setup(
-    name="doc-ufcn",
-    version=open("VERSION").read(),
-    description="Doc-UFCN",
-    long_description=open("README.md").read(),
-    long_description_content_type="text/markdown",
-    author="Mélodie Boillet",
-    author_email="boillet@teklia.com",
-    project_urls={
-        "Source": "https://gitlab.teklia.com/dla/doc-ufcn/",
-        "Tracker": "https://gitlab.teklia.com/dla/doc-ufcn/issues/",
-    },
-    url="https://gitlab.teklia.com/dla/doc-ufcn",
-    install_requires=parse_requirements("requirements.txt"),
-    extras_require={
-        "training": parse_requirements("training-requirements.txt"),
-    },
-    packages=find_packages(exclude=["tests"]),
-    python_requires=">= 3.10, < 3.11",
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        # Specify the Python versions you support here.
-        "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.10",
-        # Topics
-        "Topic :: Scientific/Engineering :: Artificial Intelligence",
-        "Topic :: Scientific/Engineering :: Image Recognition",
-    ],
-)

test-requirements.txt

-scikit-image==0.22.0

tox.ini

@@ -2,12 +2,9 @@
 envlist = py310
 
 [testenv]
+extras =
+  training
+  test
+
 commands =
   pytest {posargs}
-
-deps =
-  pytest
-  pytest-lazy-fixtures
-  -rrequirements.txt
-  -rtraining-requirements.txt
-  -rtest-requirements.txt

training-requirements.txt

-imageio==2.27.0
-matplotlib==3.8.1
-mlflow==2.2.1
-Shapely==2.0.3
-teklia-toolbox==0.1.3
-tensorboard==2.15.1
-torchvision==0.16.0
-tqdm==4.66.1