File tree 7 files changed +9
-13
lines changed
7 files changed +9
-13
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -30,9 +30,8 @@ RUN echo ">>>> Installing optional pikaur deps:" && \
30
30
31
31
COPY ./maintenance_scripts/pikaman.py ./maintenance_scripts/changelog.sh /opt/app-build/maintenance_scripts/
32
32
COPY ./packaging/. /opt/app-build/packaging
33
- COPY ./submodules/. /opt/app-build/submodules
34
33
COPY ./locale/. /opt/app-build/locale
35
- COPY ./PKGBUILD ./Makefile ./README.md ./pyproject.toml ./.flake8 ./LICENSE /opt/app-build/
34
+ COPY ./PKGBUILD ./PKGBUILD_dev_deps ./ Makefile ./README.md ./pyproject.toml ./.flake8 ./LICENSE /opt/app-build/
36
35
COPY ./pikaur_static/. /opt/app-build/pikaur_static
37
36
COPY ./pikaur/. /opt/app-build/pikaur
38
37
RUN echo ">>>> Preparing build directory:" && \
@@ -50,8 +49,8 @@ RUN echo ">>>> Preparing build directory:" && \
50
49
COPY ./pikaur_meta_helpers /opt/app-build/pikaur_meta_helpers
51
50
# RUN sudo -u user python -um pikaur_meta_helpers.pidowngrade python-coverage '7.4.1-1' # up to 7.4.4
52
51
RUN echo ">>>> Installing test deps using Pikaur itself:" && \
53
- sudo -u user pikaur -Syu - -noconfirm --needed --color=always \
54
- ruff flake8 python-pylint mypy vulture bandit shellcheck python-coveralls python-validate-pyproject
52
+ sudo -u user pikaur --noconfirm --needed --color=always \
53
+ -Pi ./PKGBUILD_dev_deps
55
54
56
55
COPY ./pikaur_test /opt/app-build/pikaur_test
57
56
COPY ./maintenance_scripts /opt/app-build/maintenance_scripts/
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ ENV LANG=en_US.utf8 \
23
23
LC_ALL=en_US.UTF-8
24
24
25
25
RUN echo ">>>> Installing opt and test deps:" && \
26
- pacman -Sy --noconfirm --needed --color=always \
26
+ pacman -Sy --noconfirm --needed --color=always --asdeps \
27
27
devtools python-pysocks python-defusedxml \
28
28
ruff flake8 python-pylint mypy vulture bandit shellcheck python-validate-pyproject && \
29
29
echo ">>>> Preparing build directory:" && \
@@ -44,6 +44,7 @@ RUN echo ">>>> Starting the build:" && \
44
44
# ADD ./maintenance_scripts/coveralls_PKGBUILD ./coveralls_PKGBUILD
45
45
# RUN sudo -u user pikaur -Pi --noconfirm --color=always coveralls_PKGBUILD
46
46
RUN echo ">>>> Installing test deps using Pikaur itself:" && \
47
- sudo -u user pikaur -S --noconfirm --mflags=--skippgpcheck --color=always python-coveralls
47
+ sudo -u user pikaur --noconfirm --mflags=--skippgpcheck --color=always \
48
+ -Pi ./PKGBUILD_dev_deps
48
49
49
50
# vim: set ft=dockerfile :
Original file line number Diff line number Diff line change @@ -222,7 +222,7 @@ shellcheck:
222
222
223
223
shellcheck_makefile :
224
224
# Running shellcheck on Makefile...
225
- $( PYTHON ) ./maintenance_scripts/makefile_shellcheck.py --exclude SC2317
225
+ shellcheck_makefile --exclude SC2317
226
226
# :: shellcheck makefile passed ::
227
227
228
228
validate_pyproject :
Original file line number Diff line number Diff line change 4
4
_pkgname=pikaur_dev_deps
5
5
#pkgname="${_pkgname}-git"
6
6
pkgname="${_pkgname}"
7
- pkgver=1.30.2
7
+ pkgver=1.32
8
8
pkgrel=1
9
9
pkgdesc="Development deps for Pikaur"
10
10
arch=('any')
@@ -20,6 +20,7 @@ depends=(
20
20
'python-hatchling' # tag-release
21
21
# linting:
22
22
ruff flake8 python-pylint mypy vulture bandit shellcheck python-validate-pyproject shellcheck_makefile-git
23
+ 'python-coveralls'
23
24
# pikaur opt deps:
24
25
'devtools'
25
26
'python-pysocks'
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments