Skip to content

Commit

Permalink
Merge pull request #204 from ComputerScienceHouse/dependabot/pip/pyli…
Browse files Browse the repository at this point in the history
…nt-3.2.7

Bump pylint from 2.13.9 to 3.2.7
  • Loading branch information
Sam-Cordry committed Sep 19, 2024
2 parents 585bddd + c8d8db7 commit e95b050
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 19 deletions.
9 changes: 1 addition & 8 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ disable =
duplicate-code,
no-member,
parse-error,
bad-continuation,
too-few-public-methods,
global-statement,
cyclic-import,
Expand All @@ -18,14 +17,11 @@ disable =

[REPORTS]
output-format = text
files-output = no
reports = no

[FORMAT]
max-line-length = 120
max-statement-lines = 75
single-line-if-stmt = no
no-space-check = trailing-comma,dict-separator
max-module-lines = 1000
indent-string = ' '

Expand Down Expand Up @@ -73,9 +69,6 @@ good-names=logger,id,ID
# Bad variable names which should always be refused, separated by a comma
bad-names=foo,bar,baz,toto,tutu,tata

# List of builtins function names that should not be used, separated by a comma
bad-functions=apply,input

[DESIGN]
max-args = 10
ignored-argument-names = _.*
Expand All @@ -89,4 +82,4 @@ min-public-methods = 2
max-public-methods = 20

[EXCEPTIONS]
overgeneral-exceptions = Exception
overgeneral-exceptions = builtins.Exception
6 changes: 3 additions & 3 deletions profiles/ldap.py
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ def ldap_search_members(query):

for uid in res:
try:
mem = (str(uid[1]).split('\'')[3])
mem = str(uid[1]).split('\'')[3]
ret.append(ldap_get_member(mem))
except IndexError:
continue
Expand All @@ -398,7 +398,7 @@ def ldap_get_year(year):

for uid in res:
try:
mem = (str(uid[1]).split('\'')[3])
mem = str(uid[1]).split('\'')[3]
ret.append(ldap_get_member(mem))
except IndexError:
continue
Expand Down Expand Up @@ -464,7 +464,7 @@ def get_gravatar(uid=None):

@lru_cache(maxsize=1024)
def proxy_image(url):
response = requests.get(url)
response = requests.get(url, timeout=10)
img = Image.open(BytesIO(response.content))
with BytesIO() as output:
img.save(output, format="png")
Expand Down
2 changes: 1 addition & 1 deletion profiles/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def wrapped_function(*args, **kwargs):
"uid": uid,
"user_obj": user_obj,
"member_info": get_member_info(uid),
"color": requests.get('https://themeswitcher.csh.rit.edu/api/colour').content,
"color": requests.get('https://themeswitcher.csh.rit.edu/api/colour', timeout=10).content,
"current_year": parse_account_year(str(datetime.datetime.now().strftime("%Y%m"))),
"rtp": ldap_is_rtp(user_obj)
}
Expand Down
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pip-tools~=6.6.2
PyMySQL==1.1.1
pyGravatar==0.0.6
git+https://github.com/maxcountryman/flask-uploads@master
pylint~=2.13.9
pylint~=3.2.7
Pillow==10.3.0
requests~=2.32.2
sentry-sdk[flask]~=1.5.12
Expand Down
10 changes: 4 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ alabaster==0.7.12
# via oic
alembic==1.7.7
# via flask-migrate
astroid==2.11.5
astroid==3.2.4
# via pylint
attrs==21.4.0
# via ddtrace
Expand Down Expand Up @@ -79,8 +79,6 @@ itsdangerous==1.1.0
# via flask
jinja2==2.11.3
# via flask
lazy-object-proxy==1.7.1
# via astroid
mako==1.2.2
# via
# alembic
Expand Down Expand Up @@ -126,7 +124,7 @@ pygravatar==0.0.6
# via -r requirements.in
pyjwkest==1.4.2
# via oic
pylint==2.13.9
pylint==3.2.7
# via -r requirements.in
pymysql==1.1.1
# via -r requirements.in
Expand Down Expand Up @@ -161,6 +159,8 @@ tomli==2.0.1
# via
# pep517
# pylint
tomlkit==0.13.2
# via pylint
typing-extensions==4.12.2
# via
# astroid
Expand All @@ -175,8 +175,6 @@ werkzeug==1.0.1
# flask
wheel==0.38.1
# via pip-tools
wrapt==1.14.1
# via astroid

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down

0 comments on commit e95b050

Please sign in to comment.