Change dir structure to add a package root dir within src/

.circleci/config.yml

@@ -32,7 +32,7 @@ jobs:
           name: Build Windows CLI
           shell: cmd.exe
           command: |
-            curl -sSL https://install.python-poetry.org | python - && ..\AppData\Roaming\Python\Scripts\poetry install && ..\AppData\Roaming\Python\Scripts\poetry run pyinstaller src/cli.py --onefile --name dfm && 7z a ./cli-windows.zip ./dist/
+            curl -sSL https://install.python-poetry.org | python - && ..\AppData\Roaming\Python\Scripts\poetry install && ..\AppData\Roaming\Python\Scripts\poetry run pyinstaller src/datafilemerge/cli.py --onefile --name dfm && 7z a ./cli-windows.zip ./dist/
       - store_artifacts:
           path: cli-windows.zip
   create-cli-linux:
@@ -45,7 +45,7 @@ jobs:
       - run:
           name: Create CLI
           command: |
-            poetry run pyinstaller src/cli.py --onefile --name dfm
+            poetry run pyinstaller src/datafilemerge/cli.py --onefile --name dfm
             zip -r cli-linux.zip dist/dfm 
       - store_artifacts:
           path: cli-linux.zip
@@ -61,7 +61,7 @@ jobs:
             brew install python@3.11
             curl -sSL https://install.python-poetry.org | python3 -
             $HOME/.local/bin/poetry install
-            $HOME/.local/bin/poetry run pyinstaller src/cli.py --onefile --name dfm
+            $HOME/.local/bin/poetry run pyinstaller src/datafilemerge/cli.py --onefile --name dfm
             zip -r cli-mac.zip dist/dfm 
       - store_artifacts:
           path: cli-mac.zip

setup.py

@@ -2,7 +2,6 @@
 from pathlib import Path
 
 from setuptools import find_packages, setup
-
 from src.version import __version__
 
 this_directory = Path(__file__).parent

src/config.py → src/datafilemerge/config.py

@@ -4,11 +4,11 @@
 
 from jsonpath_ng import parse
 
-from src.file_location import FileLocation, Substitution
-from src.file_types import JsonFileType
-from src.json_merger import JsonMergerFactory
-from src.reference_types import ReferenceTypeFactory
-from src.regex import RegexExtractor
+from datafilemerge.file_location import FileLocation, Substitution
+from datafilemerge.file_types import JsonFileType
+from datafilemerge.json_merger import JsonMergerFactory
+from datafilemerge.reference_types import ReferenceTypeFactory
+from datafilemerge.regex import RegexExtractor
 
 
 @dataclass

src/file_location.py → src/datafilemerge/file_location.py

@@ -2,8 +2,8 @@
 from functools import cached_property
 from pathlib import Path
 
-from src.reference_types import BaseReferenceType
-from src.regex import RegexExtractor
+from datafilemerge.reference_types import BaseReferenceType
+from datafilemerge.regex import RegexExtractor
 
 
 @dataclass

src/naming_conventions.py → src/datafilemerge/naming_conventions.py

@@ -2,7 +2,7 @@
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 
-from src.exceptions import NamingConventionError
+from datafilemerge.exceptions import NamingConventionError
 
 
 @dataclass

src/reference_types.py → src/datafilemerge/reference_types.py

@@ -3,8 +3,8 @@
 
 from jsonpath_ng import parse
 
-from src.exceptions import ReferenceTypeError
-from src.regex import RegexExtractor
+from datafilemerge.exceptions import ReferenceTypeError
+from datafilemerge.regex import RegexExtractor
 
 
 @dataclass

tests/test_config.py

@@ -1,9 +1,9 @@
 from pathlib import Path
 
-from src.config import BuildConfig, DestinationFile, SourceFile
-from src.file_location import FileLocation, Substitution
-from src.file_types import JsonFileType
-from src.reference_types import (
+from datafilemerge.config import BuildConfig, DestinationFile, SourceFile
+from datafilemerge.file_location import FileLocation, Substitution
+from datafilemerge.file_types import JsonFileType
+from datafilemerge.reference_types import (
     ContentReferenceType,
     KeyReferenceType,
     LiteralReferenceType,

tests/test_naming_convention.py

@@ -1,4 +1,4 @@
-from src.naming_conventions import (
+from datafilemerge.naming_conventions import (
     ConversionStringParser,
     PascalCase,
     SnakeCase,

tests/test_reference_type.py

@@ -1,6 +1,6 @@
 import pytest
 
-from src.reference_types import (
+from datafilemerge.reference_types import (
     ContentReferenceType,
     KeyReferenceType,
     LiteralReferenceType,

tests/test_regex.py

@@ -1,6 +1,6 @@
 import pytest
 
-from src.regex import RegexExtractor
+from datafilemerge.regex import RegexExtractor
 
 
 class TestRegexExtractor: