Skip to content

Commit

Permalink
add flake8 job
Browse files Browse the repository at this point in the history
  • Loading branch information
braver committed Jun 11, 2023
2 parents 940276c + 6ec296c commit 7d35309
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 13 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Lint

on: [push]

jobs:
flake8:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: 3.9
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8
- name: Analysing the code with flake8
run: |
flake8
16 changes: 8 additions & 8 deletions lib/rgba.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def alpha_channel(alpha):
return int(alpha, 16) if alpha else 0xFF

m = self.color_pattern.match(s)
assert(m is not None)
assert (m is not None)
if m.group(1):
return int(s[1:3], 16), int(s[3:5], 16), int(s[5:7], 16), alpha_channel(m.group(2))
else:
Expand Down Expand Up @@ -96,10 +96,10 @@ def get_luminance(self):
return clamp(round_int(0.299 * self.r + 0.587 * self.g + 0.114 * self.b), 0, 255)

def get_true_luminance(self):
"""Get true liminance."""
"""Get true luminance."""

l = self.tohls()[1]
return clamp(round_int(l * 255.0), 0, 255)
lum = self.tohls()[1]
return clamp(round_int(lum * 255.0), 0, 255)

def alpha(self, factor):
"""Adjust alpha."""
Expand All @@ -125,8 +125,8 @@ def luminance(self, factor):
"""Get true luminance."""

h, l, s = self.tohls()
l = clamp(l + factor - 1.0, 0.0, 1.0)
self.fromhls(h, l, s)
lum = clamp(l + factor - 1.0, 0.0, 1.0)
self.fromhls(h, lum, s)

def tohsv(self):
"""Convert to HSV color format."""
Expand All @@ -146,10 +146,10 @@ def tohls(self):

return rgb_to_hls(self.r * RGB_CHANNEL_SCALE, self.g * RGB_CHANNEL_SCALE, self.b * RGB_CHANNEL_SCALE)

def fromhls(self, h, l, s):
def fromhls(self, h, lum, s):
"""Convert to RGB from HSL."""

r, g, b = hls_to_rgb(h, l, s)
r, g, b = hls_to_rgb(h, lum, s)
self.r = clamp(round_int(r * 255.0), 0, 255)
self.g = clamp(round_int(g * 255.0), 0, 255)
self.b = clamp(round_int(b * 255.0), 0, 255)
Expand Down
10 changes: 5 additions & 5 deletions lib/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
\b(?P<hwba>hwb\(\s*(?P<hwba_content>%(float)s\s*,\s*(?:%(percent)s\s*,\s*){2}(?:%(percent)s|%(float)s))\s*\)) |
\b(?P<gray>gray\(\s*(?P<gray_content>%(float)s|%(percent)s)\s*\)) |
\b(?P<graya>gray\(\s*(?P<graya_content>(?:%(float)s|%(percent)s)\s*,\s*(?:%(percent)s|%(float)s))\s*\)) |
\b(?P<pantone_code>((\d{2}-)?\d{3,5}\s|(black|blue|bright red|cool gray|dark blue|green|magenta|medium purple|orange|pink|process blue|purple|red|reflex blue|rhodamine red|rose gold|silver|violet|warm gray|warm red|yellow)\s(\d{1,5}\s)?|p\s\d{1,3}-\d{1,2}\s)[a-z]{1,3})\b |
\b(?P<pantone_code>((\d{2}-)?\d{3,5}\s|(black|blue|bright red|cool gray|dark blue|green|magenta|medium purple|orange|pink|process blue|purple|red|reflex blue|rhodamine red|rose gold|silver|violet|warm gray|warm red|yellow)\s(\d{1,5}\s)?|p\s\d{1,3}-\d{1,2}\s)[a-z]{1,3})\b | # noqa: E501
\b(?P<ral_code>RAL\s\d{4})\b
''' % COLOR_PARTS

Expand Down Expand Up @@ -248,8 +248,8 @@ def translate_color(m, use_hex_argb=False, decode=False):
hue = hue % 360.0
h = hue / 360.0
s = clamp(float(content[1].strip('%')), 0.0, 100.0) / 100.0
l = clamp(float(content[2].strip('%')), 0.0, 100.0) / 100.0
rgba.fromhls(h, l, s)
lum = clamp(float(content[2].strip('%')), 0.0, 100.0) / 100.0
rgba.fromhls(h, lum, s)
color = rgba.get_rgb()
elif m.group('hsla'):
if decode:
Expand All @@ -262,8 +262,8 @@ def translate_color(m, use_hex_argb=False, decode=False):
hue = hue % 360.0
h = hue / 360.0
s = clamp(float(content[1].strip('%')), 0.0, 100.0) / 100.0
l = clamp(float(content[2].strip('%')), 0.0, 100.0) / 100.0
rgba.fromhls(h, l, s)
lum = clamp(float(content[2].strip('%')), 0.0, 100.0) / 100.0
rgba.fromhls(h, lum, s)
color = rgba.get_rgb()
if content[3].endswith('%'):
alpha, alpha_dec = alpha_percent_normalize(content[3])
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[flake8]
max-line-length = 120

0 comments on commit 7d35309

Please sign in to comment.