hubblestack
diff --git a/‎.gitignore
+4 b/‎.gitignore
+4
diff --git a/‎.pipeline
+19-16 b/‎.pipeline
+19-16
diff --git a/‎.travis.yml
+19-9 b/‎.travis.yml
+19-9
diff --git a/‎contrib/gen-pretend-certs.py
+8-8 b/‎contrib/gen-pretend-certs.py
+8-8
diff --git a/‎openssl-gen-pretend-certs.sh ‎contrib/openssl-gen-pretend-certs.sh b/‎openssl-gen-pretend-certs.sh ‎contrib/openssl-gen-pretend-certs.sh
diff --git a/‎contrib/sign-profiles.sh
+34 b/‎contrib/sign-profiles.sh
+34
diff --git a/‎cp-pyinstaller.bash
-10 b/‎cp-pyinstaller.bash
-10
diff --git a/‎doc/conf.py
+9-9 b/‎doc/conf.py
+9-9
diff --git a/‎hubblestack/__init__.py
+1-1 b/‎hubblestack/__init__.py
+1-1
@@ -7,6 +7,10 @@ __pycache__/
 *.py[cod]
 *$py.class
 
+# patch detritus
+*.rej
+*.orig
+
 # C extensions
 *.so
 
 
@@ -1,5 +1,5 @@
 
