Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-23173: change W504 to W503 and fix the few flake8 warnings #5

Merged
merged 2 commits into from
Apr 27, 2020
Merged

DM-23173: change W504 to W503 and fix the few flake8 warnings #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4685bcd
Change W504 to W503 and fix flake8 warnings
r-owen Apr 27, 2020
82d558f
git hide _build.* files
r-owen Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
_build.*
.sconsign.dblite
config.log
.sconf_temp
Expand Down
8 changes: 4 additions & 4 deletions python/lsst/dax/apdb/apdbSchema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,17 +306,17 @@ def _makeTables(self, mysql_engine='InnoDB', oracle_tablespace=None, oracle_iot=
info2 = info.copy()
info2.update(oracle_iot=oracle_iot)
table = Table(self._prefix+'DiaObjectLast', self._metadata,
*(self._tableColumns('DiaObjectLast') +
self._tableIndices('DiaObjectLast', info)),
*(self._tableColumns('DiaObjectLast')
+ self._tableIndices('DiaObjectLast', info)),
mysql_engine=mysql_engine,
info=info2)
self.objects_last = table

# for all other tables use index definitions in schema
for table_name in ('DiaSource', 'SSObject', 'DiaForcedSource', 'DiaObject_To_Object_Match'):
table = Table(self._prefix+table_name, self._metadata,
*(self._tableColumns(table_name) +
self._tableIndices(table_name, info)),
*(self._tableColumns(table_name)
+ self._tableIndices(table_name, info)),
mysql_engine=mysql_engine,
info=info)
if table_name == 'DiaSource':
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[flake8]
max-line-length = 110
ignore = E133, E226, E228, N802, N803, N806, N812, N815, N816, W504
ignore = E133, E226, E228, N802, N803, N806, N812, N815, N816, W503
exclude =
bin,
doc,
Expand All @@ -11,4 +11,4 @@ exclude =

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