click was listed twice in setup.cfg; patch the second line too. switch to MODPY_PYBUILD while there.
This commit is contained in:
parent
a4a8795284
commit
08e0fc7cd0
@ -15,8 +15,8 @@ MAINTAINER= Pavel Korovin <pvk@openbsd.org>
|
||||
PERMIT_PACKAGE= Yes
|
||||
|
||||
MODULES= lang/python
|
||||
MODPY_PI = Yes
|
||||
MODPY_SETUPTOOLS= Yes
|
||||
MODPY_PI= Yes
|
||||
MODPY_PYBUILD= setuptools
|
||||
|
||||
RUN_DEPENDS= devel/py-certifi${MODPY_FLAVOR}>=2019.9.11 \
|
||||
devel/py-click${MODPY_FLAVOR}>=7.0,<9 \
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: setup.cfg
|
||||
--- setup.cfg.orig
|
||||
+++ setup.cfg
|
||||
@@ -23,18 +23,18 @@ classifiers =
|
||||
@@ -23,22 +23,22 @@ classifiers =
|
||||
install_requires =
|
||||
voluptuous>=0.12.1
|
||||
elasticsearch>=7.12.0,<8.0.0
|
||||
@ -23,3 +23,8 @@ Index: setup.cfg
|
||||
requests>=2.25.1
|
||||
boto3>=boto3-1.17.57
|
||||
requests_aws4auth>=1.0.1
|
||||
- click>=7.0,<8.0
|
||||
+ click>=7.0,<9.0
|
||||
pyyaml>=5.4.1
|
||||
certifi>=2020.12.5
|
||||
six>=1.15.0
|
||||
|
@ -5,18 +5,31 @@ bin/es_repo_mgr
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/__init__.py
|
||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}/
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}config_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}config_utils.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}curator_cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}curator_cli.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}indexlist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}indexlist.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}logtools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}logtools.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}repomgrcli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}repomgrcli.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}singletons.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}singletons.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}snapshotlist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}snapshotlist.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/_version.py
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/actions.py
|
||||
@ -24,22 +37,39 @@ lib/python${MODPY_VERSION}/site-packages/curator/cli.py
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/__init__.py
|
||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}/
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}alias.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}alias.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}allocation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}allocation.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}close.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}close.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}delete.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}delete.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}forcemerge.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}forcemerge.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}freeze.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}freeze.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}object_class.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}object_class.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}open_indices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}open_indices.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}replicas.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}replicas.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}restore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}restore.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}rollover.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}rollover.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}show.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}show.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}shrink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}shrink.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}snapshot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}snapshot.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}unfreeze.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}unfreeze.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/alias.py
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/cli_singletons/allocation.py
|
||||
@ -62,11 +92,17 @@ lib/python${MODPY_VERSION}/site-packages/curator/curator_cli.py
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/__init__.py
|
||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/curator/defaults/${MODPY_PYCACHE}/
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/${MODPY_PYCACHE}client_defaults.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/${MODPY_PYCACHE}client_defaults.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/${MODPY_PYCACHE}filter_elements.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/${MODPY_PYCACHE}filter_elements.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/${MODPY_PYCACHE}filtertypes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/${MODPY_PYCACHE}filtertypes.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/${MODPY_PYCACHE}option_defaults.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/${MODPY_PYCACHE}option_defaults.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/client_defaults.py
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/defaults/filter_elements.py
|
||||
@ -83,21 +119,28 @@ lib/python${MODPY_VERSION}/site-packages/curator/utils.py
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/__init__.py
|
||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/curator/validators/${MODPY_PYCACHE}/
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/${MODPY_PYCACHE}config_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/${MODPY_PYCACHE}config_file.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/${MODPY_PYCACHE}schemacheck.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/${MODPY_PYCACHE}schemacheck.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/actions.py
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/config_file.py
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/filters.py
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/options.py
|
||||
lib/python${MODPY_VERSION}/site-packages/curator/validators/schemacheck.py
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}.dist-info/
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}.dist-info/METADATA
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}.dist-info/NOTICE
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}.dist-info/RECORD
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}.dist-info/WHEEL
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/elasticsearch_curator-${MODPY_EGG_VERSION}.dist-info/top_level.txt
|
||||
|
Loading…
Reference in New Issue
Block a user