diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 76f95fe54..bae12ea9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,14 +71,13 @@ package-helm: package-debian: before_script: - apt update - - apt install -y --no-install-recommends build-essential debhelper devscripts equivs python3 python3-dev python3-venv python3-pip libsasl2-dev libldap2-dev + - apt install -y --no-install-recommends build-essential debhelper devscripts equivs python3 python3-dev python3-pip libsasl2-dev libldap2-dev - mk-build-deps debian/control - apt install ./*build-deps*deb -f -y - python3 -m pip install -U virtualenv pip - - python3 -m venv env + - virtualenv env - source env/bin/activate - - pip install -U -r requirements-dev.txt - - pip install --no-binary psycopg2 psycopg2 + - pip3 install -U -r requirements.txt -r requirements-dev.txt image: ubuntu:18.04 script: - debuild -us -uc diff --git a/debian/files b/debian/files deleted file mode 100644 index 256132ddd..000000000 --- a/debian/files +++ /dev/null @@ -1,2 +0,0 @@ -passbook-dbgsym_0.1.3_amd64.ddeb debug optional -passbook_0.1.3_amd64.deb admin optional diff --git a/debian/passbook.postrm.debhelper b/debian/passbook.postrm.debhelper deleted file mode 100644 index 500916c20..000000000 --- a/debian/passbook.postrm.debhelper +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically added by dh_installdebconf/11.1.6ubuntu2 -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule - db_purge -fi -# End automatically added section diff --git a/debian/passbook.substvars b/debian/passbook.substvars deleted file mode 100644 index 03c3a8dbf..000000000 --- a/debian/passbook.substvars +++ /dev/null @@ -1,3 +0,0 @@ -misc:Depends=debconf (>= 0.5) | debconf-2.0 -shlibs:Depends=libc6 (>= 2.4), passbook -misc:Pre-Depends= diff --git a/debian/rules b/debian/rules index df1396673..8f17bf69d 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,7 @@ dh $@ --with=systemd build-arch: + python3 -m pip install setuptools python3 -m pip install --target=vendor/ -r requirements.txt override_dh_strip: