diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 009dbf4..8a86d2e 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -53,7 +53,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9, '3.10', '3.11'] runs-on: ${{ matrix.os }} steps: diff --git a/inicheck/changes.py b/inicheck/changes.py index 98f4e22..64d130d 100644 --- a/inicheck/changes.py +++ b/inicheck/changes.py @@ -240,8 +240,9 @@ def apply_changes(self, ucfg, potentials, changes): del cfg[s_o][i_o] # look to remove a whole section - if len(cfg[s_o].keys() - ) == 0 and s_o not in ucfg.mcfg.cfg.keys(): - del(cfg[s_o]) + if len( + cfg[s_o].keys() + ) == 0 and s_o not in ucfg.mcfg.cfg.keys(): + del cfg[s_o] return cfg diff --git a/requirements.txt b/requirements.txt index c60a9b1..7989252 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ -dateparser==0.7.2 +dateparser>=0.7.2,<1.2.0 requests>=2.0.0 +regex>=2021.11.10,<=2023.10.3 setuptools_scm<4.2 diff --git a/setup.py b/setup.py index 2dec080..efe357d 100644 --- a/setup.py +++ b/setup.py @@ -1,61 +1,62 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -"""The setup script.""" - -from setuptools import setup, find_packages - -with open('README.rst') as readme_file: - readme = readme_file.read() - -with open('docs/history.rst') as history_file: - history = history_file.read() - -with open('requirements.txt') as req_file: - requirements = req_file.read() - -setup( - name='inicheck', - description="inicheck is an high level configuration file checker " - "enabling developers tight control over their users " - "configuration files", - long_description=readme + '\n\n' + history, - long_description_content_type='text/x-rst', - author="USDA ARS NWRC", - author_email='snow@ars.usda.gov', - url='https://github.com/USDA-ARS-NWRC/inicheck', - project_urls={ - 'Documentation': 'https://inicheck.readthedocs.io', - }, - packages=find_packages(include=['inicheck']), - entry_points={ - 'console_scripts': [ - 'inicheck=inicheck.cli:main', - 'inidiff=inicheck.cli:inidiff', - 'inimake=inicheck.cli:inimake', - 'inichangefind=inicheck.cli:detect_file_changes' - ] - }, - include_package_data=True, - install_requires=requirements, - license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication", - zip_safe=False, - keywords='inicheck', - classifiers=[ - 'Development Status :: 4 - Beta', - 'Intended Audience :: Developers', - 'License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication', - 'Natural Language :: English', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9' - ], - use_scm_version={ - 'local_scheme': 'node-and-date', - }, - setup_requires=[ - 'setuptools_scm' - ], - test_suite='tests', -) +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +"""The setup script.""" + +from setuptools import setup, find_packages + +with open('README.rst') as readme_file: + readme = readme_file.read() + +with open('docs/history.rst') as history_file: + history = history_file.read() + +with open('requirements.txt') as req_file: + requirements = req_file.read() + +setup( + name='inicheck', + description="inicheck is an high level configuration file checker " + "enabling developers tight control over their users " + "configuration files", + long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', + author="USDA ARS NWRC", + author_email='snow@ars.usda.gov', + url='https://github.com/USDA-ARS-NWRC/inicheck', + project_urls={ + 'Documentation': 'https://inicheck.readthedocs.io', + }, + packages=find_packages(include=['inicheck']), + entry_points={ + 'console_scripts': [ + 'inicheck=inicheck.cli:main', + 'inidiff=inicheck.cli:inidiff', + 'inimake=inicheck.cli:inimake', + 'inichangefind=inicheck.cli:detect_file_changes' + ] + }, + include_package_data=True, + install_requires=requirements, + license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication", + zip_safe=False, + keywords='inicheck', + classifiers=[ + 'Development Status :: 4 - Beta', + 'Intended Audience :: Developers', + 'License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication', + 'Natural Language :: English', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10' + 'Programming Language :: Python :: 3.11' + ], + use_scm_version={ + 'local_scheme': 'node-and-date', + }, + setup_requires=[ + 'setuptools_scm' + ], + test_suite='tests', +)