From 7333a54778e180cd8d50f4f44588872df5d5f9b5 Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Sun, 18 Dec 2022 09:26:03 -0500 Subject: [PATCH 1/4] Change dir structure to add a package root dir within src/ --- src/{ => datafilemerge}/__init__.py | 0 src/{ => datafilemerge}/cli.py | 0 src/{ => datafilemerge}/config.py | 0 src/{ => datafilemerge}/exceptions.py | 0 src/{ => datafilemerge}/file_location.py | 0 src/{ => datafilemerge}/file_types.py | 0 src/{ => datafilemerge}/json_merger.py | 0 src/{ => datafilemerge}/naming_conventions.py | 0 src/{ => datafilemerge}/reference_types.py | 0 src/{ => datafilemerge}/regex.py | 0 src/{ => datafilemerge}/version.py | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename src/{ => datafilemerge}/__init__.py (100%) rename src/{ => datafilemerge}/cli.py (100%) rename src/{ => datafilemerge}/config.py (100%) rename src/{ => datafilemerge}/exceptions.py (100%) rename src/{ => datafilemerge}/file_location.py (100%) rename src/{ => datafilemerge}/file_types.py (100%) rename src/{ => datafilemerge}/json_merger.py (100%) rename src/{ => datafilemerge}/naming_conventions.py (100%) rename src/{ => datafilemerge}/reference_types.py (100%) rename src/{ => datafilemerge}/regex.py (100%) rename src/{ => datafilemerge}/version.py (100%) diff --git a/src/__init__.py b/src/datafilemerge/__init__.py similarity index 100% rename from src/__init__.py rename to src/datafilemerge/__init__.py diff --git a/src/cli.py b/src/datafilemerge/cli.py similarity index 100% rename from src/cli.py rename to src/datafilemerge/cli.py diff --git a/src/config.py b/src/datafilemerge/config.py similarity index 100% rename from src/config.py rename to src/datafilemerge/config.py diff --git a/src/exceptions.py b/src/datafilemerge/exceptions.py similarity index 100% rename from src/exceptions.py rename to src/datafilemerge/exceptions.py diff --git a/src/file_location.py b/src/datafilemerge/file_location.py similarity index 100% rename from src/file_location.py rename to src/datafilemerge/file_location.py diff --git a/src/file_types.py b/src/datafilemerge/file_types.py similarity index 100% rename from src/file_types.py rename to src/datafilemerge/file_types.py diff --git a/src/json_merger.py b/src/datafilemerge/json_merger.py similarity index 100% rename from src/json_merger.py rename to src/datafilemerge/json_merger.py diff --git a/src/naming_conventions.py b/src/datafilemerge/naming_conventions.py similarity index 100% rename from src/naming_conventions.py rename to src/datafilemerge/naming_conventions.py diff --git a/src/reference_types.py b/src/datafilemerge/reference_types.py similarity index 100% rename from src/reference_types.py rename to src/datafilemerge/reference_types.py diff --git a/src/regex.py b/src/datafilemerge/regex.py similarity index 100% rename from src/regex.py rename to src/datafilemerge/regex.py diff --git a/src/version.py b/src/datafilemerge/version.py similarity index 100% rename from src/version.py rename to src/datafilemerge/version.py From 95f11ee4c2eb3faa3a04de01be4bcbb470971333 Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Sun, 18 Dec 2022 09:30:32 -0500 Subject: [PATCH 2/4] Update imports to match new dir structure --- src/datafilemerge/config.py | 10 +++++----- src/datafilemerge/file_location.py | 4 ++-- src/datafilemerge/naming_conventions.py | 2 +- src/datafilemerge/reference_types.py | 4 ++-- tests/test_config.py | 8 ++++---- tests/test_naming_convention.py | 2 +- tests/test_reference_type.py | 2 +- tests/test_regex.py | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/datafilemerge/config.py b/src/datafilemerge/config.py index 9fe30c9..6c4dab8 100644 --- a/src/datafilemerge/config.py +++ b/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 diff --git a/src/datafilemerge/file_location.py b/src/datafilemerge/file_location.py index 245877d..b2da367 100644 --- a/src/datafilemerge/file_location.py +++ b/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 diff --git a/src/datafilemerge/naming_conventions.py b/src/datafilemerge/naming_conventions.py index 3567f49..6b8ff2a 100644 --- a/src/datafilemerge/naming_conventions.py +++ b/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 diff --git a/src/datafilemerge/reference_types.py b/src/datafilemerge/reference_types.py index e989a02..1544534 100644 --- a/src/datafilemerge/reference_types.py +++ b/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 diff --git a/tests/test_config.py b/tests/test_config.py index 7eb89b7..211d8d1 100644 --- a/tests/test_config.py +++ b/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 src.datafilemerge.config import BuildConfig, DestinationFile, SourceFile +from src.datafilemerge.file_location import FileLocation, Substitution +from src.datafilemerge.file_types import JsonFileType +from src.datafilemerge.reference_types import ( ContentReferenceType, KeyReferenceType, LiteralReferenceType, diff --git a/tests/test_naming_convention.py b/tests/test_naming_convention.py index b5a8eea..f8b1d20 100644 --- a/tests/test_naming_convention.py +++ b/tests/test_naming_convention.py @@ -1,4 +1,4 @@ -from src.naming_conventions import ( +from src.datafilemerge.naming_conventions import ( ConversionStringParser, PascalCase, SnakeCase, diff --git a/tests/test_reference_type.py b/tests/test_reference_type.py index bd7e87c..c66fb4f 100644 --- a/tests/test_reference_type.py +++ b/tests/test_reference_type.py @@ -1,6 +1,6 @@ import pytest -from src.reference_types import ( +from src.datafilemerge.reference_types import ( ContentReferenceType, KeyReferenceType, LiteralReferenceType, diff --git a/tests/test_regex.py b/tests/test_regex.py index 0b1305f..5cf917e 100644 --- a/tests/test_regex.py +++ b/tests/test_regex.py @@ -1,6 +1,6 @@ import pytest -from src.regex import RegexExtractor +from src.datafilemerge.regex import RegexExtractor class TestRegexExtractor: From ace2dc3579b0d1bfb989c978250f8d8f226e77a5 Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Sun, 18 Dec 2022 09:36:28 -0500 Subject: [PATCH 3/4] Fix changed file paths in circleci --- .circleci/config.yml | 6 +++--- tests/test_config.py | 8 ++++---- tests/test_naming_convention.py | 2 +- tests/test_reference_type.py | 2 +- tests/test_regex.py | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9589c0d..1b77a9c 100644 --- a/.circleci/config.yml +++ b/.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 diff --git a/tests/test_config.py b/tests/test_config.py index 211d8d1..0000a1e 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1,9 +1,9 @@ from pathlib import Path -from src.datafilemerge.config import BuildConfig, DestinationFile, SourceFile -from src.datafilemerge.file_location import FileLocation, Substitution -from src.datafilemerge.file_types import JsonFileType -from src.datafilemerge.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, diff --git a/tests/test_naming_convention.py b/tests/test_naming_convention.py index f8b1d20..eb39a96 100644 --- a/tests/test_naming_convention.py +++ b/tests/test_naming_convention.py @@ -1,4 +1,4 @@ -from src.datafilemerge.naming_conventions import ( +from datafilemerge.naming_conventions import ( ConversionStringParser, PascalCase, SnakeCase, diff --git a/tests/test_reference_type.py b/tests/test_reference_type.py index c66fb4f..80e5dc3 100644 --- a/tests/test_reference_type.py +++ b/tests/test_reference_type.py @@ -1,6 +1,6 @@ import pytest -from src.datafilemerge.reference_types import ( +from datafilemerge.reference_types import ( ContentReferenceType, KeyReferenceType, LiteralReferenceType, diff --git a/tests/test_regex.py b/tests/test_regex.py index 5cf917e..411207d 100644 --- a/tests/test_regex.py +++ b/tests/test_regex.py @@ -1,6 +1,6 @@ import pytest -from src.datafilemerge.regex import RegexExtractor +from datafilemerge.regex import RegexExtractor class TestRegexExtractor: From 99eba8ffe2182cb1535a6e8a49384689e8691e05 Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Sun, 18 Dec 2022 09:37:17 -0500 Subject: [PATCH 4/4] Update setup.py --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index fa46a99..7f34957 100644 --- a/setup.py +++ b/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