diff --git a/.gitignore b/.gitignore index 2d90abb..9a1edef 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ htmlcov/ *.py[cod] .pytest_cache +venv* # emacs diff --git a/docs/requirements-rtd.txt b/docs/requirements-rtd.txt index 5c11d21..4a27c8f 100644 --- a/docs/requirements-rtd.txt +++ b/docs/requirements-rtd.txt @@ -4,17 +4,13 @@ atomicwrites==1.4.1 Babel==2.11.0 certifi==2022.12.7 charset-normalizer==3.0.1 -colorama==0.4.6 docutils==0.17.1 -filelock==3.9.0 idna==3.4 imagesize==1.4.1 Jinja2==3.1.2 livereload==2.6.3 MarkupSafe==2.1.1 more-itertools==9.0.0 -packaging==23.0 -pluggy==0.13.1 Pygments==2.14.0 pytz==2022.7.1 requests==2.28.2 diff --git a/glom/cli.py b/glom/cli.py index ceaced4..3f8f744 100644 --- a/glom/cli.py +++ b/glom/cli.py @@ -47,6 +47,9 @@ import glom from glom import Path, GlomError, Inspect +# TODO: --target-format scalar = unquoted if single value, error otherwise, maybe even don't output newline +# TODO: --default + def glom_cli(target, spec, indent, debug, inspect): """Command-line interface to the glom library, providing nested data access and data restructuring with the power of Python. diff --git a/requirements.in b/requirements.in new file mode 100644 index 0000000..781acd8 --- /dev/null +++ b/requirements.in @@ -0,0 +1,7 @@ +attrs>=19.2.0 +boltons>=20.2.0 +coverage<=7.2.7 # can unpin when dropping py37 +face>=20.1.1 +pytest>=6.2.5 +tox>=3.7.0 +PyYAML>=6.0.1 diff --git a/requirements.txt b/requirements.txt index f12f4f4..e8dfbde 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,29 @@ -attrs==19.2.0 -boltons>=20.2.0 -coverage -face<22.0.0 -pytest==4.6.11;python_version<'3.6' -pytest>=6.2.5;python_version >= '3.6' -tox==3.7.0 -PyYAML==6.0.1 +# +# This file is autogenerated by pip-compile with Python 3.7 +# by the following command: +# +# pip-compile --annotation-style=line --strip-extras requirements.in +# +attrs==23.1.0 # via -r requirements.in +boltons==23.1.1 # via -r requirements.in, face +cachetools==5.3.2 # via tox +chardet==5.2.0 # via tox +colorama==0.4.6 # via tox +coverage==7.2.7 # via -r requirements.in +distlib==0.3.8 # via virtualenv +exceptiongroup==1.2.0 # via pytest +face==22.0.0 # via -r requirements.in +filelock==3.12.2 # via tox, virtualenv +importlib-metadata==6.7.0 # via attrs, pluggy, pytest, tox, virtualenv +iniconfig==2.0.0 # via pytest +packaging==23.2 # via pyproject-api, pytest, tox +platformdirs==4.0.0 # via tox, virtualenv +pluggy==1.2.0 # via pytest, tox +pyproject-api==1.5.3 # via tox +pytest==7.4.3 # via -r requirements.in +pyyaml==6.0.1 # via -r requirements.in +tomli==2.0.1 # via pyproject-api, pytest, tox +tox==4.8.0 # via -r requirements.in +typing-extensions==4.7.1 # via importlib-metadata, platformdirs, tox +virtualenv==20.25.0 # via tox +zipp==3.15.0 # via importlib-metadata diff --git a/setup.py b/setup.py index 6dfcfb5..1f33a28 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ def import_path(module_name, path): 'Documentation': 'https://glom.readthedocs.io/en/latest/', }, packages=['glom', 'glom.test'], - install_requires=['boltons>=19.3.0', 'attrs', 'face==20.1.1'], + install_requires=['boltons>=19.3.0', 'attrs', 'face>=20.1.1'], extras_require={ 'toml': ['tomli; python_version<"3.11"'], 'yaml': ['PyYAML'],