Use setuptools-scm

Author: mlech-reef

b2.spec

@@ -1,11 +1,13 @@
 # -*- mode: python ; coding: utf-8 -*-
 
+from PyInstaller.utils.hooks import copy_metadata
+
 block_cipher = None
 
 a = Analysis(['b2/console_tool.py'],
              pathex=['.'],
              binaries=[],
-             datas=[],
+             datas=copy_metadata('b2'),
              hiddenimports=['pkg_resources.py2_warn'],
              hookspath=[],
              runtime_hooks=[],

b2/version.py

@@ -8,4 +8,9 @@
 #
 ######################################################################
 
-VERSION = '2.1.1'
+from importlib.metadata import version, PackageNotFoundError
+
+try:
+    VERSION = version('b2')
+except PackageNotFoundError:
+    VERSION = '0.0.0'

noxfile.py

@@ -166,9 +166,9 @@ def build(session):
 @nox.session(python=PYTHON_DEFAULT_VERSION)
 def bundle(session):
     """Bundle the distribution."""
-    install_myself(session)
     session.install('pyinstaller')
     session.run('rm', '-rf', 'build', 'dist', 'b2.egg-info', external=True)
+    install_myself(session)
     session.run('pyinstaller', '--onefile', *session.posargs, 'b2.spec')
 
     # Set outputs for GitHub Actions

setup.py

@@ -46,15 +46,9 @@
 if platform.system().lower().startswith('java'):
     requirements.append('idna>=2.2.0')
 
-version = import_module('b2').__version__
 
 setup(
     name='b2',
-
-    # Versions should comply with PEP440.  For a discussion on single-sourcing
-    # the version across setup.py and the project code, see
-    # https://packaging.python.org/en/latest/single_source_version.html
-    version=version,
     description='Command Line Tool for Backblaze B2',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -123,6 +117,8 @@
                 'sphinxcontrib-plantuml', 'sadisplay'
             ],
     },
+    setup_requires=['setuptools_scm'],
+    use_scm_version=True,
 
     # If there are data files included in your packages that need to be
     # installed, specify them here.
@@ -140,6 +136,6 @@
     # "scripts" keyword. Entry points provide cross-platform support and allow
     # pip to create the appropriate form of executable for the target platform.
     entry_points={
-        'console_scripts': ['b2=b2.console_tool:main',],
+        'console_scripts': ['b2=b2.console_tool:main'],
     },
 )