Skip to content

Commit 447ce8e

Browse files
committed
Merge branch 'develop' of https://github.com/hubblestack/hubble into python3
2 parents b015f68 + 94de08b commit 447ce8e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1738
-1215
lines changed

.pipeline

+5-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,13 @@ pipeline {
3333
sh '''#!/bin/bash
3434
# NOTE: CHANGE_TARGET and BRANCH_NAME are only populated on multibranch pipeline.
3535
# For other environments, we have to fake it with 'origin/develop' and 'HEAD'
36-
LHS="origin/${CHANGE_TARGET:-develop}"
37-
RHS="${BRANCH_NAME:+origin/}${BRANCH_NAME:-HEAD}"
36+
echo "CHANGE_TARGET=$CHANGE_TARGET BRANCH_NAME=$BRANCH_NAME"
37+
/usr/bin/git fetch --no-tags --progress https://github.com/hubblestack/hubble.git +refs/heads/develop:refs/remotes/origin/develop
38+
echo git branch -vva
3839
git branch -vva
3940
echo "LHS=$LHS RHS=$RHS"
41+
LHS="origin/${CHANGE_TARGET:-develop}"
42+
RHS="${BRANCH_NAME:+origin/}${BRANCH_NAME:-HEAD}"
4043
if [[ $(git show -s --format='%s%n%b' "${LHS}..${RHS}") =~ LINT-FULL ]]
4144
then find hubblestack -name "*.py"
4245
else find hubblestack -name "*.py" -print0 | xargs -r0 git diff --name-only "$LHS" "$RHS"

doc/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
# built documents.
6060
#
6161
# The short X.Y version.
62-
version = '3.0.7'
62+
version = u'3.0.8'
6363
# The full version, including alpha/beta/rc tags.
64-
release = '3.0.7-1'
64+
release = u'3.0.8-1'
6565

6666
# The language for content autogenerated by Sphinx. Refer to documentation
6767
# for a list of supported languages.

hubblestack/__init__.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
__version__ = '3.0.7'
2-
3-
__buildinfo__ = { 'branch' : 'BRANCH_NOT_SET' , 'last_commit' : 'COMMIT_NOT_SET' }
1+
__version__ = '3.0.8'
42

3+
__buildinfo__ = {'branch': 'BRANCH_NOT_SET', 'last_commit': 'COMMIT_NOT_SET'}

0 commit comments

Comments
 (0)