Skip to content

Commit

Permalink
Merge branch 'ci-manager-remove-py3.7' into '6.0'
Browse files Browse the repository at this point in the history
ci: manager: python3.7 unit tests removed

See merge request knot/knot-resolver!1471
  • Loading branch information
Oto Šťáva committed Nov 7, 2023
2 parents a31c0b5 + 4725846 commit 955f798
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
19 changes: 10 additions & 9 deletions ci/images/manager/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ CMD ["/bin/bash"]
ENV PATH="/root/.local/bin:${PATH}"

# Install Python and deps
RUN dnf install -y python3.7 python3.8 python3.9 python3.10 python3.10-devel python3 python3-devel python3-gobject\
git which diffutils gcc pkg-config cairo-devel gobject-introspection-devel cairo-gobject-devel\
&& dnf clean all
RUN dnf install -y\
python3.8 python3.9 python3.10 python3.10-devel\
python3.11 python3.11-devel python3.12 python3.12-devel\
python3-gobject pipx git which diffutils gcc pkg-config\
cairo-devel gobject-introspection-devel cairo-gobject-devel\
&& dnf clean all

# Install pip
RUN python3.7 -m ensurepip\
# Install poetry
&& curl -sSL https://install.python-poetry.org | python3 - --version 1.4.2\
# not exactly required, but helpful
&& python3.7 -m pip install poethepoet
# Install poetry
RUN pipx install poetry==1.4.2\
# not exactly required, but helpful
&& pipx install poethepoet
5 changes: 0 additions & 5 deletions manager/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ lint:py3.11:
paths:
- manager/unit.junit.xml

unit:py3.7:
<<: *unit
variables:
PYTHON_INTERPRETER: python3.7

unit:py3.8:
<<: *unit
variables:
Expand Down

0 comments on commit 955f798

Please sign in to comment.