Skip to content

Commit 5c969e0

Browse files
committed
chore: remove shellcheck_makefile submodule (as it's already available on AUR)
1 parent 07937bb commit 5c969e0

File tree

7 files changed

+9
-13
lines changed

7 files changed

+9
-13
lines changed

.gitmodules

-3
This file was deleted.

Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ RUN echo ">>>> Installing optional pikaur deps:" && \
3030

3131
COPY ./maintenance_scripts/pikaman.py ./maintenance_scripts/changelog.sh /opt/app-build/maintenance_scripts/
3232
COPY ./packaging/. /opt/app-build/packaging
33-
COPY ./submodules/. /opt/app-build/submodules
3433
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/
3635
COPY ./pikaur_static/. /opt/app-build/pikaur_static
3736
COPY ./pikaur/. /opt/app-build/pikaur
3837
RUN echo ">>>> Preparing build directory:" && \
@@ -50,8 +49,8 @@ RUN echo ">>>> Preparing build directory:" && \
5049
COPY ./pikaur_meta_helpers /opt/app-build/pikaur_meta_helpers
5150
#RUN sudo -u user python -um pikaur_meta_helpers.pidowngrade python-coverage '7.4.1-1' # up to 7.4.4
5251
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
5554

5655
COPY ./pikaur_test /opt/app-build/pikaur_test
5756
COPY ./maintenance_scripts /opt/app-build/maintenance_scripts/

Dockerfile_export

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ENV LANG=en_US.utf8 \
2323
LC_ALL=en_US.UTF-8
2424

2525
RUN echo ">>>> Installing opt and test deps:" && \
26-
pacman -Sy --noconfirm --needed --color=always \
26+
pacman -Sy --noconfirm --needed --color=always --asdeps \
2727
devtools python-pysocks python-defusedxml \
2828
ruff flake8 python-pylint mypy vulture bandit shellcheck python-validate-pyproject && \
2929
echo ">>>> Preparing build directory:" && \
@@ -44,6 +44,7 @@ RUN echo ">>>> Starting the build:" && \
4444
#ADD ./maintenance_scripts/coveralls_PKGBUILD ./coveralls_PKGBUILD
4545
#RUN sudo -u user pikaur -Pi --noconfirm --color=always coveralls_PKGBUILD
4646
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
4849

4950
# vim: set ft=dockerfile :

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ shellcheck:
222222

223223
shellcheck_makefile:
224224
# Running shellcheck on Makefile...
225-
$(PYTHON) ./maintenance_scripts/makefile_shellcheck.py --exclude SC2317
225+
shellcheck_makefile --exclude SC2317
226226
# :: shellcheck makefile passed ::
227227

228228
validate_pyproject:

PKGBUILD_dev_deps

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
_pkgname=pikaur_dev_deps
55
#pkgname="${_pkgname}-git"
66
pkgname="${_pkgname}"
7-
pkgver=1.30.2
7+
pkgver=1.32
88
pkgrel=1
99
pkgdesc="Development deps for Pikaur"
1010
arch=('any')
@@ -20,6 +20,7 @@ depends=(
2020
'python-hatchling' # tag-release
2121
# linting:
2222
ruff flake8 python-pylint mypy vulture bandit shellcheck python-validate-pyproject shellcheck_makefile-git
23+
'python-coveralls'
2324
# pikaur opt deps:
2425
'devtools'
2526
'python-pysocks'

maintenance_scripts/makefile_shellcheck.py

-1
This file was deleted.

submodules/shellcheck_makefile

-1
This file was deleted.

0 commit comments

Comments
 (0)