fix: change wheel name to conform to PEP440

.github/workflows/pythonapp.yml

@@ -42,8 +42,8 @@ jobs:
       with:
         name: wheel-linux
         path: |
-          ./dist/cato-server*.whl
-          ./dist/cato-client*.whl
+          ./dist/catoserver*.whl
+          ./dist/catoclient*.whl
 
   build_windows:
     runs-on: windows-latest

deploy.py

@@ -32,7 +32,7 @@ def main():
 
     print("Copy wheel..")
     wheel_path = os.path.join(
-        os.path.dirname(__file__), "dist", f"cato-server-{version}-py3-none-any.whl"
+        os.path.dirname(__file__), "dist", f"catoserver-{version}-py3-none-any.whl"
     )
     shutil.copy(
         wheel_path, os.path.join(r"M:\cato\wheels", os.path.basename(wheel_path))

scripts/generate_wheels.py

@@ -145,7 +145,7 @@ def find_wheel(name) -> Path:
 if __name__ == "__main__":
     create_new_wheel(
         find_current_wheel(),
-        new_name="cato-client",
+        new_name="catoclient",
         modules_to_keep=["cato", "cato_api_client", "cato_common"],
         entry_points_to_keep=["cato"],
         requirements_to_keep=[
@@ -183,7 +183,7 @@ def find_wheel(name) -> Path:
 
     create_new_wheel(
         find_current_wheel(),
-        new_name="cato-server",
+        new_name="catoserver",
         modules_to_keep=["cato_server", "cato_common"],
         entry_points_to_keep=[
             "cato_worker",
@@ -242,11 +242,11 @@ def find_wheel(name) -> Path:
         ],
         include_files=[
             (
-                find_wheel("cato-client"),
+                find_wheel("catoclient"),
                 Path("cato_server")
                 / "static"
                 / "static"
-                / "cato-client-0.0.0-py3-none-any.whl",
+                / "catoclient-0.0.0-py3-none-any.whl",
             )
         ],
     )

scripts/install_test.py

@@ -45,7 +45,7 @@ def create_virtual_env(folder: Path) -> Venv:
 def check_cato_server_wheel():
     with tempfile.TemporaryDirectory() as tmpdirname:
         venv = create_virtual_env(Path(tmpdirname))
-        venv.run_pip(["install", str(find_wheel("cato-server"))])
+        venv.run_pip(["install", str(find_wheel("catoserver"))])
         venv.run_executable("python", ["-m", "cato_server", "-h"])
         venv.run_executable("cato_beat", ["-h"])
         venv.run_executable("cato_worker", ["-h"])
@@ -55,7 +55,7 @@ def check_cato_server_wheel():
 def check_cato_client_wheel():
     with tempfile.TemporaryDirectory() as tmpdirname:
         venv = create_virtual_env(Path(tmpdirname))
-        venv.run_pip(["install", str(find_wheel("cato-client"))])
+        venv.run_pip(["install", str(find_wheel("catoclient"))])
         venv.run_executable("cato", ["-h"])