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

Fix file_defs.py for PEP8 #217

Merged
merged 1 commit into from
Feb 10, 2021
Merged

Fix file_defs.py for PEP8 #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/flake8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ jobs:
pip install flake8
# Note: only check files in Ska.engarchive package. Many other files in
# the repo are not maintained as PEP8 compliant.
flake8 Ska --count --exclude=Ska/engarchive/file_defs.py --ignore=W503,W504,F541 --max-line-length=100 --show-source --statistics
flake8 Ska --count --ignore=W503,W504,F541 --max-line-length=100 --show-source --statistics
34 changes: 17 additions & 17 deletions Ska/engarchive/file_defs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@
msid_root = os.path.join(SKA, 'data', 'eng_archive')
msid_roots = [msid_root]

msid_files = {'filetypes': 'filetypes.dat',
msid_files = {'filetypes': 'filetypes.dat',
'msid_bad_times': 'msid_bad_times.dat',
'contentdir': 'data/{{ft.content}}/',
'headers': 'data/{{ft.content}}/headers.pickle',
'archfiles': 'data/{{ft.content}}/archfiles.db3',
'colnames': 'data/{{ft.content}}/colnames.pickle',
'contentdir': 'data/{{ft.content}}/',
'headers': 'data/{{ft.content}}/headers.pickle',
'archfiles': 'data/{{ft.content}}/archfiles.db3',
'colnames': 'data/{{ft.content}}/colnames.pickle',
'colnames_all': 'data/{{ft.content}}/colnames_all.pickle',
'msid': 'data/{{ft.content}}/{{ft.msid | upper}}.h5',
'data': 'data/{{ft.content}}/{{ft.msid | upper}}.h5',
'statsdir': 'data/{{ft.content}}/{{ft.interval}}/',
'stats': 'data/{{ft.content}}/{{ft.interval}}/{{ft.msid | upper}}.h5',
'msid': 'data/{{ft.content}}/{{ft.msid | upper}}.h5',
'data': 'data/{{ft.content}}/{{ft.msid | upper}}.h5',
'statsdir': 'data/{{ft.content}}/{{ft.interval}}/',
'stats': 'data/{{ft.content}}/{{ft.interval}}/{{ft.msid | upper}}.h5',
'last_date_id': 'data/{{ft.content}}/{{ft.interval}}/last_date_id',
}

Expand All @@ -41,19 +41,19 @@
arch_root = '/data/cosmos2/eng_archive'
arch_files = {'stagedir': 'stage/{{ft.content}}/',
'rootdir': '',
'archrootdir': 'data/{{ft.content}}/arch/',
'archdir': 'data/{{ft.content}}/arch/{{ft.year}}/{{ft.doy}}/',
'archfile': 'data/{{ft.content}}/arch/{{ft.year}}/{{ft.doy}}/{{ft.basename}}',
'archrootdir': 'data/{{ft.content}}/arch/',
'archdir': 'data/{{ft.content}}/arch/{{ft.year}}/{{ft.doy}}/',
'archfile': 'data/{{ft.content}}/arch/{{ft.year}}/{{ft.doy}}/{{ft.basename}}',
}

# Files within the sync repo (for maintaining client archive)
sync_files = {'index': 'sync/{{ft.content}}/index.ecsv',
sync_files = {'index': 'sync/{{ft.content}}/index.ecsv',
'msid_contents': 'sync/msid_contents.pkl.gz',
'last_rows': 'sync/{{ft.content}}/last_rows_{{ft.interval}}.pkl',
'data_dir': 'sync/{{ft.content}}/{{ft.date_id}}',
'data': 'sync/{{ft.content}}/{{ft.date_id}}/{{ft.interval}}.pkl.gz',
'last_rows': 'sync/{{ft.content}}/last_rows_{{ft.interval}}.pkl',
'data_dir': 'sync/{{ft.content}}/{{ft.date_id}}',
'data': 'sync/{{ft.content}}/{{ft.date_id}}/{{ft.interval}}.pkl.gz',
}

# Used when originally creating database.
orig_arch_root = '/data/cosmos2/tlm'
orig_arch_files = {'contentdir': '{{ft.content}}/'}
orig_arch_files = {'contentdir': '{{ft.content}}/'}