Move to src directory, use importlib, stop using setup.py

mangelajo · Aug 25, 2024 · 33b3f8e · 33b3f8e
1 parent bf6abee
commit 33b3f8e
Show file tree

Hide file tree

Showing 26 changed files with 42 additions and 38 deletions.
diff --git a/distribute.sh b/distribute.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
-python3 setup.py sdist upload --sign
-#python3 setup.py bdist_egg upload --sign
+rm dist/*
+uv run python3 -m build
+uv run twine upload dist/*
 
diff --git a/photosort/version.py b/photosort/version.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -23,4 +23,5 @@ dev-dependencies = [
     "mock>=5.1.0",
     "setuptools>=73.0.1",
     "twine>=5.1.1",
+    "build>=1.2.1",
 ]
diff --git a/setup.py b/setup.py
diff --git a/photosort/__init__.py → src/photosort/__init__.py b/photosort/__init__.py → src/photosort/__init__.py
diff --git a/photosort/config.py → src/photosort/config.py b/photosort/config.py → src/photosort/config.py
diff --git a/photosort/exceptions.py → src/photosort/exceptions.py b/photosort/exceptions.py → src/photosort/exceptions.py
diff --git a/photosort/exif.py → src/photosort/exif.py b/photosort/exif.py → src/photosort/exif.py
diff --git a/photosort/media.py → src/photosort/media.py b/photosort/media.py → src/photosort/media.py
@@ -15,7 +15,7 @@
 import stat
 import sys
 
-from photosort import exif
+from . import exif
 
 
 class UnknownDatetime(Exception):

diff --git a/photosort/photodb.py → src/photosort/photodb.py b/photosort/photodb.py → src/photosort/photodb.py
@@ -1,6 +1,4 @@
 # -*- mode: python; coding: utf-8 -*-
-from __future__ import print_function
-
 __author__ = "Miguel Angel Ajo Pelayo"
 __email__ = "[email protected]"
 __copyright__ = "Copyright (C) 2013 Miguel Angel Ajo Pelayo"

diff --git a/photosort/photosort.py → src/photosort/photosort.py b/photosort/photosort.py → src/photosort/photosort.py
@@ -2,22 +2,23 @@
 
 __author__ = "Miguel Angel Ajo Pelayo"
 __email__ = "[email protected]"
-__copyright__ = "Copyright (C) 2013 Miguel Angel Ajo Pelayo"
+__copyright__ = "Copyright (C) Miguel Angel Ajo Pelayo"
 __license__ = "GPLv3"
 
 import argparse
+from importlib.metadata import version
 import logging
 import os
 import sys
 import time
 import traceback
 
-from photosort import config
-from photosort import exif
-from photosort import media
-from photosort import photodb
-from photosort import walk
-from photosort.version import VERSION
+
+from . import config
+from . import exif
+from . import media
+from . import photodb
+from . import walk
 
 
 class PhotoSort:
@@ -113,7 +114,7 @@ def monitor(self):
 
     @staticmethod
     def version():
-        print("photosort version %s" % VERSION)
+        print("photosort version %s" % version('photosort'))
 
 
 def main():

diff --git a/photosort/test/__init__.py → src/photosort/test/__init__.py b/photosort/test/__init__.py → src/photosort/test/__init__.py
diff --git a/photosort/test/data/.gitkeep → src/photosort/test/data/.gitkeep b/photosort/test/data/.gitkeep → src/photosort/test/data/.gitkeep
diff --git a/photosort/test/data/media1/img1.jpg → src/photosort/test/data/media1/img1.jpg b/photosort/test/data/media1/img1.jpg → src/photosort/test/data/media1/img1.jpg
diff --git a/photosort/test/data/media1/img1_dup.jpg → src/photosort/test/data/media1/img1_dup.jpg b/photosort/test/data/media1/img1_dup.jpg → src/photosort/test/data/media1/img1_dup.jpg
diff --git a/photosort/test/data/media2/BigBuckBunny.avi → ...otosort/test/data/media2/BigBuckBunny.avi b/photosort/test/data/media2/BigBuckBunny.avi → ...otosort/test/data/media2/BigBuckBunny.avi
diff --git a/photosort/test/data/media2/mov1.mp4 → src/photosort/test/data/media2/mov1.mp4 b/photosort/test/data/media2/mov1.mp4 → src/photosort/test/data/media2/mov1.mp4
diff --git a/photosort/test/data/media2/mov1_dup.mp4 → src/photosort/test/data/media2/mov1_dup.mp4 b/photosort/test/data/media2/mov1_dup.mp4 → src/photosort/test/data/media2/mov1_dup.mp4
diff --git a/photosort/test/data/media2/mov_exif.m4v → src/photosort/test/data/media2/mov_exif.m4v b/photosort/test/data/media2/mov_exif.m4v → src/photosort/test/data/media2/mov_exif.m4v
diff --git a/photosort/test/test.py → src/photosort/test/test.py b/photosort/test/test.py → src/photosort/test/test.py
diff --git a/photosort/test/testcases/__init__.py → src/photosort/test/testcases/__init__.py b/photosort/test/testcases/__init__.py → src/photosort/test/testcases/__init__.py
diff --git a/...test/testcases/test_001_walk_for_media.py → ...test/testcases/test_001_walk_for_media.py b/...test/testcases/test_001_walk_for_media.py → ...test/testcases/test_001_walk_for_media.py
diff --git a/...ort/test/testcases/test_002_exif_media.py → ...ort/test/testcases/test_002_exif_media.py b/...ort/test/testcases/test_002_exif_media.py → ...ort/test/testcases/test_002_exif_media.py
diff --git a/...t/test/testcases/test_003_noexif_media.py → ...t/test/testcases/test_003_noexif_media.py b/...t/test/testcases/test_003_noexif_media.py → ...t/test/testcases/test_003_noexif_media.py
diff --git a/photosort/walk.py → src/photosort/walk.py b/photosort/walk.py → src/photosort/walk.py
@@ -11,7 +11,7 @@
 import os
 import time
 
-from photosort import media
+from . import media
 
 
 class WalkForMedia:

diff --git a/uv.lock b/uv.lock