Merged with upstream

.drone.yml

@@ -1,14 +1,67 @@
 ---
 kind: pipeline
 type: docker
-name: delugeClient
+name: Build and test amd64
 
 platform:
   os: linux
   arch: amd64
 
 steps:
-  - name: Build package
+  - name: Build source
     image: python:3.10
     commands:
-      - make build
+    - make build
+
+  - name: Install
+    image: python:3.10
+    commands:
+    - make dist
+    - pip3 install pipenv
+    - pipenv install
+    - pipenv sync
+    - pipenv install dist/delugeClient_kevin-0.3.1-py3-none-any.whl
+#     - pipenv install pytest
+
+#   - name: Run tests
+#     image: python:3.10
+#     commands:
+#       pipenv run pytest
+
+---
+kind: pipeline
+type: docker
+name: Publish package to PyPi
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: Newer version to publish?
+    image: python:3.10
+    commands:
+      - pip3 install delugeClient-kevin -q -q
+      - bash publish_version?.sh
+
+  - name: Test PyPi publish
+    image: python:3.10
+    commands: 
+      - make dist
+      - pip3 install -r requirements.txt
+      - pip3 install twine
+      - twine check dist/*
+      - twine upload --repository delugeClient-kevin dist/*
+
+  - name: PyPi publish
+    image: python:3.10
+    commands: 
+    - make dist
+    - pip3 install pipenv
+    - pipenv install
+    - pipenv sync
+    - pipenv install twine
+    # - pipenv run twine upload dist/*
+
+depends_on:
+  - Build and test amd64

Makefile

@@ -7,9 +7,14 @@ install:
 build:
 	python3 setup.py build
 
-dist:
+tarball:
 	python3 setup.py sdist
 
+wheel:
+	python3 setup.py bdist_wheel
+
+dist: tarball wheel
+
 upload: clean dist
 	twine upload dist/*
 

delugeClient/__version__.py

@@ -1 +1,4 @@
 __version__ = '0.3.1'
+
+if __name__ == '__main__':
+  print(__version__)

publish_version?.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/bash
+
+PYPI_VERSION=$(pip3 show delugeClient-kevin | awk '$1 ~ /Version:/ { print $2 }')
+SOURCE_VERSION=$(python3 delugeClient/__version__.py)
+
+printf "Source version:\t\t %s\n" $SOURCE_VERSION
+printf "Remote PyPi version:\t %s\n" $PYPI_VERSION
+
+function version {
+  echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }';
+}
+
+if [ $(version $SOURCE_VERSION) -gt $(version $PYPI_VERSION) ]; then
+  echo "Soure is newer than remote, publishing!"
+  exit 0
+else
+  echo "Source is same or oldre than remote, nothing to do."
+  exit 1
+fi