diff --git a/.gitlab/ci/lint.gitlab-ci.yml b/.gitlab/ci/lint.gitlab-ci.yml index 349819a90..65b74ddca 100644 --- a/.gitlab/ci/lint.gitlab-ci.yml +++ b/.gitlab/ci/lint.gitlab-ci.yml @@ -1,6 +1,3 @@ -.install_tox: &install_tox - - pip3 install -U tox --break-system-packages - ######################################## # LINTER ######################################## @@ -11,8 +8,6 @@ lint311: image: "before-install" needs: [] allow_failure: true - before_script: - - *install_tox script: - tox -e py311-lint @@ -20,8 +15,6 @@ invalidcode311: stage: lint image: "before-install" needs: [] - before_script: - - *install_tox script: - tox -e py311-invalidcode @@ -29,8 +22,6 @@ mypy: stage: lint image: "before-install" needs: [] - before_script: - - *install_tox script: - tox -e py311-mypy @@ -38,8 +29,6 @@ black: stage: lint image: "before-install" needs: [] - before_script: - - *install_tox before_script: - apt-get update -y && apt-get install git hub -y - git config --global user.email "yunohost@yunohost.org" diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index c5f1ee13c..a49fc13b7 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -1,7 +1,6 @@ .install_debs: &install_debs - apt-get update -o Acquire::Retries=3 - DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt --assume-yes -o Dpkg::Options::="--force-confold" --allow-downgrades install ${CI_PROJECT_DIR}/*.deb php8.2-cli mariadb-client mariadb-server - - pip3 install -U mock pip pytest pytest-cov pytest-mock pytest-sugar requests-mock tox ansi2html black jinja2 "packaging<22" --break-system-packages # for bookworm .test-stage: stage: test