Skip to content

Commit

Permalink
Merge pull request #75 from lsst/tickets/DM-28480
Browse files Browse the repository at this point in the history
DM-28480: Update github action to py3.8
  • Loading branch information
timj committed Jan 27, 2021
2 parents 066cc74 + b65dba0 commit 427c833
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
name: lint

on:
- push
- pull_request
push:
branches:
- master
pull_request:

jobs:
lint:
Expand All @@ -13,7 +15,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.8

- name: Install
run: pip install -r <(curl https://raw.githubusercontent.com/lsst/linting/master/requirements.txt)
Expand Down
4 changes: 2 additions & 2 deletions python/lsst/verify/bin/dispatchverify.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@ def __init__(self, args):
message = '--user or $SQUASH_USER configuration required'
raise RuntimeError(message)

self.api_password = (args.api_password or
os.getenv('SQUASH_password'))
self.api_password = (args.api_password
or os.getenv('SQUASH_password'))
if not self.test and self.api_password is None:
# If password hasn't been set, prompt for it.
self.api_password = getpass.getpass(prompt="SQuaSH password: ")
Expand Down
10 changes: 5 additions & 5 deletions python/lsst/verify/metric.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@ def deserialize(cls, name=None, description=None, unit=None,
return cls(name, **args)

def __eq__(self, other):
return ((self.name == other.name) and
(self.unit == other.unit) and
(self.tags == other.tags) and
(self.description == other.description) and
(self.reference == other.reference))
return ((self.name == other.name)
and (self.unit == other.unit)
and (self.tags == other.tags)
and (self.description == other.description)
and (self.reference == other.reference))

def __ne__(self, other):
return not self.__eq__(other)
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[flake8]
max-line-length = 79
ignore = E133, E226, E228, N802, N803, N806, N812, N815, N816, W504
ignore = E133, E226, E228, N802, N803, N806, N812, N815, N816, W503
exclude =
bin/*.py,
doc/*.py,
Expand All @@ -10,4 +10,4 @@ exclude =

[tool:pytest]
addopts = --flake8 --doctest-plus --doctest-ignore-import-errors
flake8-ignore = E133 E226 E228 N802 N803 N806 N812 N815 N816 W504
flake8-ignore = E133 E226 E228 N802 N803 N806 N812 N815 N816 W503

0 comments on commit 427c833

Please sign in to comment.