Compare commits
3 commits
main
...
scottwalla
Author | SHA1 | Date | |
---|---|---|---|
Scott Wallace | 9d579560af | ||
Scott Wallace | 4d1904b285 | ||
Scott Wallace | 9f86ea1f30 |
12
.editorconfig
Normal file
12
.editorconfig
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
# EditorConfig is awesome: https://EditorConfig.org
|
||||||
|
|
||||||
|
# top-most EditorConfig file
|
||||||
|
root = true
|
||||||
|
|
||||||
|
[*.py]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 4
|
||||||
|
end_of_line = lf
|
||||||
|
charset = utf-8
|
||||||
|
trim_trailing_whitespace = true
|
||||||
|
insert_final_newline = true
|
2
.github/workflows/python-package.yml
vendored
2
.github/workflows/python-package.yml
vendored
|
@ -15,7 +15,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
python-version: [3.6, 3.7, 3.8]
|
python-version: [3.6, 3.7, 3.8, 3.9]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
|
@ -30,13 +30,14 @@ class Config:
|
||||||
logging.debug('Parsing config')
|
logging.debug('Parsing config')
|
||||||
parsed = {}
|
parsed = {}
|
||||||
|
|
||||||
try:
|
if configfile is not None:
|
||||||
with open(configfile, 'r') as file:
|
try:
|
||||||
parsed = yaml.safe_load(file.read())
|
with open(configfile, 'r') as file:
|
||||||
except FileNotFoundError as error:
|
parsed = yaml.safe_load(file.read())
|
||||||
logging.warning('No config file found (%s)', error.filename)
|
except FileNotFoundError as error:
|
||||||
except TypeError:
|
logging.warning('No config file found (%s)', error.filename)
|
||||||
logging.warning('No config file provided.')
|
except TypeError:
|
||||||
|
logging.warning('No config file provided.')
|
||||||
|
|
||||||
# Iterate over the config defaults and check for environment variable
|
# Iterate over the config defaults and check for environment variable
|
||||||
# overrides, then check for any items in the config, otherwise
|
# overrides, then check for any items in the config, otherwise
|
||||||
|
|
Loading…
Reference in a new issue