diff --git a/.gitmodules b/.gitmodules index 510fba6e..7c6e1c90 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "riak_pb"] path = riak_pb - url = git://github.com/basho/riak_pb.git + url = https://github.com/basho/riak_pb.git [submodule "tools"] path = tools - url = git://github.com/basho/riak-client-tools.git + url = https://github.com/basho/riak-client-tools.git [submodule "docs"] path = docs url = https://github.com/basho/riak-python-client.git diff --git a/Jenkinsfile_buster b/Jenkinsfile_buster new file mode 100644 index 00000000..25b924c1 --- /dev/null +++ b/Jenkinsfile_buster @@ -0,0 +1,60 @@ +node('buster_main_branch') { + stage ('Checkout') { + checkout scm + } + + stage ('Source package') { +sh '''PKGVERSION=$(git describe --tags $(git rev-list --tags --max-count=1)) +SOURCE_NAME=`cat debian/control |grep Source: | sed \'s/Source://g\' | sed \'s/ //g\'` +dch -b -v ${PKGVERSION}.${BUILD_NUMBER}.bust \\"---new build---\\" +mkdir -p tmp_src +cd tmp_src +dpkg-source -Zgzip -Itmp_src -b ../ + +for i in `ls`; do +curl -X POST -F file=@$i http://10.1.10.87:8080/api/files/upload_${SOURCE_NAME}_$DEBIAN_RELEASE-ci && rm $i +done; +# add files +curl -X POST http://10.1.10.87:8080/api/repos/$DEBIAN_RELEASE-ci/file/upload_${SOURCE_NAME}_$DEBIAN_RELEASE-ci +curl -X PUT -H 'Content-Type: application/json' --data '{}' http://10.1.10.87:8080/api/publish//$DEBIAN_RELEASE''' + } + + stage ('Build package') { + try { +sh '''PKGVERSION=$(git describe --tags $(git rev-list --tags --max-count=1)) +SOURCE_NAME=`cat debian/control |grep Source: | sed \'s/Source://g\' | sed \'s/ //g\'` +mkdir -p /dev/tmp +export TMPDIR=/dev/tmp + +export MAKE_ARGS=-j16 + +while true; do + apt-get update && break +done +apt-get build-dep -y ${SOURCE_NAME} +apt-get source ${SOURCE_NAME} +apt-get -y --new-pkgs upgrade + +cd ${SOURCE_NAME}-${PKGVERSION}.${BUILD_NUMBER}.bust +dpkg-buildpackage -us -uc -b -rfakeroot +cd .. + +for i in `ls *.deb`; do +curl -X POST -F file=@$i http://10.1.10.87:8080/api/files/upload_${SOURCE_NAME}_$DEBIAN_RELEASE-ci +done; +curl -X POST http://10.1.10.87:8080/api/repos/$DEBIAN_RELEASE-ci/file/upload_${SOURCE_NAME}_$DEBIAN_RELEASE-ci +curl -X PUT -H 'Content-Type: application/json' --data '{}' http://10.1.10.87:8080/api/publish//$DEBIAN_RELEASE +''' + currentBuild.result = 'SUCCESS' + } catch (err) { + currentBuild.result = 'FAILURE' + error('Build Failed') + } finally { + step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: emailextrecipients([requestor(), culprits()]), sendToIndividuals: true]) + } + } + + stage ('Post Build') { + archiveArtifacts artifacts: '*.deb', onlyIfSuccessful: true + } +} diff --git a/Jenkinsfile_develop b/Jenkinsfile_develop new file mode 100644 index 00000000..26a4c749 --- /dev/null +++ b/Jenkinsfile_develop @@ -0,0 +1,60 @@ +node('develop') { + stage ('Checkout') { + checkout scm + } + + stage ('Source package') { +sh '''PKGVERSION=$(git describe --tags $(git rev-list --tags --max-count=1)) +SOURCE_NAME=`cat debian/control |grep Source: | sed \'s/Source://g\' | sed \'s/ //g\'` +dch -b -v ${PKGVERSION}.${BUILD_NUMBER}.dev \\"---new build---\\" +mkdir -p tmp_src +cd tmp_src +dpkg-source -Itmp_src -b ../ + +for i in `ls`; do +curl -X POST -F file=@$i http://10.1.10.84:8080/api/files/upload_${SOURCE_NAME}_buster-ci-develop && rm $i +done; +# add files +curl -X POST http://10.1.10.84:8080/api/repos/buster-ci-develop/file/upload_${SOURCE_NAME}_buster-ci-develop +curl -X PUT -H 'Content-Type: application/json' --data '{}' http://10.1.10.84:8080/api/publish//buster''' + } + + stage ('Build package') { + try { +sh '''PKGVERSION=$(git describe --tags $(git rev-list --tags --max-count=1)) +SOURCE_NAME=`cat debian/control |grep Source: | sed \'s/Source://g\' | sed \'s/ //g\'` +mkdir -p /dev/tmp +export TMPDIR=/dev/tmp + +export MAKE_ARGS=-j16 + +while true; do + apt-get update && break +done +apt-get build-dep -y ${SOURCE_NAME} +apt-get source ${SOURCE_NAME} +apt-get -y --new-pkgs upgrade + +cd ${SOURCE_NAME}-${PKGVERSION}.${BUILD_NUMBER}.dev +dpkg-buildpackage -us -uc -b -rfakeroot +cd .. + +for i in `ls *.deb`; do +curl -X POST -F file=@$i http://10.1.10.84:8080/api/files/upload_${SOURCE_NAME}_buster-ci-develop +done; +curl -X POST http://10.1.10.84:8080/api/repos/buster-ci-develop/file/upload_${SOURCE_NAME}_buster-ci-develop +curl -X PUT -H 'Content-Type: application/json' --data '{}' http://10.1.10.84:8080/api/publish//buster +''' + currentBuild.result = 'SUCCESS' + } catch (err) { + currentBuild.result = 'FAILURE' + error('Build Failed') + } finally { + step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: emailextrecipients([requestor(), culprits()]), sendToIndividuals: true]) + } + } + + stage ('Post Build') { + archiveArtifacts artifacts: '*.deb', onlyIfSuccessful: true + } +} diff --git a/Jenkinsfile_stage b/Jenkinsfile_stage new file mode 100644 index 00000000..3b9bd9ce --- /dev/null +++ b/Jenkinsfile_stage @@ -0,0 +1,60 @@ +node('stage') { + stage ('Checkout') { + checkout scm + } + + stage ('Source package') { +sh '''PKGVERSION=$(git describe --tags $(git rev-list --tags --max-count=1)) +SOURCE_NAME=`cat debian/control |grep Source: | sed \'s/Source://g\' | sed \'s/ //g\'` +dch -b -v ${PKGVERSION}.${BUILD_NUMBER}.stage \\"---new build---\\" +mkdir -p tmp_src +cd tmp_src +dpkg-source -Zgzip -Itmp_src -b ../ + +for i in `ls`; do +curl -X POST -F file=@$i http://10.1.10.87:8080/api/files/upload_${SOURCE_NAME}_buster-ci-stage && rm $i +done; +# add files +curl -X POST http://10.1.10.87:8080/api/repos/buster-ci-stage/file/upload_${SOURCE_NAME}_buster-ci-stage +curl -X PUT -H 'Content-Type: application/json' --data '{}' http://10.1.10.87:8080/api/publish//buster''' + } + + stage ('Build package') { + try { +sh '''PKGVERSION=$(git describe --tags $(git rev-list --tags --max-count=1)) +SOURCE_NAME=`cat debian/control |grep Source: | sed \'s/Source://g\' | sed \'s/ //g\'` +mkdir -p /dev/tmp +export TMPDIR=/dev/tmp + +export MAKE_ARGS=-j16 + +while true; do + apt-get update && break +done +apt-get build-dep -y ${SOURCE_NAME} +apt-get source ${SOURCE_NAME} +apt-get -y --new-pkgs upgrade + +cd ${SOURCE_NAME}-${PKGVERSION}.${BUILD_NUMBER}.stage +dpkg-buildpackage -us -uc -b -rfakeroot +cd .. + +for i in `ls *.deb`; do +curl -X POST -F file=@$i http://10.1.10.87:8080/api/files/upload_${SOURCE_NAME}_buster-ci-stage +done; +curl -X POST http://10.1.10.87:8080/api/repos/buster-ci-stage/file/upload_${SOURCE_NAME}_buster-ci-stage +curl -X PUT -H 'Content-Type: application/json' --data '{}' http://10.1.10.87:8080/api/publish//buster +''' + currentBuild.result = 'SUCCESS' + } catch (err) { + currentBuild.result = 'FAILURE' + error('Build Failed') + } finally { + step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: emailextrecipients([requestor(), culprits()]), sendToIndividuals: true]) + } + } + + stage ('Post Build') { + archiveArtifacts artifacts: '*.deb', onlyIfSuccessful: true + } +} diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..8f436031 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +python-riak (2.8) unstable; urgency=low + + * Initial Release. + + -- Kirill Yudin Wed, 16 Jun 2021 22:07:00 +0300 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..af27fd60 --- /dev/null +++ b/debian/control @@ -0,0 +1,19 @@ +Source: python-riak +Priority: optional +Section: python +Maintainer: Andrey Minov +Build-Depends: debhelper (>= 9), dh-python +Build-Depends-Indep: python3 +Standards-Version: 3.9.5 +X-Python-Version: >= 3.4 +Homepage: +#Vcs-Git: git://anonscm.debian.org/collab-maint/python-httplib2.git +#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/python-httplib2.git;a=summary + +Package: python-riak +Architecture: all +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Description: python_riak fork (IPS) + + + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..82c2876f --- /dev/null +++ b/debian/copyright @@ -0,0 +1,34 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: python-httplib2 +Source: + +Files: * +Copyright: + +License: GPL-3.0+ + +Files: debian/* +Copyright: 2016 Andrey Minov +License: GPL-3.0+ + +License: GPL-3.0+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. +# Please avoid to pick license terms that are more restrictive than the +# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/debian/docs b/debian/docs new file mode 100644 index 00000000..e69de29b diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..c0d80b0b --- /dev/null +++ b/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f + +export DH_VERBOSE=1 + +%: + dh $@ -Spybuild + + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..89ae9db8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/setup.py b/setup.py index 37eb8da0..a6b4b4dd 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ description='Python client for Riak', long_description=long_description, zip_safe=True, - options={'easy_install': {'allow_hosts': 'pypi.python.org'}}, + #options={'easy_install': {'allow_hosts': 'pypi.python.org'}}, include_package_data=True, license='Apache 2', platforms='Platform Independent',