Skip to content

Commit

Permalink
Merge pull request hubblestack#762 from Tenebriso/python3
Browse files Browse the repository at this point in the history
rebase & convert changes
  • Loading branch information
jettero committed Jan 1, 2020
2 parents 277b958 + a0d94e7 commit 9802ad1
Show file tree
Hide file tree
Showing 75 changed files with 1,967 additions and 1,443 deletions.
7 changes: 5 additions & 2 deletions .pipeline
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,13 @@ pipeline {
sh '''#!/bin/bash
# NOTE: CHANGE_TARGET and BRANCH_NAME are only populated on multibranch pipeline.
# For other environments, we have to fake it with 'origin/develop' and 'HEAD'
LHS="origin/${CHANGE_TARGET:-develop}"
RHS="${BRANCH_NAME:+origin/}${BRANCH_NAME:-HEAD}"
echo "CHANGE_TARGET=$CHANGE_TARGET BRANCH_NAME=$BRANCH_NAME"
/usr/bin/git fetch --no-tags --progress https://github.com/hubblestack/hubble.git +refs/heads/develop:refs/remotes/origin/develop
echo git branch -vva
git branch -vva
echo "LHS=$LHS RHS=$RHS"
LHS="origin/${CHANGE_TARGET:-develop}"
RHS="${BRANCH_NAME:+origin/}${BRANCH_NAME:-HEAD}"
if [[ $(git show -s --format='%s%n%b' "${LHS}..${RHS}") =~ LINT-FULL ]]
then find hubblestack -name "*.py"
else find hubblestack -name "*.py" -print0 | xargs -r0 git diff --name-only "$LHS" "$RHS"
Expand Down
4 changes: 2 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
# built documents.
#
# The short X.Y version.
version = '3.0.7'
version = u'3.0.8'
# The full version, including alpha/beta/rc tags.
release = '3.0.7-1'
release = u'3.0.8-1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
5 changes: 2 additions & 3 deletions hubblestack/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
__version__ = '3.0.7'

__buildinfo__ = { 'branch' : 'BRANCH_NOT_SET' , 'last_commit' : 'COMMIT_NOT_SET' }
__version__ = '3.0.8'

__buildinfo__ = {'branch': 'BRANCH_NOT_SET', 'last_commit': 'COMMIT_NOT_SET'}
Loading

0 comments on commit 9802ad1

Please sign in to comment.