Changed version stuff, packaging stuff, trying to get github action to work

Author: James Reynolds

.github/workflows/python-package.yml

@@ -37,7 +37,7 @@ jobs:
         with:
           python-version: 3.7
       - name: Build binary wheel and a source tarball
-        run: python setup.py sdist
+        run: python setup.py sdist bdist_wheel
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@master
         with:

MANIFEST.in

@@ -0,0 +1,2 @@
+include jamf/records.json
+include jamf/VERSION

jamf/setconfig.py

@@ -71,8 +71,10 @@ def parse(self, argv):
         return self.parser.parse_args(argv)
 
 def check_version():
-	if not jamf.version.check_version(min_jamf_version):
-		print(f"setconfig requires python-jamf {min_jamf_version} or newer.")
+	python_jamf_version = jamf.version.jamf_version_up_to(min_jamf_version)
+	if python_jamf_version != min_jamf_version:
+		print(f"setconfig requires python-jamf {min_jamf_version} or newer. "
+		      f"You have {python_jamf_version}.")
 		sys.exit()
 
 def setconfig(argv):

jamf/version.py

@@ -8,7 +8,7 @@
 
 __all__ = (
 	'string',
-	'check_version'
+	'jamf_version_up_to'
 )
 
 def string():
@@ -19,17 +19,18 @@ def string():
 				return version
 	except:
 		pass
-	return "unknown (git checkout)"
+	return "0.0.0"
 
 
-def check_version(min_version):
+def jamf_version_up_to(min_version):
+	current_version = string()
 	try:
-		jamf_1, jamf_2, jamf_3 = string().split(".")
+		jamf_1, jamf_2, jamf_3 = current_version.split(".")
 		min_1, min_2, min_3 = min_version.split(".")
 		if ( int(jamf_1) <= int(min_1) and
 			 int(jamf_2) <= int(min_2) and
 			 int(jamf_3) < int(min_3)):
-			return False
+			return current_version
 	except AttributeError:
-		return False
-	return True
+		return current_version
+	return min_version

setup.py

@@ -2,23 +2,23 @@
 import subprocess
 import os
 
-jctl_version = (
+jamf_version = (
     subprocess.run(["git", "describe", "--tags"], stdout=subprocess.PIPE)
     .stdout.decode("utf-8")
     .strip()
 )
-#assert "." in jctl_version
+#assert "." in jamf_version
 
 assert os.path.isfile("jamf/version.py")
 with open("jamf/VERSION", "w", encoding="utf-8") as fh:
-    fh.write(f"{jctl_version}\n")
+    fh.write(f"{jamf_version}\n")
 
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
 setuptools.setup(
     name="python-jamf",
-    version=jctl_version,
+    version=jamf_version,
     author="The University of Utah",
     author_email="[email protected]",
     description="Python wrapper for Jamf Pro API",