handle internal pip API change, revert moving of 'version'

docs/conf.py

@@ -18,29 +18,27 @@
 # relative to the documentation root, use os.path.abspath to make it
 # absolute, like shown here.
 #
+import inspect
 import os
 import sys
 from pathlib import Path
 
+try:
+    from pip import main as pip_main
+except ImportError:
+    from pip._internal import main as pip_main
+if not inspect.isfunction(pip_main):
+    pip_main = pip_main.main
 
 sys.path.insert(0, os.path.abspath(".."))
 
-# get version information without importing project
-proj_path = Path(__file__).parent.parent
-sys.path.append(str(proj_path / "udm_rest_client"))
-from version import __version__
-
 # install 'openapi_client_udm' package from test-pypi to be able to build
 # Python module doc
 try:
-    import openapi_client_udm
+    import openapi_client_udm  # isort:skip
 except ImportError:
     print("Installing 'openapi_client_udm' package from test-pypi...")
-    try:
-        from pip import main as pip_main
-    except ImportError:
-        from pip._internal import main as pip_main
-    pip_main.main(
+    pip_main(
         [
             "install",
             "--compile",
@@ -51,6 +49,8 @@
         ]
     )
 
+from udm_rest_client import __version__  # isort:skip
+
 # -- General configuration ---------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.

setup.cfg

@@ -7,7 +7,7 @@ tag = True
 search = version="{current_version}"
 replace = version="{new_version}"
 
-[bumpversion:file:udm_rest_client/version.py]
+[bumpversion:file:udm_rest_client/__init__.py]
 search = __version__ = "{current_version}"
 replace = __version__ = "{new_version}"
 

udm_rest_client/__init__.py

@@ -17,7 +17,6 @@
     UnknownModuleType,
 )
 from .udm import UDM
-from .version import __author__, __email__, __version__
 
 __all__ = [
     "UDM",
@@ -35,3 +34,6 @@
     "UnknownModuleType",
     "APICommunicationError",
 ]
+__author__ = """Daniel Troeder"""
+__email__ = "troeder@univention.de"
+__version__ = "0.1.0"

udm_rest_client/udm.py

@@ -71,7 +71,7 @@
 # that code doesn't work when something goes wrong:
 try:
     del openapi_client_udm.rest.RESTClientObject.__del__
-except AttributeError:
+except AttributeError:  # pragma: no cover
     pass