Skip to content

Commit

Permalink
Version upgrade and travis change to elastic 5.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
cmanaha committed Jul 13, 2017
1 parent 5ce5907 commit 8cb3998
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 12 deletions.
17 changes: 11 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@ python:
- "2.7"
- "3.6"

before_install:
- sudo update-java-alternatives -s java-8-oracle
- export JAVA_HOME=/usr/lib/jvm/java-8-oracle/jre
- java -version

install:
- pip install tox-travis
- pip install codecov
- mkdir /tmp/elasticsearch
- wget -O - http://s3-eu-west-1.amazonaws.com/build.eu-west-1.elastic.co/origin/2.0/nightly/JDK7/elasticsearch-latest-SNAPSHOT.tar.gz | tar xz --directory=/tmp/elasticsearch --strip-components=1
- /tmp/elasticsearch/bin/elasticsearch -d --path.data /tmp --discovery.zen.ping.multicast.enabled false --script.inline on --script.indexed on --path.repo=/tmp --repositories.url.allowed_urls='http://*' --node.testattr=test
- git clone https://github.com/elastic/elasticsearch.git ../elasticsearch
- pip install tox-travis
- pip install codecov
- mkdir /tmp/elasticsearch
- wget -O - https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.5.0.tar.gz | tar xz --directory=/tmp/elasticsearch --strip-components=1
- /tmp/elasticsearch/bin/elasticsearch -d -E script.inline=true -E path.repo=/tmp -E repositories.url.allowed_urls='http://*' -E node.attr.testattr=test
- git clone https://github.com/elastic/elasticsearch.git ../elasticsearch

script: tox

Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements_py27.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
elasticsearch==5.1.0
requests==2.12.4
elasticsearch==5.4.0
requests==2.18.1
enum==0.4.6
4 changes: 2 additions & 2 deletions requirements/requirements_py36.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
elasticsearch==5.1.0
requests==2.12.4
elasticsearch==5.4.0
requests==2.18.1
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
# Versions should comply with PEP440. For a discussion on single-sourcing
# the version across setup.py and the project code, see
# https://packaging.python.org/en/latest/single_source_version.html
version='1.0.0b3',
version='1.0.0b4',

description='Elasticsearch Log handler for the logging library',
long_description=long_description,
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sonar.projectKey=cmr.python:python-elasticsearch-logger
sonar.projectName=Python Elasticsearch Logger
sonar.projectVersion=1.0.0b3
sonar.projectVersion=1.0.0b4
sonar.verbose=DEBUG
sonar.language=py
sonar.sources=cmreslogging
Expand Down

0 comments on commit 8cb3998

Please sign in to comment.