From d1a603b0a18cc40700644f3229801ea8067c3c71 Mon Sep 17 00:00:00 2001 From: Aaron Mildenstein Date: Thu, 22 Mar 2018 09:57:00 -0600 Subject: [PATCH] Rollback changes introduced in #1122 They were causing issues with older versions of Python, which need to be supported still, for a while. Also remove before_install block from .travis.yml Prep 5.5.1 release with these small fixes fixes #1183 --- .gitignore | 38 +++++++++++++++++------------- .travis.yml | 6 ----- curator/_version.py | 2 +- docs/Changelog.rst | 5 ++++ docs/asciidoc/index.asciidoc | 2 +- requirements.txt | 1 - setup.cfg | 1 - setup.py | 45 +++++++++++++++++++++++++++++------- 8 files changed, 66 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index cebb58e2..0035ef19 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,30 @@ -.*.swp -*~ +*.egg *.py[co] +*~ +.*.swp +.DS_Store +.coverage +.eggs +.idea +Elastic.ico +Vagrant/centos/6/.vagrant +Vagrant/centos/7/.vagrant +Vagrant/ubuntu/14.04/.vagrant build +cacert.pem +cover +coverage.xml dist -scratch docs/_build -*.egg -.eggs +docs/asciidoc/html_docs elasticsearch_curator.egg-info elasticsearch_curator_dev.egg-info -.coverage -.idea -coverage.xml -nosetests.xml index.html -docs/asciidoc/html_docs -wheelhouse -Elastic.ico -vcruntime140.dll msi_guid.txt -Vagrant/centos/6/.vagrant -Vagrant/centos/7/.vagrant -Vagrant/ubuntu/14.04/.vagrant +nosetests.xml +samples +scratch +test/.DS_Store +vcruntime140.dll +wheelhouse +windows diff --git a/.travis.yml b/.travis.yml index 8cffb062..f6bea84f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,12 +25,6 @@ cache: jdk: - oraclejdk8 -before_install: - - cp requirements.txt .. - - cd .. - - pip install -r requirements.txt - - cd - - install: - pip install -U setuptools - pip install -r requirements.txt diff --git a/curator/_version.py b/curator/_version.py index a0420b7c..7503b303 100644 --- a/curator/_version.py +++ b/curator/_version.py @@ -1,2 +1,2 @@ -__version__ = '5.5.0' +__version__ = '5.5.1' diff --git a/docs/Changelog.rst b/docs/Changelog.rst index 495e9f9b..eef6c07e 100644 --- a/docs/Changelog.rst +++ b/docs/Changelog.rst @@ -3,6 +3,11 @@ Changelog ========= +5.5.1 (22 March 2018) + +**Bug Fixes** + + * Fix ``pip`` installation issues for older versions of Python #1183 (untergeek) 5.5.0 (21 March 2018) --------------------- diff --git a/docs/asciidoc/index.asciidoc b/docs/asciidoc/index.asciidoc index ffeb554a..89028ab6 100644 --- a/docs/asciidoc/index.asciidoc +++ b/docs/asciidoc/index.asciidoc @@ -1,4 +1,4 @@ -:curator_version: 5.5.0 +:curator_version: 5.5.1 :curator_major: 5 :curator_doc_tree: 5.5 :es_py_version: 5.5.2 diff --git a/requirements.txt b/requirements.txt index 1847ed83..ec1ed927 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ voluptuous>=0.9.3 -urllib3>=1.20 elasticsearch==5.5.2 click>=6.7 pyyaml>=3.10 diff --git a/setup.cfg b/setup.cfg index 08a8ecdb..f4ea0aad 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,7 +21,6 @@ classifiers = [options] install_requires = voluptuous>=0.9.3 - urllib3>=1.20 elasticsearch==5.5.2 click>=6.7 pyyaml>=3.10 diff --git a/setup.py b/setup.py index 8b84c90d..cd46c587 100644 --- a/setup.py +++ b/setup.py @@ -22,14 +22,12 @@ def get_version(): return VERSION def get_install_requires(): - return [ - 'voluptuous>=0.9.3', - 'urllib3>=1.20', - 'elasticsearch==5.5.2', - 'click>=6.7', - 'pyyaml>=3.10', - 'certifi>=2018.1.18', - ] + res = ['elasticsearch==5.5.2' ] + res.append('click>=6.7') + res.append('pyyaml>=3.10') + res.append('voluptuous>=0.9.3') + res.append('certifi>=2018.1.18') + return res try: ### cx_Freeze ### @@ -137,5 +135,36 @@ def get_install_requires(): ### end cx_Freeze ### except ImportError: setup( + name = "elasticsearch-curator", + version = get_version(), + author = "Elastic", + author_email = "info@elastic.co", + description = "Tending your Elasticsearch indices", + long_description=fread('README.rst'), + url = "http://github.com/elastic/curator", + download_url = "https://github.com/elastic/curator/tarball/v" + get_version(), + license = "Apache License, Version 2.0", + install_requires = get_install_requires(), + keywords = "elasticsearch time-series indexed index-expiry", + packages = ["curator"], + include_package_data=True, + entry_points = { + "console_scripts" : [ + "curator = curator.cli:cli", + "curator_cli = curator.curator_cli:main", + "es_repo_mgr = curator.repomgrcli:repo_mgr_cli", + ] + }, + classifiers=[ + "Intended Audience :: Developers", + "Intended Audience :: System Administrators", + "License :: OSI Approved :: Apache Software License", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + ], test_suite = "test.run_tests.run_all", + tests_require = ["mock", "nose", "coverage", "nosexcover"] )