From 8e8f65ad09bf1a94c2529dbd137d5c5e72fff032 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 26 Feb 2025 10:37:52 +0100 Subject: [PATCH] Remove XDG_CACHE_HOME from tox.ini and upgrade version of setuptools and setuptools-scm Change-Id: I376274434eb3a6a2d4b74101b0356d853826e768 Signed-off-by: garciadeblas --- osm_webhook_translator/requirements-dist.in | 2 +- osm_webhook_translator/requirements-dist.txt | 2 +- requirements-dist.in | 2 +- requirements-dist.txt | 2 +- tox.ini | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/osm_webhook_translator/requirements-dist.in b/osm_webhook_translator/requirements-dist.in index 03ff6e9..c006d61 100644 --- a/osm_webhook_translator/requirements-dist.in +++ b/osm_webhook_translator/requirements-dist.in @@ -15,4 +15,4 @@ stdeb setuptools-scm -setuptools<60 +setuptools>=61 diff --git a/osm_webhook_translator/requirements-dist.txt b/osm_webhook_translator/requirements-dist.txt index a06a4df..369bf9d 100644 --- a/osm_webhook_translator/requirements-dist.txt +++ b/osm_webhook_translator/requirements-dist.txt @@ -26,7 +26,7 @@ typing-extensions==4.8.0 # via setuptools-scm # The following packages are considered to be unsafe in a requirements file: -setuptools==59.8.0 +setuptools==75.8.0 # via # -r osm_webhook_translator/requirements-dist.in # setuptools-scm diff --git a/requirements-dist.in b/requirements-dist.in index dd08438..609d38a 100644 --- a/requirements-dist.in +++ b/requirements-dist.in @@ -16,4 +16,4 @@ packaging==23.1 stdeb setuptools-scm -setuptools<60 +setuptools>=61 diff --git a/requirements-dist.txt b/requirements-dist.txt index f2d79a9..06d1080 100644 --- a/requirements-dist.txt +++ b/requirements-dist.txt @@ -28,7 +28,7 @@ typing-extensions==4.8.0 # via setuptools-scm # The following packages are considered to be unsafe in a requirements file: -setuptools==59.8.0 +setuptools==75.8.0 # via # -r requirements-dist.in # setuptools-scm diff --git a/tox.ini b/tox.ini index f215d0f..7778de1 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,6 @@ envlist = black, flake8, pylint, pylint-webhook [tox:jenkins] toxworkdir = /tmp/.tox -setenv = XDG_CACHE_HOME=/tmp/.cache [testenv] usedevelop = True @@ -62,6 +61,8 @@ commands = [testenv:flake8] deps = flake8==5.0.4 flake8-import-order + setuptools>=61 + setuptools_scm==8.0.4 commands = flake8 src setup.py flake8 osm_webhook_translator -- 2.25.1