Skip to content

Commit 42bfc73

Browse files
authored
Merge pull request #126 from sommersoft/patch_action_build_pylint
Add Patchfile For Actions; Ignore Archived Repos; Adjust Patch Result Counting
2 parents ebf9b9f + cbaeda5 commit 42bfc73

5 files changed

+31
-208
lines changed

adabot/circuitpython_library_patches.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,9 @@ def check_patches(repo, patches, flags, use_apply, dry_run):
171171
run_apply = True
172172
except sh.ErrorReturnCode_1 as Err:
173173
run_apply = False
174-
if b"error" not in Err.stderr:
175-
skipped += 1
174+
if (b"error" not in Err.stderr or
175+
b"patch does not apply" in Err.stderr):
176+
skipped += 1
176177
else:
177178
failed += 1
178179
error_str = str(Err.stderr, encoding="utf-8").replace("\n", " ")
@@ -195,6 +196,8 @@ def check_patches(repo, patches, flags, use_apply, dry_run):
195196
applied += 1
196197
else:
197198
failed += 1
199+
elif run_apply and dry_run:
200+
applied += 1
198201

199202
return [applied, skipped, failed]
200203

adabot/lib/common_funcs.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def list_repos(*, include_repos=None):
168168
"""
169169
repos = []
170170
result = github.get("/search/repositories",
171-
params={"q":"Adafruit_CircuitPython user:adafruit",
171+
params={"q":"Adafruit_CircuitPython user:adafruit archived:false",
172172
"per_page": 100,
173173
"sort": "updated",
174174
"order": "asc"}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From e1f4301b25e7e6f120b85c316cfbaf838fc1282e Mon Sep 17 00:00:00 2001
2+
From: sommersoft <[email protected]>
3+
Date: Wed, 8 Jan 2020 21:09:22 -0600
4+
Subject: [PATCH] update pylint examples directive
5+
6+
---
7+
.github/workflows/build.yml | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
11+
index 66ce4db..11ce574 100644
12+
--- a/.github/workflows/build.yml
13+
+++ b/.github/workflows/build.yml
14+
@@ -42,7 +42,7 @@ jobs:
15+
- name: PyLint
16+
run: |
17+
pylint $( find . -path './adafruit*.py' )
18+
- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace examples/*.py)
19+
+ ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace $( find . -path "./examples/*.py" ))
20+
- name: Build assets
21+
run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location .
22+
- name: Build docs
23+
--
24+
2.17.1
25+

patches/0001-updated-CoC.patch

-180
This file was deleted.

patches/ignore-the-board-module-imports-in-.pylintrc.patch

-25
This file was deleted.

0 commit comments

Comments
 (0)