diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000..d73b56e --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,12 @@ +version: 2 +build: + os: "ubuntu-20.04" + tools: + python: "3.8" +sphinx: + configuration: docs/conf.py +python: + install: + - requirements: docs/requirements.txt + - method: pip + path: . diff --git a/ChangeLog b/ChangeLog index 09dc3cc..6caf1d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,24 @@ CHANGES ======= -v2.0.1 ------- - +* rtd +* rtd +* rtd +* typo +* rtd updates +* remove old python versions +* try to fix docs theme +* try to fix docs theme +* ChangeLog * fix docs issue - -v2.0.0 ------- - * ChangeLog * v2.0 release (#11) +* update README +* v2.0 release candidate (fixes #9, fixes #9) (#10) +* update Pipfile.lock +* reformatted all code w/ black +* update deprecated import and reformat w/ black +* Bump bleach from 3.2.1 to 3.3.0 v1.0.4 ------ diff --git a/cfitall/providers/filesystem.py b/cfitall/providers/filesystem.py index 18e8096..a1695bd 100644 --- a/cfitall/providers/filesystem.py +++ b/cfitall/providers/filesystem.py @@ -21,7 +21,7 @@ class FilesystemProvider(ConfigProviderBase): prefix: str def __init__( - self, path: list[str], prefix: str, provider_name: str = "filesystem" + self, path: List[str], prefix: str, provider_name: str = "filesystem" ) -> None: """ FilesystemProvider attempts to read json or yaml configuration files diff --git a/cfitall/registry.py b/cfitall/registry.py index 2d154ed..e78bdfc 100644 --- a/cfitall/registry.py +++ b/cfitall/registry.py @@ -72,7 +72,7 @@ def all(self) -> Dict: return values @property - def config_keys(self) -> list[str]: + def config_keys(self) -> List[str]: """ Returns a list of currently used configuration keys as dotted paths, for use with the get() or set() methods. @@ -88,7 +88,7 @@ def dict(self) -> Dict: return self._merge_configs() @property - def env_vars(self) -> list[str]: + def env_vars(self) -> List[str]: """ Returns a list of environment variables known from config files and defaults """ diff --git a/docs/conf.py b/docs/conf.py index 4b5048f..93d3c34 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -15,9 +15,9 @@ import sphinx_rtd_theme -here = os.path.dirname(os.path.abspath(__file__)) -cfitall_path = os.path.join(here, "..", "cfitall") -sys.path.insert(0, cfitall_path) +# here = os.path.dirname(os.path.abspath(__file__)) +# cfitall_path = os.path.join(here, "..", "cfitall") +# sys.path.insert(0, cfitall_path) print(sys.path) diff --git a/setup.cfg b/setup.cfg index ee68012..0bc7dc1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,17 +4,19 @@ author = Chris Haumesser author-email = chris.haumesser@gmail.com summary = a configuration manager for python apps description-file = README.rst -requires-python = >=3.6 +requires-python = >=3.8 home-page = https://github.com/wryfi/cfitall classifier = License :: OSI Approved :: MIT License Natural Language :: English - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 [options] packages = find: +install_requires = + PyYAML <=6 [files] data_files =