Install setuptools

gnocchixyz · Oct 3, 2024 · 797f5a7 · 797f5a7
1 parent abd2359
commit 797f5a7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/images/Dockerfile.ci b/images/Dockerfile.ci
@@ -2,6 +2,8 @@ FROM ubuntu:22.04
 ENV GNOCCHI_WORKSPACE /github/workspace
 ENV DEBIAN_FRONTEND noninteractive
 
+RUN echo test
+
 #NOTE(tobias-urdin): need gnupg for apt-key
 RUN apt-get update -y && apt-get install -qy gnupg software-properties-common
 RUN add-apt-repository -y ppa:deadsnakes/ppa

diff --git a/run-upgrade-tests.sh b/run-upgrade-tests.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+export GNOCCHI_TEST_DEBUG=1
+
 if [ "$1" == "postgresql-file" ]; then
   eval $(pifpaf --env-prefix INDEXER run postgresql)
 elif [ "$1" == "mysql-ceph" ]; then

diff --git a/tox.ini b/tox.ini
@@ -10,6 +10,7 @@ passenv =
     GNOCCHI_TEST_*
     AWS_*
 setenv =
+    GNOCCHI_TEST_DEBUG=1
     GNOCCHI_TEST_STORAGE_DRIVER=file
     GNOCCHI_TEST_INDEXER_DRIVER=postgresql
     GNOCCHI_TEST_STORAGE_DRIVERS=file swift ceph s3 redis
@@ -49,8 +50,8 @@ setenv =
 deps =
     .[test,redis,prometheus,amqp1,{env:GNOCCHI_STORAGE_DEPS:},{env:GNOCCHI_INDEXER_DEPS:}]
     {env:GNOCCHI_TEST_TARBALLS:}
-    cliff!=2.9.0
-    gnocchiclient>=2.8.0,!=7.0.7
+    gnocchiclient
+    setuptools
 commands =
     {toxinidir}/run-tests.sh {posargs}
     {toxinidir}/run-func-tests.sh {posargs}
@@ -62,6 +63,7 @@ allowlist_externals =
 deps =
    {[testenv]deps}
    sqlalchemy<2
+   setuptools
 
 [testenv:{py39,py311}-postgresql-file-upgrade-from-4.4]
 # We should always recreate since the script upgrade
@@ -71,9 +73,10 @@ setenv =
     GNOCCHI_VERSION_FROM=stable/4.4
     GNOCCHI_VARIANT=test,postgresql,file
 deps =
-    gnocchiclient>=2.8.0,!=7.0.7
+    gnocchiclient
     pifpaf
     xattr!=0.9.4
+    setuptools
 commands = {toxinidir}/run-upgrade-tests.sh postgresql-file
 allowlist_externals = {toxinidir}/run-upgrade-tests.sh
 
@@ -85,9 +88,10 @@ setenv =
     GNOCCHI_VERSION_FROM=stable/4.4
     GNOCCHI_VARIANT=test,mysql,ceph,ceph_recommended_lib
 deps =
-    gnocchiclient>=2.8.0,!=7.0.7
+    gnocchiclient
     pifpaf[ceph]
     xattr!=0.9.4
+    setuptools
 commands = {toxinidir}/run-upgrade-tests.sh mysql-ceph
 allowlist_externals = {toxinidir}/run-upgrade-tests.sh
 
@@ -130,6 +134,7 @@ ignore = E501,E731,W503,W504
 deps =
     .[test,file,postgresql,doc]
     doc8
+    setuptools
 setenv =
     GNOCCHI_TEST_DEBUG=1
 commands =