Линтер, тесты, сабмодули и многое другое #54
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| #For all | ||
| EMPTY_FIELD = 'Empty field' | ||
| TIMEDELTA = 0.05 | ||
| TIMEZONE = 'Europe/Moscow' | ||
|
|
||
| #Fieldnames | ||
| REPO_NAME = 'repository name' | ||
| AUTHOR_NAME = 'author name' | ||
| AUTHOR_LOGIN = 'author login' | ||
| AUTHOR_EMAIL = 'author email' | ||
| DATE_AND_TIME = 'date and time' | ||
| CHANGED_FILES = 'changed files' | ||
| COMMIT_ID = 'commit id' | ||
| BRANCH = 'branch' | ||
| ADDED_LINES = 'added lines' | ||
| DELETED_LINES = 'deleted lines' | ||
| TITLE = 'title' | ||
| ID = 'id' | ||
| STATE = 'state' | ||
| COMMIT_INTO = 'commit into' | ||
| COMMIT_FROM = 'commit from' | ||
| CREATED_AT = 'created at' | ||
| CREATOR_NAME = 'creator name' | ||
| CREATOR_LOGIN = 'creator login' | ||
| CREATOR_EMAIL = 'creator email' | ||
| COMMENT_BODY = 'comment body' | ||
| COMMENT_CREATED_AT = 'comment created at' | ||
| COMMENT_AUTHOR_NAME = 'comment author name' | ||
| COMMENT_AUTHOR_LOGIN = 'comment author login' | ||
| COMMENT_AUTHOR_EMAIL = 'comment author email' | ||
| MERGER_NAME = 'merger name' | ||
| MERGER_LOGIN = 'merger login' | ||
| MERGER_EMAIL = 'merger email' | ||
| SOURCE_BRANCH = 'source branch' | ||
| TARGET_BRANCH = 'target branch' | ||
| ASSIGNEE_STORY = 'assignee story' | ||
| RELATED_ISSUES = 'related issues' | ||
| LABELS = 'labels' | ||
| MILESTONE = 'milestone' | ||
| NUMBER = 'number' | ||
| TASK = 'task' | ||
| CLOSER_NAME = 'closer name' | ||
| CLOSER_LOGIN = 'closer login' | ||
| CLOSER_EMAIL = 'closer email' | ||
| CLOSED_AT = 'closed at' | ||
| CONNECTED_PULL_REQUESTS = 'connected pull requests' | ||
| INVITED_LOGIN = 'invited login' | ||
| INVITE_CREATION_DATE = 'invite creation date' | ||
| INVITATION_URL = 'invitation url' | ||
| PAGE = 'page' | ||
| ACTION = 'action' | ||
| REVISION_ID = 'revision id' | ||
|
|
||
| #For commits | ||
| FORKED_REPO = False | ||
| ORIG_REPO_COMMITS = [] | ||
| COMMIT_FIELDNAMES = (REPO_NAME, AUTHOR_NAME, AUTHOR_LOGIN, AUTHOR_EMAIL, DATE_AND_TIME, CHANGED_FILES, COMMIT_ID, BRANCH, ADDED_LINES, DELETED_LINES) | ||
|
|
||
| #For pull requests | ||
| PULL_REQUEST_FIELDNAMES = (REPO_NAME, TITLE, ID, STATE, COMMIT_INTO, COMMIT_FROM, CREATED_AT, CREATOR_NAME, CREATOR_LOGIN, CREATOR_EMAIL, | ||
| CHANGED_FILES, COMMENT_BODY, COMMENT_CREATED_AT, COMMENT_AUTHOR_NAME, COMMENT_AUTHOR_LOGIN, COMMENT_AUTHOR_EMAIL, | ||
| MERGER_NAME, MERGER_LOGIN, MERGER_EMAIL, SOURCE_BRANCH, TARGET_BRANCH, ASSIGNEE_STORY, RELATED_ISSUES, LABELS, MILESTONE) | ||
|
|
||
| #For issues | ||
| ISSUE_FIELDNAMES = (REPO_NAME, NUMBER, TITLE, STATE, TASK, CREATED_AT, CREATOR_NAME, CREATOR_LOGIN, CREATOR_EMAIL, CLOSER_NAME, CLOSER_LOGIN, | ||
| CLOSER_EMAIL, CLOSED_AT, COMMENT_BODY, COMMENT_CREATED_AT, COMMENT_AUTHOR_NAME, COMMENT_AUTHOR_LOGIN, COMMENT_AUTHOR_EMAIL, | ||
| ASSIGNEE_STORY, CONNECTED_PULL_REQUESTS, LABELS, MILESTONE) | ||
|
|
||
| #For invites | ||
| INVITE_FIELDNAMES = (REPO_NAME, INVITED_LOGIN, INVITE_CREATION_DATE, INVITATION_URL) | ||
|
|
||
| #For wikis | ||
| EMPTY_TREE_SHA = "4b825dc642cb6eb9a060e54bf8d69288fbee4904" #Хэш пустого дерева для сравнения с первым коммитом. Способ был найден здесь: https://stackoverflow.com/questions/33916648/get-the-diff-details-of-first-commit-in-gitpython | ||
| ACTIVITY = {"A": "Страница добавлена", "M": "Страница изменена", "D": "Страница удалена", "R": "Страница переименована"} | ||
| ENG_ACTIVITY = {"A" : "Page added", "M" : "Page modified", "D" : "Page deleted", "R": "Page renamed"} | ||
| WIKI_FIELDNAMES = (REPO_NAME, AUTHOR_NAME, AUTHOR_LOGIN, DATE_AND_TIME, PAGE, ACTION, REVISION_ID, ADDED_LINES, DELETED_LINES) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,18 +5,11 @@ | |
| from time import sleep | ||
| from git_logger import get_assignee_story | ||
| from github import Github, Repository, GithubException, PullRequest | ||
| from constants import EMPTY_FIELD, TIMEDELTA, TIMEZONE, ISSUE_FIELDNAMES, COMMENT_BODY, COMMENT_CREATED_AT, COMMENT_AUTHOR_NAME, COMMENT_AUTHOR_LOGIN, COMMENT_AUTHOR_EMAIL | ||
|
|
||
| def log_issue_to_csv(info, csv_name): | ||
| with open(csv_name, 'a', newline='') as file: | ||
| writer = csv.DictWriter(file, fieldnames=ISSUE_FIELDNAMES) | ||
| writer.writerow(info) | ||
|
|
||
|
|
||
|
|
@@ -93,36 +86,21 @@ def log_repository_issues(repository: Repository, csv_name, token, start, finish | |
| continue | ||
| nvl = lambda val: val or EMPTY_FIELD | ||
| get_info = lambda obj, attr: EMPTY_FIELD if obj is None else getattr(obj, attr) | ||
| issue_data = [repository.full_name, issue.number, issue.title, issue.state, issue.body, issue.created_at, get_info(issue.user, 'name'), | ||
| get_info(issue.user, 'login'), get_info(issue.user, 'email'), nvl(issue.closed_at), get_info(issue.closed_by, 'name'), | ||
| get_info(issue.closed_by, 'login'), get_info(issue.closed_by, 'email'), EMPTY_FIELD, EMPTY_FIELD, EMPTY_FIELD, EMPTY_FIELD, | ||
| EMPTY_FIELD, get_assignee_story(issue), EMPTY_FIELD if issue.number is None else get_connected_pulls(issue.number, repository.owner, repository.name, token), | ||
| EMPTY_FIELD if issue.labels is None else ';'.join([label.name for label in issue.labels]), get_info(issue.milestone, 'title')] | ||
| info_tmp = dict(zip(ISSUE_FIELDNAMES, issue_data)) | ||
|
Comment on lines
+90
to
+95
There was a problem hiding this comment. давайте попробуем посмотреть в сторону датаклассов There was a problem hiding this comment. from dataclasses import dataclass, asdict
@dataclass(kw_only=True, frozen=True)
class A:
field1: str
field2: str
a = A(field1='qwe', field2='asd')
print(a, asdict(a))
-->
A(field1='qwe', field2='asd') {'field1': 'qwe', 'field2': 'asd'}There was a problem hiding this comment. Понял, сделаю так |
||
|
|
||
| if issue.get_comments().totalCount > 0: | ||
| for comment in issue.get_comments(): | ||
| info = info_tmp | ||
| info[COMMENT_BODY] = comment.body | ||
| info[COMMENT_CREATED_AT] = comment.created_at | ||
| info[COMMENT_AUTHOR_NAME] = comment.user.name | ||
| info[COMMENT_AUTHOR_LOGIN] = comment.user.login | ||
| info[COMMENT_AUTHOR_EMAIL] = nvl(comment.user.email) | ||
| log_issue_to_csv(info, csv_name) | ||
| log_issue_to_stdout(info) | ||
| else: | ||
|
|
@@ -134,7 +112,7 @@ def log_repository_issues(repository: Repository, csv_name, token, start, finish | |
| def log_issues(client: Github, working_repo, csv_name, token, start, finish, fork_flag): | ||
| with open(csv_name, 'w', newline='') as file: | ||
| writer = csv.writer(file) | ||
| writer.writerow(ISSUE_FIELDNAMES) | ||
|
|
||
| for repo in working_repo: | ||
| try: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
капсом == константа, а мы в нее что-то добавляем, а потом чистим?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
получения списка репо я планировал переделать, в git_logger'е сделаю такую функцию, чтобы возвращала словарь с ключами в виде репо, а значениями в виде списка форков
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
А, это не то, в общем, исправлю)