From 3b884d47d4200c1271ad1fcb0881878080bf756e Mon Sep 17 00:00:00 2001 From: Miro Mannino Date: Tue, 25 Feb 2025 01:09:02 +0400 Subject: [PATCH] Fixing pip issue while installing --- MANIFEST.in | 2 ++ pytest.ini | 2 ++ scripts/run-tests.sh | 1 - src/git_import_contributions/Committer.py | 2 +- .../ImporterFromRepository.py | 21 +++++++++++-------- .../ImporterFromStats.py | 10 ++++----- src/git_import_contributions/cli.py | 4 ++-- tests/basic.py | 2 +- tests/test_cli.py | 7 +++---- tests/test_cli_stats.py | 3 +-- tests/test_collapse_changes.py | 3 ++- tests/test_ignore_file_types.py | 2 +- tests/test_max_changes_per_file.py | 3 ++- tests/test_obfuscation.py | 2 +- 14 files changed, 35 insertions(+), 29 deletions(-) create mode 100644 MANIFEST.in create mode 100644 pytest.ini diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..b83444e --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ +# Include the README.md needed as README to describe the mock repo content +recursive-include src/git_import_contributions README.md diff --git a/pytest.ini b/pytest.ini new file mode 100644 index 0000000..fcccae1 --- /dev/null +++ b/pytest.ini @@ -0,0 +1,2 @@ +[pytest] +pythonpath = src diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh index 8768167..76fe93e 100755 --- a/scripts/run-tests.sh +++ b/scripts/run-tests.sh @@ -1,2 +1 @@ -export PYTHONPATH=".:$PYTHONPATH" pipenv run pytest diff --git a/src/git_import_contributions/Committer.py b/src/git_import_contributions/Committer.py index 678b93b..f4815bb 100644 --- a/src/git_import_contributions/Committer.py +++ b/src/git_import_contributions/Committer.py @@ -7,7 +7,7 @@ import git -from .commons import Author +from git_import_contributions.commons import Author class Committer: diff --git a/src/git_import_contributions/ImporterFromRepository.py b/src/git_import_contributions/ImporterFromRepository.py index b597e52..5ba928f 100644 --- a/src/git_import_contributions/ImporterFromRepository.py +++ b/src/git_import_contributions/ImporterFromRepository.py @@ -1,14 +1,14 @@ #!/usr/bin/python3 import pathlib +import random import time -from random import random -from .Committer import Committer -from .commons import extract_name_email -from .Content import Content -from .generators import apply_generator -from .Stats import Stats +from git_import_contributions.Committer import Committer +from git_import_contributions.commons import extract_name_email +from git_import_contributions.Content import Content +from git_import_contributions.generators import apply_generator +from git_import_contributions.Stats import Stats class ImporterFromRepository: @@ -104,7 +104,7 @@ def import_repository(self): committed_date = c.committed_date if self.commit_time_max_past > 0: - committed_date -= int(random() * self.commit_time_max_past) + committed_date -= int(random.random() * self.commit_time_max_past) print( " Commit date changed to: " + time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(c.committed_date)) @@ -127,14 +127,17 @@ def import_repository(self): max_past = self.changes_commits_max_time_backward if last_committed_date != 0: max_past = min(break_committed_date - last_committed_date, max_past) - break_committed_date -= int(random() * (max_past / 3) + (max_past / 3 * 2)) + break_committed_date -= int( + random.random() * (max_past / 3) + (max_past / 3 * 2) + ) if time.strftime("%Y-%m-%d", time.localtime(last_committed_date)) == time.strftime( "%Y-%m-%d", time.localtime(break_committed_date) ): commits_for_last_day += 1 if ( commits_for_last_day - > random() * (self.max_commits_per_day[1] - self.max_commits_per_day[0]) + > random.random() + * (self.max_commits_per_day[1] - self.max_commits_per_day[0]) + self.max_commits_per_day[0] ): print( diff --git a/src/git_import_contributions/ImporterFromStats.py b/src/git_import_contributions/ImporterFromStats.py index 2044861..e03572c 100644 --- a/src/git_import_contributions/ImporterFromStats.py +++ b/src/git_import_contributions/ImporterFromStats.py @@ -5,11 +5,11 @@ import git -from .Committer import Committer -from .commons import extract_name_email -from .Content import Content -from .generators import apply_generator -from .Stats import Stats +from git_import_contributions.Committer import Committer +from git_import_contributions.commons import extract_name_email +from git_import_contributions.Content import Content +from git_import_contributions.generators import apply_generator +from git_import_contributions.Stats import Stats DEFAULT_TIME_RANGE = (9, 18) DEFAULT_MAX_COMMITS_PER_DAY = 10 diff --git a/src/git_import_contributions/cli.py b/src/git_import_contributions/cli.py index ab8afc2..146b734 100644 --- a/src/git_import_contributions/cli.py +++ b/src/git_import_contributions/cli.py @@ -4,8 +4,8 @@ import git -from .ImporterFromRepository import ImporterFromRepository -from .ImporterFromStats import ImporterFromStats +from git_import_contributions.ImporterFromRepository import ImporterFromRepository +from git_import_contributions.ImporterFromStats import ImporterFromStats def handle_stats_action(args): diff --git a/tests/basic.py b/tests/basic.py index 8c2f4a2..f79f5da 100644 --- a/tests/basic.py +++ b/tests/basic.py @@ -2,7 +2,7 @@ import git -from src import * +from git_import_contributions.ImporterFromRepository import ImporterFromRepository repos_path = [ "/path/to/Project1", diff --git a/tests/test_cli.py b/tests/test_cli.py index 7f8fcb1..1029255 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -2,7 +2,6 @@ import subprocess import git -import pytest from .tests_commons import MOCK_REPO_PATH, REPOS_PATHS @@ -10,7 +9,7 @@ def test_cli_collapse_changes(): cli_command_collapsed = [ "python", - "src/cli.py", + "src/git_import_contributions/cli.py", "repo", "--repos", *REPOS_PATHS, @@ -24,7 +23,7 @@ def test_cli_collapse_changes(): cli_command_non_collapsed = [ "python", - "src/cli.py", + "src/git_import_contributions/cli.py", "repo", "--repos", *REPOS_PATHS, @@ -66,7 +65,7 @@ def test_cli_collapse_changes(): def test_cli_filter_by_author(): cli_command = [ "python", - "src/cli.py", + "src/git_import_contributions/cli.py", "repo", "--repos", *REPOS_PATHS, diff --git a/tests/test_cli_stats.py b/tests/test_cli_stats.py index f17beda..725945a 100644 --- a/tests/test_cli_stats.py +++ b/tests/test_cli_stats.py @@ -3,7 +3,6 @@ import subprocess import git -import pytest from .tests_commons import MOCK_REPO_PATH @@ -13,7 +12,7 @@ def test_cli_stats(): cli_command = [ "python", - "src/cli.py", + "src/git_import_contributions/cli.py", "stats", "--csv", "tests/stats_1.csv", diff --git a/tests/test_collapse_changes.py b/tests/test_collapse_changes.py index a986131..5ca73a5 100644 --- a/tests/test_collapse_changes.py +++ b/tests/test_collapse_changes.py @@ -4,7 +4,8 @@ import git import pytest -from .ImporterFromRepository import ImporterFromRepository +from git_import_contributions.ImporterFromRepository import ImporterFromRepository + from .tests_commons import MOCK_REPO_PATH, REPOS_PATHS diff --git a/tests/test_ignore_file_types.py b/tests/test_ignore_file_types.py index ebb3c24..60cddf4 100644 --- a/tests/test_ignore_file_types.py +++ b/tests/test_ignore_file_types.py @@ -1,8 +1,8 @@ import shutil import git -import pytest +from git_import_contributions.ImporterFromRepository import ImporterFromRepository from src import * from .tests_commons import MOCK_REPO_PATH, REPOS_PATHS diff --git a/tests/test_max_changes_per_file.py b/tests/test_max_changes_per_file.py index e3dcc0d..66c57a5 100644 --- a/tests/test_max_changes_per_file.py +++ b/tests/test_max_changes_per_file.py @@ -1,8 +1,9 @@ +import os import shutil import git -import pytest +from git_import_contributions.ImporterFromRepository import ImporterFromRepository from src import * from .tests_commons import MOCK_REPO_PATH, REPOS_PATHS, import_commits diff --git a/tests/test_obfuscation.py b/tests/test_obfuscation.py index 3d20b59..25f03b6 100644 --- a/tests/test_obfuscation.py +++ b/tests/test_obfuscation.py @@ -2,8 +2,8 @@ import sys import git -import pytest +from git_import_contributions.ImporterFromRepository import ImporterFromRepository from src import * from .tests_commons import MOCK_REPO_PATH, REPOS_PATHS, import_commits