Compare commits
No commits in common. "scottwallacesh/dev" and "main" have entirely different histories.
scottwalla
...
main
|
@ -1,12 +0,0 @@
|
|||
# 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
|
||||
strategy:
|
||||
matrix:
|
||||
python-version: [3.6, 3.7, 3.8, 3.9]
|
||||
python-version: [3.6, 3.7, 3.8]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
|
|
@ -30,14 +30,13 @@ class Config:
|
|||
logging.debug('Parsing config')
|
||||
parsed = {}
|
||||
|
||||
if configfile is not None:
|
||||
try:
|
||||
with open(configfile, 'r') as file:
|
||||
parsed = yaml.safe_load(file.read())
|
||||
except FileNotFoundError as error:
|
||||
logging.warning('No config file found (%s)', error.filename)
|
||||
except TypeError:
|
||||
logging.warning('No config file provided.')
|
||||
try:
|
||||
with open(configfile, 'r') as file:
|
||||
parsed = yaml.safe_load(file.read())
|
||||
except FileNotFoundError as error:
|
||||
logging.warning('No config file found (%s)', error.filename)
|
||||
except TypeError:
|
||||
logging.warning('No config file provided.')
|
||||
|
||||
# Iterate over the config defaults and check for environment variable
|
||||
# overrides, then check for any items in the config, otherwise
|
||||
|
|
Loading…
Reference in a new issue