Skip to content
This repository has been archived by the owner on Jan 6, 2022. It is now read-only.

Commit

Permalink
Fix deb/rpm package naming, relax requirements to match Ubuntu 16.04 …
Browse files Browse the repository at this point in the history
…repos & update gem args
  • Loading branch information
chadsr committed Mar 18, 2020
1 parent 9e6f488 commit 74714e1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ jobs:
- mkdir builds && cd builds/
# Start building packages
- echo "Deploying ${PACKAGE} v${VERSION} from PyPi to ${GH_USER}/${NAME} - ${DESCRIPTION}"
- docker run -e DEB_PYTHON=$DEB_PYTHON -e DEB_PIP=$DEB_PIP -e PYTHON_MIN_VERSION=$PYTHON_MIN_VERSION -e DESCRIPTION="${DESCRIPTION}" -e PACKAGE=$PACKAGE -e VERSION=$VERSION -e GH_USER=$GH_USER -e NAME=$NAME -v $PWD:/mnt/travis ${DEB_DOCKER} /bin/bash -c 'su && cd /mnt/travis && apt-get update && apt-get -y install ${DEB_PYTHON} ${DEB_PYTHON}-pip ruby ruby-dev rubygems-integration build-essential && gem install --no-ri --no-rdoc fpm && ${DEB_PYTHON} --version && fpm --maintainer "${GH_USER}" --description "${DESCRIPTION}" --url "https://github.com/${GH_USER}/${NAME}" --provides "${PACKAGE}" -a "all" --no-python-fix-name --python-package-name-prefix "${DEB_PYTHON}" --python-bin ${DEB_PYTHON} --python-pip ${DEB_PIP} --python-install-bin "/usr/bin/" --python-install-lib "/usr/lib/${DEB_PYTHON}/dist-packages/" -d "${DEB_PYTHON} >= ${PYTHON_MIN_VERSION}" -d iputils-ping -d "network-manager >= 1.2.0" -d openvpn -d network-manager-openvpn-gnome -s python -t deb ${PACKAGE} && apt-get install -y ./${PACKAGE}_${VERSION}_all.deb && /usr/bin/nordnm --help'
- docker run -e FED_PYTHON=$FED_PYTHON -e FED_PIP=$FED_PIP -e DESCRIPTION="${DESCRIPTION}" -e PACKAGE=$PACKAGE -e VERSION=$VERSION -e GH_USER=$GH_USER -e NAME=$NAME -v $PWD:/mnt/travis ${FED_DOCKER} /bin/bash -c 'su && cd /mnt/travis && dnf install ruby-devel gcc make rpm-build libffi-devel ${FED_PYTHON} ${FED_PYTHON}-pip -y && gem install --no-ri --no-rdoc fpm && ${FED_PYTHON} --version && fpm --maintainer "${GH_USER}" --description "${DESCRIPTION}" --url "https://github.com/${GH_USER}/${NAME}" --provides "${PACKAGE}" -a "all" --no-python-fix-name --python-package-name-prefix "${FED_PYTHON}" --python-bin ${FED_PYTHON} --python-pip ${FED_PIP} --python-install-bin "/usr/bin/" --python-install-lib "/lib/${FED_PYTHON}.7/site-packages/" -d "${FED_PYTHON} >= 3.7.0" -d iputils -d "NetworkManager >= 1.2.0" -d openvpn -d NetworkManager-openvpn-gnome -s python -t rpm ${PACKAGE} && dnf install -y ${PACKAGE}-${VERSION}-1.noarch.rpm && /usr/bin/nordnm --help'
- docker run -e DEB_PYTHON=$DEB_PYTHON -e DEB_PIP=$DEB_PIP -e PYTHON_MIN_VERSION=$PYTHON_MIN_VERSION -e DESCRIPTION="${DESCRIPTION}" -e PACKAGE=$PACKAGE -e VERSION=$VERSION -e GH_USER=$GH_USER -e NAME=$NAME -v $PWD:/mnt/travis ${DEB_DOCKER} /bin/bash -c 'su && cd /mnt/travis && apt-get update && apt-get -y install ${DEB_PYTHON} ${DEB_PYTHON}-pip ruby ruby-dev rubygems-integration build-essential && gem install --no-document fpm && ${DEB_PYTHON} --version && fpm --maintainer "${GH_USER}" --description "${DESCRIPTION}" --url "https://github.com/${GH_USER}/${NAME}" --provides "${PACKAGE}" -a "all" --no-python-fix-name --python-package-name-prefix "${DEB_PYTHON}" --python-bin ${DEB_PYTHON} --python-pip ${DEB_PIP} --python-install-bin "/usr/bin/" --python-install-lib "/usr/lib/${DEB_PYTHON}/dist-packages/" -d "${DEB_PYTHON} >= ${PYTHON_MIN_VERSION}" -d iputils-ping -d "network-manager >= 1.2.0" -d openvpn -d network-manager-openvpn-gnome -s python -t deb -p ./${PACKAGE}_${VERSION}_all.deb ${PACKAGE} && apt-get install -y ./${PACKAGE}_${VERSION}_all.deb && /usr/bin/nordnm --help'
- docker run -e FED_PYTHON=$FED_PYTHON -e FED_PIP=$FED_PIP -e DESCRIPTION="${DESCRIPTION}" -e PACKAGE=$PACKAGE -e VERSION=$VERSION -e GH_USER=$GH_USER -e NAME=$NAME -v $PWD:/mnt/travis ${FED_DOCKER} /bin/bash -c 'su && cd /mnt/travis && dnf install ruby-devel gcc make rpm-build libffi-devel ${FED_PYTHON} ${FED_PYTHON}-pip -y && gem install --no-document fpm && ${FED_PYTHON} --version && fpm --maintainer "${GH_USER}" --description "${DESCRIPTION}" --url "https://github.com/${GH_USER}/${NAME}" --provides "${PACKAGE}" -a "all" --no-python-fix-name --python-package-name-prefix "${FED_PYTHON}" --python-bin ${FED_PYTHON} --python-pip ${FED_PIP} --python-install-bin "/usr/bin/" --python-install-lib "/lib/${FED_PYTHON}.7/site-packages/" -d "${FED_PYTHON} >= 3.7.0" -d iputils -d "NetworkManager >= 1.2.0" -d openvpn -d NetworkManager-openvpn-gnome -s python -t rpm -p ${PACKAGE}-${VERSION}-1.noarch.rpm ${PACKAGE} && dnf install -y ${PACKAGE}-${VERSION}-1.noarch.rpm && /usr/bin/nordnm --help'

before_deploy:
- pwd && cd ../
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
requests>=2.22.0
numpy>=1.16.5
setuptools>=41.2.0
requests>=2.9.1
numpy>=1.11.0
setuptools>=20.7.0

0 comments on commit 74714e1

Please sign in to comment.