Commits (1)
......@@ -34,6 +34,10 @@ test:3.5:
test:3.6:
<<: *test_template
image: 'python:3.6'
test:3.7:
<<: *test_template
image: 'python:3.7'
coverage: '/^TOTAL.*?(\d+\%)$/'
artifacts:
paths:
......
......@@ -8,6 +8,7 @@ python:
- "3.4"
- "3.5"
- "3.6"
- "3.7"
install:
- "sudo add-apt-repository ppa:duggan/bats --yes"
......
......@@ -157,9 +157,10 @@ class SchulferienOrg(object):
# Expect only the last holiday to wrap into the next year.
if sh_order.index(holiday_name) == len(sh_order)-1:
if (str(year-1) in hol_def and hol_def[str(year-1)][-2] ==
day_before.month and hol_def[str(year-1)][-1] ==
day_before.day):
if (str(year-1) in hol_def
and hol_def[str(year-1)][-2] == day_before.month
and hol_def[str(year-1)][-1] == day_before.day):
hol_def[str(year-1)][-2] = month
hol_def[str(year-1)][-1] = day
continue
......
[flake8]
ignore = E402,E226
ignore = E402,E226,W503
max-line-length = 120
[pep8]
......
......@@ -57,6 +57,7 @@ setup(
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Office/Business :: Scheduling',
'Topic :: Text Processing :: Markup :: HTML',
......@@ -64,7 +65,7 @@ setup(
keywords='school holidays schulferien germany',
packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
install_requires=[
'ruamel.yaml<0.15',
'ruamel.yaml',
'pyaml',
'requests_cache',
'xmltodict',
......