-def imgname = 'hubblestack/jenkins:centos-v1.0.8'
+def imgname = 'hubblestack/jenkins:centos-v1.0.14'
 
 pipeline {
     agent { docker { image "${imgname}" } }
@@ -13,6 +13,7 @@ pipeline {
     environment {
         PY_COLORS = 1
         HS_PROFILE = 1
+        TEST_PY_V = '3.6.10'
     }
 
     stages {
@@ -23,8 +24,10 @@ pipeline {
                     '''
                 sh '''#!/bin/bash
                     source /etc/profile.d/kersplat.sh
-                    pyenv local $PY_V
-                    pyenv shell $PY_V
+                    export PY_V="$TEST_PY_V"
+                    pyenv local $TEST_PY_V
+                    pyenv shell $TEST_PY_V
+                    echo "pyenv version-name: $(pyenv version-name)"
                     set -x -e
                     rm -rf vlib venv .pytest_cache
                     pip install --cache-dir ./pip.cache -t ./vlib virtualenv
@@ -40,15 +43,17 @@ pipeline {
                     /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}"
+                    echo "LHS=$LHS RHS=$RHS"
                     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"
                     fi > relevant-files.txt
                     '''
-                sh '''mkdir -vp tests/unittests/output'''
+                sh ''' mkdir -vp tests/unittests/output
+                       cp relevant-files.txt tests/unittests/output
+                   '''
             }
         }
         stage('lint/test') {
@@ -66,16 +71,14 @@ pipeline {
                 }
                 stage('pylint') {
                     steps {
-                        catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                            sh '''#!/bin/bash
-                                source ./venv/bin/activate
-                                < relevant-files.txt  xargs -r pylint --output-format=json \
-                                    > tests/unittests/output/pylint.json
-                                x=$?
-                                python ./tests/automation/pylint-json-to-html tests/unittests/output/pylint.json
-                                exit $x
-                                '''
-                        }
+                        sh '''#!/bin/bash
+                            source ./venv/bin/activate
+                            < relevant-files.txt  xargs -r pylint --output-format=json \
+                                > tests/unittests/output/pylint.json
+                            x=$?
+                            python ./tests/automation/pylint-json-to-html tests/unittests/output/pylint.json
+                            exit $x
+                            '''
                     }
                 }
                 stage('bandit') {
@@ -105,7 +108,7 @@ pipeline {
                 alwaysLinkToLastBuild: false,
                 keepAll: true,
                 reportDir: 'tests/unittests/output',
-                reportFiles: 'pytest.html, coverage/index.html, pylint.html, profile-diagram.svg, bandit.html',
+                reportFiles: 'pytest.html, coverage/index.html, pylint.html, profile-diagram.svg, bandit.html, relevant-files.txt',
                 reportName: "Test Reports"
             ])
         }
 
@@ -1,21 +1,31 @@
 
+version: 1.0
+
 language: python
 
 cache: pip
 
 env:
-  - 'PYLINT_ENABLE=1'
+  global:
+    LIBGIT2_VERSION: "0.26.5"
+    LIBGIT2_SRC_URL: https://github.com/libgit2/libgit2/archive/v${LIBGIT2_VERSION}.tar.gz
+    LIBGIT2_DIR_NAME: libgit2-${LIBGIT2_VERSION}
+    LIBGIT2_TAR_NAME: ${LIBGIT2_DIR_NAME}.tar.gz
+    LIBGIT2: ~/libgit2/_install
+    LD_LIBRARY_PATH: ${LIBGIT2}/lib:${LD_LIBRARY_PATH}
 
 python:
-  - "2.7"
-  - "3.6"
-
-matrix:
-  allow_failures:
-    - python: "3.6"
+  - "3.6.10"
+  - "3.7"
+  - "3.8"
 
 install:
-  - pip install -r test-requirements.txt
+  - pip --upgarde pip
+  - ./mk-requires.sh
+  - pip install -r requirements.txt
 
 script:
-  - bash tests/travis-runner.sh
+  - wget -q "$LIBGIT2_SRC_URL" -O $LIBGIT2_TAR_NAME
+  - tar -xzf $LIBGIT2_TAR_NAME
+  - (cd $LIBGIT2_DIR_NAME; cmake . -DMAKE_INSTALL_PREFIX=${LIBGIT2} && make -j 5 install)
+  - pytest tests/unittests
@@ -49,10 +49,10 @@ def gen_CA(fname='ca-root', cn='ca-root', path_length=0, authority=None, pdir=DE
     private_key = genkey(**args)
     public_key  = private_key.public_key()
 
-    with open(os.path.join(pdir, fname + '.key'), 'w') as fh:
+    with open(os.path.join(pdir, fname + '.key'), 'wb') as fh:
         fh.write( as_pem(private_key) )
 
-    with open(os.path.join(pdir, fname + '.unsigned'), 'w') as fh:
+    with open(os.path.join(pdir, fname + '.unsigned'), 'wb') as fh:
         fh.write( as_pem(public_key) )
 
     ksec_100 = datetime.timedelta(0, 100e3, 0)
@@ -114,7 +114,7 @@ def gen_CA(fname='ca-root', cn='ca-root', path_length=0, authority=None, pdir=DE
 
     certificate = builder.sign(**signing_args)
 
-    with open(os.path.join(pdir, fname + '.crt'), 'w') as fh:
+    with open(os.path.join(pdir, fname + '.crt'), 'wb') as fh:
         fh.write( as_pem(certificate) )
 
     return Authority(private_key, certificate)
@@ -126,10 +126,10 @@ def gen_leaf(authority, fname_template='{}', cn='Certy Cert McCertFace', pdir=DE
     private_name = fname_template.format('private')
     public_name = fname_template.format('public')
 
-    with open(os.path.join(pdir, private_name + '.key'), 'w') as fh:
+    with open(os.path.join(pdir, private_name + '.key'), 'wb') as fh:
         fh.write( as_pem(private_key) )
 
-    with open(os.path.join(pdir, public_name + '.unsigned'), 'w') as fh:
+    with open(os.path.join(pdir, public_name + '.unsigned'), 'wb') as fh:
         fh.write( as_pem(public_key) )
 
     ksec_100 = datetime.timedelta(0, 100e3, 0)
@@ -186,7 +186,7 @@ def gen_leaf(authority, fname_template='{}', cn='Certy Cert McCertFace', pdir=DE
 
     certificate = builder.sign(**signing_args)
 
-    with open(os.path.join(pdir, public_name + '.crt'), 'w') as fh:
+    with open(os.path.join(pdir, public_name + '.crt'), 'wb') as fh:
         fh.write( as_pem(certificate) )
 
     return Authority(private_key, certificate)
@@ -203,9 +203,9 @@ def main(root_cn, int1_cn, int2_cn, **args):
     lf1 = gen_leaf(cn='Certy Cert #1', fname_template='{}-1', authority=ia1, **args)
     lf2 = gen_leaf(cn='Certy Cert #2', fname_template='{}-2', authority=ia2, **args)
 
-    with open(os.path.join(args['pdir'], 'bundle.pem'), 'w') as ofh:
+    with open(os.path.join(args['pdir'], 'bundle.pem'), 'wb') as ofh:
         for i in range(1,3):
-            with open(os.path.join(args['pdir'], 'intermediate-{}.crt'.format(i)), 'r') as ifh:
+            with open(os.path.join(args['pdir'], 'intermediate-{}.crt'.format(i)), 'rb') as ifh:
                 ofh.write(ifh.read())
 
 if __name__ == '__main__':
 
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# This is an example of a way to quickly sign a repo without accidentally
+# signing all the wrong things.  If everything goes well, it should
+# (re)generate a MANIFEST and SIGNATURE file.
+#
+# USAGE: bash contrib/sign-profiles.sh repo private-key
+#
+# e.g., bash contrib/sign-profiles.sh ~/code/hubblestack_data.git_repo ~/secerts/hubble/private.key
+#
+
+PROFILE="$1"; shift
+PRIVATE_KEY="${1:-/etc/certs/private.key}"; shift
+OK=0
+
+HUBBLE="${HUBBLE:-hubble}"
+
+if [ -n "$PROFILE" -a -d "$PROFILE/hubblestack_pulsar" -a -d "$PROFILE/hubblestack_nova_profiles" ]
+then cd "$PROFILE" || exit 1; OK=1
+else read -ep "$PROFILE=\"$PROFILE\" doesn't look like profile repo, sign anyway? " YN
+    if [[ "$YN" =~ [Yy] ]]
+    then cd "$PROFILE" || exit 1; OK=1
+    fi
+fi
+
+if [ "X$OK" = X1 ]
+then readarray -t FILEZ < <( find ./ -name .git -prune -o \( -type f -print \) \
+       | grep -vE '^(MANIFEST|SIGNATURE)$' )
+    ( set -x -e;
+      cd "$PROFILE"
+      "$HUBBLE" -vvv signing.msign "${FILEZ[@]}" private_key="$PRIVATE_KEY"
+    )
+else "usage: $(basename "$0") profile-dir"
+fi
@@ -50,18 +50,18 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'HubbleStack'
-copyright = u'2018, Colton Myers, Christer Edwards'
-author = u'Colton Myers, Christer Edwards'
+project = 'HubbleStack'
+copyright = '2018, Colton Myers, Christer Edwards'
+author = 'Colton Myers, Christer Edwards'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'3.0.8'
+version = u'4.0.0'
 # The full version, including alpha/beta/rc tags.
-release = u'3.0.8-1'
+release = u'4.0.0-1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -140,8 +140,8 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'HubbleStack.tex', u'HubbleStack Documentation',
-     u'Colton Myers, Christer Edwards', 'manual'),
+    (master_doc, 'HubbleStack.tex', 'HubbleStack Documentation',
+     'Colton Myers, Christer Edwards', 'manual'),
 ]
 
 
@@ -150,7 +150,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'hubblestack', u'HubbleStack Documentation',
+    (master_doc, 'hubblestack', 'HubbleStack Documentation',
      [author], 1)
 ]
 
@@ -161,7 +161,7 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'HubbleStack', u'HubbleStack Documentation',
+    (master_doc, 'HubbleStack', 'HubbleStack Documentation',
      author, 'HubbleStack', 'One line description of project.',
      'Miscellaneous'),
 ]
 
@@ -1,3 +1,3 @@
-__version__ = '3.0.8'
+__version__ = '4.0.0'
 
 __buildinfo__ = {'branch': 'BRANCH_NOT_SET', 'last_commit': 'COMMIT_NOT_SET'}
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-__version__ = '3.0.8'`
	`1`	`+__version__ = '4.0.0'`
`2`	`2`
`3`	`3`	`__buildinfo__ = {'branch': 'BRANCH_NOT_SET', 'last_commit': 'COMMIT_NOT_SET'}`