vswmc-cli 2.2.0.dev355__tar.gz → 2.2.1__tar.gz

{vswmc_cli-2.2.0.dev355/vswmc_cli.egg-info → vswmc_cli-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vswmc-cli
-Version: 2.2.0.dev355
+Version: 2.2.1
 Summary: VSWMC Command-Line Tools
 Home-page: https://spaceweather.hpc.kuleuven.be
 Author: Rays of Space
@@ -26,7 +26,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: six
 Requires-Dist: requests
-Requires-Dist: setuptools
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

vswmc_cli-2.2.1/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=61", "wheel"]
+build-backend = "setuptools.build_meta"

{vswmc_cli-2.2.0.dev355 → vswmc_cli-2.2.1}/setup.py

@@ -11,7 +11,7 @@ packages = [
 
 setuptools.setup(
     name="vswmc-cli",
-    version="2.2.0.dev355",
+    version="2.2.1",
     description="VSWMC Command-Line Tools",
     long_description=readme,
     long_description_content_type="text/markdown",
@@ -20,7 +20,6 @@ setuptools.setup(
     author_email="info@raysofspace.com",
     license="LGPL",
     packages=packages,
-    namespace_packages=["vswmc"],
     entry_points={"console_scripts": ["vswmc = vswmc.cli.__main__:main"]},
     classifiers=[
         "Development Status :: 4 - Beta",
@@ -43,7 +42,6 @@ setuptools.setup(
     install_requires=[
         "six",
         "requests",
-        "setuptools",
     ],
     include_package_data=True,
     zip_safe=False,

vswmc_cli-2.2.1/vswmc/__init__.py

@@ -0,0 +1 @@
+"""VSWMC command-line client package."""

{vswmc_cli-2.2.0.dev355 → vswmc_cli-2.2.1}/vswmc/cli/__main__.py

@@ -3,7 +3,6 @@ from __future__ import print_function
 import argparse
 import logging
 
-import pkg_resources
 from vswmc.cli import (
     cp,
     logs,
@@ -19,6 +18,21 @@ from vswmc.cli import (
 )
 
 
+try:
+    from importlib import metadata as importlib_metadata
+except ImportError:
+    importlib_metadata = None
+
+
+def get_version():
+    if importlib_metadata is None:
+        return "unknown"
+    try:
+        return importlib_metadata.version("vswmc-cli")
+    except importlib_metadata.PackageNotFoundError:
+        return "unknown"
+
+
 class SubCommandHelpFormatter(argparse.RawDescriptionHelpFormatter):
     def _format_action(self, action):
         # Removes the subparsers metavar from the help output
@@ -29,14 +43,13 @@ class SubCommandHelpFormatter(argparse.RawDescriptionHelpFormatter):
 
 
 def main():
-    dist = pkg_resources.get_distribution("vswmc-cli")
     parser = argparse.ArgumentParser(
         description=None, formatter_class=SubCommandHelpFormatter
     )
     parser.add_argument(
         "--version",
         action="version",
-        version=dist.version,
+        version=get_version(),
         help="Print version information and quit",
     )
     parser.add_argument("--token", help="S2P OAuth access token")

{vswmc_cli-2.2.0.dev355 → vswmc_cli-2.2.1/vswmc_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vswmc-cli
-Version: 2.2.0.dev355
+Version: 2.2.1
 Summary: VSWMC Command-Line Tools
 Home-page: https://spaceweather.hpc.kuleuven.be
 Author: Rays of Space
@@ -26,7 +26,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: six
 Requires-Dist: requests
-Requires-Dist: setuptools
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{vswmc_cli-2.2.0.dev355 → vswmc_cli-2.2.1}/vswmc_cli.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 MANIFEST.in
 README.md
+pyproject.toml
 setup.cfg
 setup.py
 vswmc/__init__.py
@@ -28,7 +29,6 @@ vswmc_cli.egg-info/PKG-INFO
 vswmc_cli.egg-info/SOURCES.txt
 vswmc_cli.egg-info/dependency_links.txt
 vswmc_cli.egg-info/entry_points.txt
-vswmc_cli.egg-info/namespace_packages.txt
 vswmc_cli.egg-info/not-zip-safe
 vswmc_cli.egg-info/requires.txt
 vswmc_cli.egg-info/top_level.txt

{vswmc_cli-2.2.0.dev355 → vswmc_cli-2.2.1}/vswmc_cli.egg-info/requires.txt

@@ -1,3 +1,2 @@
 six
 requests
-setuptools

vswmc_cli-2.2.0.dev355/vswmc/__init__.py

@@ -1,5 +0,0 @@
-"""VSWMC namespace package."""
-
-import pkg_resources
-
-pkg_resources.declare_namespace(__name__)

vswmc_cli-2.2.0.dev355/vswmc_cli.egg-info/namespace_packages.txt

@@ -1 +0,0 @@
-vswmc