more merge fixes

pyproject.toml

@@ -46,7 +46,7 @@ dev = [
 ]
 
 [project.scripts]
-gphotos-sync = "photos_sync.__main__:main"
+gphotos-sync = "gphotos_sync.__main__:main"
 
 [project.urls]
 GitHub = "https://github.com/gilesknap/gphotos-sync"
@@ -57,7 +57,7 @@ name = "Giles Knap"
 
 
 [tool.setuptools_scm]
-write_to = "src/photos_sync/_version.py"
+write_to = "src/gphotos_sync/_version.py"
 
 [tool.mypy]
 ignore_missing_imports = true # Ignore missing stubs in imported modules

src/gphotos_sync/__main__.py

@@ -1,18 +1,14 @@
 from argparse import ArgumentParser
 
 from . import __version__
-from .hello import HelloClass, say_hello_lots
 
 __all__ = ["main"]
 
 
 def main(args=None):
     parser = ArgumentParser()
     parser.add_argument("--version", action="version", version=__version__)
-    parser.add_argument("name", help="Name of the person to greet")
-    parser.add_argument("--times", type=int, default=5, help="Number of times to greet")
     args = parser.parse_args(args)
-    say_hello_lots(HelloClass(args.name), args.times)
 
 
 # test with: python -m gphotos_sync

tests/test_cli.py

@@ -1,9 +1,9 @@
 import subprocess
 import sys
 
-from photos_sync import __version__
+from gphotos_sync import __version__
 
 
 def test_cli_version():
-    cmd = [sys.executable, "-m", "photos_sync", "--version"]
+    cmd = [sys.executable, "-m", "gphotos_sync", "--version"]
     assert subprocess.check_output(cmd).decode().strip() == __version__