.gitignore

@@ -1,6 +1,7 @@
 .vim/*
 *.pyc
 *.pdf
+*.dot
 *.png
 *.egg-info
 
@@ -18,5 +19,8 @@ AppDir/
 appimage-builder-cache/
 .pytest_cache/
 
-.coverage
+.coverage*
 htmlcov/
+coverage.xml
+
+appimage-build/

.readthedocs.yaml

@@ -0,0 +1,14 @@
+version: 2
+
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3.9"
+
+mkdocs:
+  configuration: mkdocs.yml
+
+python:
+  install:
+    - requirements: docs/requirements.txt
+

AppImageBuilder.yml

@@ -5,7 +5,7 @@ script:
   # Build wheel
   - python3 setup.py bdist_wheel
   # Install application dependencies
-  - python3 -m pip install --ignore-installed --prefix=/usr --system --root=$PWD/AppDir dist/nmfu-0.3.0a2-py3-none-any.whl
+  - python3 -m pip install --ignore-installed --prefix=/usr --system --root=$PWD/AppDir dist/nmfu-0.5.7-py3-none-any.whl
 
 AppDir:
     path: ./AppDir
@@ -14,23 +14,20 @@ AppDir:
         id: xyz.mm12.nmfu
         name: nmfu
         icon: utilities-terminal
-        version: 0.3.0a2
+        version: 0.5.7
         exec: usr/bin/python3 
         exec_args: "$APPDIR/usr/bin/nmfu $@"
 
     apt:
         arch: amd64
         sources:
-            - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse'
+            - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse'
               key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32' 
         include:
             - python3
-            - python3-pkg-resources
 
-    runtime:
-        env:
-            PYTHONHOME: '${APPDIR}/usr'
-            PYTHONPATH: '${APPDIR}/usr/lib/python3.6/site-packages'
+    after_runtime: |
+        sed -i 's/Terminal=false/Terminal=true/' "$TARGET_APPDIR/xyz.mm12.nmfu.desktop"
 
 AppImage:
     arch: x86_64

Dockerfile.appimage

@@ -1,3 +1,5 @@
-FROM appimagecrafters/appimage-builder
+FROM appimagecrafters/appimage-builder:1.1.0
 
-RUN apt-get update && apt-get install -y --no-install-recommends adwaita-icon-theme && rm -rf /var/lib/apt/lists/* 
+ENV XDG_DATA_DIRS "/usr/share:/usr/local/share"
+
+RUN apt-get update && apt-get install -y --no-install-recommends adwaita-icon-theme squashfs-tools && rm -rf /var/lib/apt/lists/* 

Dockerfile.build

@@ -1,8 +1,9 @@
 FROM python:3
 
+RUN apt-get update && apt-get install gcc -y --no-install-recommends
 RUN pip install twine
 
 WORKDIR /data
 COPY . /data
 
-RUN pip install .[tests]
+RUN pip install .[tests,coverage] && pip uninstall -y nmfu

Jenkinsfile

@@ -14,11 +14,12 @@ pipeline {
 				}
 			}
 			environment {
-				TAG_BUILD = """${sh(returnStdout: true, script: 'bash -c "[[ \\$TAG_NAME ]] && echo \' \' || echo -n dev0+git-${GIT_COMMIT}"')}"""
+				TAG_BUILD = """${sh(returnStdout: true, script: 'bash -c "[[ \\$TAG_NAME ]] && echo -n \'\' || echo -n --tag-build \\\'dev0+git-${GIT_COMMIT}\\\'"')}"""
 			}
 			steps {
 				sh "rm dist/* || true"
-				sh "python setup.py egg_info --tag-build '${TAG_BUILD}' sdist bdist_wheel"
+				sh "mkdir -p .venv; python -m venv .venv; .venv/bin/pip install setuptools wheel;"
+				sh ".venv/bin/python setup.py egg_info ${env.TAG_BUILD} sdist bdist_wheel"
 				archiveArtifacts artifacts: 'dist/*'
 				stash includes: 'dist/*', name: 'built'
 			}
@@ -30,9 +31,13 @@ pipeline {
 					filename 'Dockerfile.build'
 				}
 			}
+			environment {
+				PYTHONPATH="."
+			}
 			steps {
-				sh "pytest --junit-xml=junit.xml || true"
+				sh "pytest --junit-xml=junit.xml --cov-branch --cov=nmfu --cov-report=xml || true"
 				junit 'junit.xml'
+				recordCoverage sourceCodeRetention: 'EVERY_BUILD', tools: [[parser: 'COBERTURA', pattern: 'coverage.xml']]
 			}
 		}
 		stage('Deploy/Package') {
@@ -45,7 +50,6 @@ pipeline {
 				message 'Release this version of NMFU?'
 				ok 'Yes, do it!' 
 				parameters {
-					choice(choices: ['stable', 'candidate', 'beta'], description: 'Which release channel should the snap be sent to?', name: 'SNAPCRAFT_RELEASE_CHANNEL')
 					choice(choices: ['pypi', 'testpypi'], description: 'Which registry should the package be sent to?', name: 'PYPI_REPOSITORY_NAME')
 				}
 				submitter 'matthew'
@@ -63,7 +67,7 @@ pipeline {
 					}
 					steps {
 						unstash name: 'built'
-						sh "twine upload -u $DPYPI_INFO_USR -p $DPYPI_INFO_PSW -r $PYPI_REPOSITORY_NAME --non-interactive dist/*"
+						sh 'twine upload -u $DPYPI_INFO_USR -p $DPYPI_INFO_PSW -r $PYPI_REPOSITORY_NAME --non-interactive dist/*'
 					}
 				}
 				stage('Generate AppImage') {
@@ -78,33 +82,6 @@ pipeline {
 						archiveArtifacts "*.AppImage"
 					}
 				}
-				stage ('Upload Snap') {
-					agent {
-						docker {
-							label "docker && linux"
-							image 'cibuilds/snapcraft:core18'
-							args "-u 0:0"
-						}
-					}
-					environment {
-						SNAP_LOGIN_FILE = credentials('snapcraft-login')
-					}
-					steps {
-						dir("snapbuild") {
-							sh "rm *.snap || true"
-							sh "cp ../README.md ../nmfu.py ../setup.py ../snapcraft.yaml ."
-							sh "apt-get update && snapcraft"
-							archiveArtifacts artifacts: '*.snap'
-							sh "snapcraft login --with $SNAP_LOGIN_FILE"
-							sh "snapcraft upload --release $SNAPCRAFT_RELEASE_CHANNEL *.snap"
-						}
-					}
-					post {
-						always {
-							sh "chmod -R a+rw \$PWD/"
-						}
-					}
-				}
 			}
 		}
 	}