← back to Exo
fix indent
ea9b04363f3697a1de00415b5ed48d420cbbf0a7 · 2024-11-25 13:25:29 +0400 · Alex Cheema
Files touched
M .circleci/config.ymlM extra/line_counter.py
Diff
commit ea9b04363f3697a1de00415b5ed48d420cbbf0a7
Author: Alex Cheema <alexcheema123@gmail.com>
Date: Mon Nov 25 13:25:29 2024 +0400
fix indent
---
.circleci/config.yml | 16 ++++++++--------
extra/line_counter.py | 46 +++++++++++++++++++++++-----------------------
2 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index c94c2e22..ab9d52b2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -274,7 +274,7 @@ jobs:
- image: cimg/python:3.10
steps:
- checkout
-
+
- run:
name: Setup git for PR comparison
command: |
@@ -283,18 +283,18 @@ jobs:
BASE_BRANCH=$(curl -s -H "Circle-Token: $CIRCLE_TOKEN" \
"https://circleci.com/api/v2/project/github/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pipeline/$CIRCLE_WORKFLOW_ID" \
| jq -r '.target_branch')
-
+
git clone -b $BASE_BRANCH --single-branch \
https://github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git \
base_branch
fi
-
+
- run:
name: Install dependencies
command: |
python -m pip install --upgrade pip
pip install tabulate
-
+
- run:
name: Run line count check
command: |
@@ -303,21 +303,21 @@ jobs:
else
python extra/line_counter.py .
fi
-
+
- store_artifacts:
path: line-count-snapshot.json
destination: line-count-snapshot.json
-
+
- store_artifacts:
path: line-count-diff.json
destination: line-count-diff.json
-
+
- run:
name: Create test results directory
command: |
mkdir -p test-results/line-count
cp line-count-*.json test-results/line-count/
-
+
- store_test_results:
path: test-results
diff --git a/extra/line_counter.py b/extra/line_counter.py
index 63d55c82..e5bf0428 100644
--- a/extra/line_counter.py
+++ b/extra/line_counter.py
@@ -22,42 +22,42 @@ def gen_stats(base_path="."):
for name in files:
if not name.endswith(".py"):
continue
-
+
filepath = os.path.join(path, name)
relfilepath = os.path.relpath(filepath, base_path).replace('\\', '/')
-
+
try:
with tokenize.open(filepath) as file_:
- tokens = [t for t in tokenize.generate_tokens(file_.readline)
+ tokens = [t for t in tokenize.generate_tokens(file_.readline)
if t.type in TOKEN_WHITELIST and not is_docstring(t)]
token_count = len(tokens)
- line_count = len(set([x for t in tokens
+ line_count = len(set([x for t in tokens
for x in range(t.start[0], t.end[0]+1)]))
if line_count > 0:
table.append([relfilepath, line_count, token_count/line_count])
except Exception as e:
print(f"Error processing {filepath}: {e}")
continue
-
+
return table
def gen_diff(table_old, table_new):
table = []
files_new = set([x[0] for x in table_new])
files_old = set([x[0] for x in table_old])
-
+
added = files_new - files_old
deleted = files_old - files_new
unchanged = files_new & files_old
-
+
for file in added:
file_stat = [stats for stats in table_new if file in stats][0]
table.append([file_stat[0], file_stat[1], file_stat[1], file_stat[2], file_stat[2]])
-
+
for file in deleted:
file_stat = [stats for stats in table_old if file in stats][0]
table.append([file_stat[0], 0, -file_stat[1], 0, -file_stat[2]])
-
+
for file in unchanged:
file_stat_old = [stats for stats in table_old if file in stats][0]
file_stat_new = [stats for stats in table_new if file in stats][0]
@@ -69,7 +69,7 @@ def gen_diff(table_old, table_new):
file_stat_new[2],
file_stat_new[2] - file_stat_old[2]
])
-
+
return table
def create_json_report(table, is_diff=False):
@@ -77,7 +77,7 @@ def create_json_report(table, is_diff=False):
commit_sha = os.environ.get('CIRCLE_SHA1', 'unknown')
branch = os.environ.get('CIRCLE_BRANCH', 'unknown')
pr_number = os.environ.get('CIRCLE_PR_NUMBER', '')
-
+
if is_diff:
files = [{
'name': row[0],
@@ -86,7 +86,7 @@ def create_json_report(table, is_diff=False):
'current_tokens_per_line': row[3],
'tokens_per_line_diff': row[4]
} for row in table]
-
+
report = {
'type': 'diff',
'timestamp': timestamp,
@@ -103,7 +103,7 @@ def create_json_report(table, is_diff=False):
'lines': row[1],
'tokens_per_line': row[2]
} for row in table]
-
+
report = {
'type': 'snapshot',
'timestamp': timestamp,
@@ -113,7 +113,7 @@ def create_json_report(table, is_diff=False):
'total_lines': sum(row[1] for row in table),
'total_files': len(files)
}
-
+
return report
def display_diff(diff):
@@ -122,16 +122,16 @@ def display_diff(diff):
def format_table(rows, headers, floatfmt):
if not rows:
return ""
-
+
# Add headers as first row
all_rows = [headers] + rows
-
+
# Calculate column widths
col_widths = []
for col in range(len(headers)):
col_width = max(len(str(row[col])) for row in all_rows)
col_widths.append(col_width)
-
+
# Format rows
output = []
for row_idx, row in enumerate(all_rows):
@@ -153,14 +153,14 @@ def format_table(rows, headers, floatfmt):
value = f"{value:d}"
formatted_cols.append(str(value).ljust(width))
output.append(" ".join(formatted_cols))
-
+
# Add separator line after headers
if row_idx == 0:
separator = []
for width in col_widths:
separator.append("-" * width)
output.append(" ".join(separator))
-
+
return "\n".join(output)
if __name__ == "__main__":
@@ -168,7 +168,7 @@ if __name__ == "__main__":
# Comparing two directories
headers = ["File", "Lines", "Diff", "Tokens/Line", "Diff"]
table = gen_diff(gen_stats(sys.argv[1]), gen_stats(sys.argv[2]))
-
+
if table:
# Print table output
print("### Code Changes in 'exo' Directory")
@@ -181,7 +181,7 @@ if __name__ == "__main__":
total_changes = sum(row[2] for row in table)
print(f"\nTotal line changes: {display_diff(total_changes)}")
print("```")
-
+
# Generate JSON report
report = create_json_report(table, is_diff=True)
with open('line-count-diff.json', 'w') as f:
@@ -190,7 +190,7 @@ if __name__ == "__main__":
# Single directory analysis
headers = ["File", "Lines", "Tokens/Line"]
table = gen_stats(sys.argv[1] if len(sys.argv) > 1 else ".")
-
+
if table:
# Print table output
print("### Code Statistics for 'exo' Directory")
@@ -203,7 +203,7 @@ if __name__ == "__main__":
total_lines = sum(row[1] for row in table)
print(f"\nTotal lines: {total_lines}")
print("```")
-
+
# Generate JSON report
report = create_json_report(table, is_diff=False)
with open('line-count-snapshot.json', 'w') as f:
← c0646be2 count lines of code
·
back to Exo
·
include total line count in dashboard e3dc3b20 →