Skip to content

Commit d834662

Browse files
authored
ci: code reformatted and linter tests added (#49)
Signed-off-by: ffyuanda <46557895+ffyuanda@users.noreply.github.com>
1 parent a22395e commit d834662

4 files changed

Lines changed: 242 additions & 209 deletions

File tree

.github/workflows/build.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,20 @@ jobs:
3838
COVERALLS_FLAG_NAME: ${{ matrix.os }} - ${{ matrix.python-version }}
3939
COVERALLS_PARALLEL: true
4040

41+
lint:
42+
name: Run Linters
43+
runs-on: ubuntu-latest
44+
steps:
45+
- name: Checkout
46+
uses: actions/checkout@v2
47+
48+
- name: Super-Linter
49+
uses: github/super-linter@v4.2.2
50+
env:
51+
VALIDATE_PYTHON_BLACK: true
52+
DEFAULT_BRANCH: master
53+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
54+
4155
coveralls:
4256
name: Indicate completion to coveralls.io
4357
needs: test

casbin_sqlalchemy_adapter/adapter.py

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,31 +160,33 @@ def remove_policies(self, sec, ptype, rules):
160160
query = query.filter(self._db_class.ptype == ptype)
161161
rules = zip(*rules)
162162
for i, rule in enumerate(rules):
163-
query = query.filter(or_(getattr(self._db_class, "v{}".format(i)) == v for v in rule))
163+
query = query.filter(
164+
or_(getattr(self._db_class, "v{}".format(i)) == v for v in rule)
165+
)
164166
query.delete()
165167

166168
def remove_filtered_policy(self, sec, ptype, field_index, *field_values):
167169
"""removes policy rules that match the filter from the storage.
168170
This is part of the Auto-Save feature.
169171
"""
170172
with self._session_scope() as session:
171-
query = (session
172-
.query(self._db_class)
173-
.filter(self._db_class.ptype == ptype))
173+
query = session.query(self._db_class).filter(self._db_class.ptype == ptype)
174174

175175
if not (0 <= field_index <= 5):
176176
return False
177177
if not (1 <= field_index + len(field_values) <= 6):
178178
return False
179179
for i, v in enumerate(field_values):
180-
if v != '':
180+
if v != "":
181181
v_value = getattr(self._db_class, "v{}".format(field_index + i))
182182
query = query.filter(v_value == v)
183183
r = query.delete()
184184

185185
return True if r > 0 else False
186186

187-
def update_policy(self, sec: str, ptype: str, old_rule: [str], new_rule: [str]) -> None:
187+
def update_policy(
188+
self, sec: str, ptype: str, old_rule: [str], new_rule: [str]
189+
) -> None:
188190
"""
189191
Update the old_rule with the new_rule in the database (storage).
190192
@@ -197,9 +199,7 @@ def update_policy(self, sec: str, ptype: str, old_rule: [str], new_rule: [str])
197199
"""
198200

199201
with self._session_scope() as session:
200-
query = (session
201-
.query(self._db_class)
202-
.filter(self._db_class.ptype == ptype))
202+
query = session.query(self._db_class).filter(self._db_class.ptype == ptype)
203203

204204
# locate the old rule
205205
for index, value in enumerate(old_rule):
@@ -217,7 +217,17 @@ def update_policy(self, sec: str, ptype: str, old_rule: [str], new_rule: [str])
217217
else:
218218
exec(f"old_rule_line.v{index} = None")
219219

220-
def update_policies(self, sec: str, ptype: str, old_rules: [[str], ], new_rules: [[str], ]) -> None:
220+
def update_policies(
221+
self,
222+
sec: str,
223+
ptype: str,
224+
old_rules: [
225+
[str],
226+
],
227+
new_rules: [
228+
[str],
229+
],
230+
) -> None:
221231
"""
222232
Update the old_rules with the new_rules in the database (storage).
223233

setup.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,16 @@
2121
long_description=long_description,
2222
long_description_content_type="text/markdown",
2323
url="https://github.com/pycasbin/sqlalchemy-adapter",
24-
keywords=["casbin", "SQLAlchemy", "casbin-adapter", "rbac", "access control", "abac", "acl", "permission"],
24+
keywords=[
25+
"casbin",
26+
"SQLAlchemy",
27+
"casbin-adapter",
28+
"rbac",
29+
"access control",
30+
"abac",
31+
"acl",
32+
"permission",
33+
],
2534
packages=find_packages(),
2635
install_requires=install_requires,
2736
python_requires=">=3.3",

0 commit comments

Comments
 (0)