Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade pip to fetch most recent dependencies #1411

Merged
merged 1 commit into from
Apr 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,17 @@ Packetbeat:
Some of the Beats might have extra development requirements, in which case a
CONTRIBUTING.md file is find in the Beat directory.

## Testing

You can run the whole testsuite with the following command:

# make testsuite
$ make testsuite

Running the testsuite has the following requirements:

* Python >=2.7.9
* Docker >=1.10.0
* Docker-compose >= 1.7.0

## Dependencies

Expand Down
3 changes: 3 additions & 0 deletions libbeat/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ ENV PYTHON_ENV=/tmp/python-env

RUN test -d ${PYTHON_ENV} || virtualenv ${PYTHON_ENV}
COPY ./tests/system/requirements.txt /tmp/requirements.txt

# Upgrade pip to make sure to have the most recent version
RUN . ${PYTHON_ENV}/bin/activate && pip install -U pip
RUN . ${PYTHON_ENV}/bin/activate && pip install -Ur /tmp/requirements.txt

# Libbeat specific
Expand Down
1 change: 1 addition & 0 deletions libbeat/scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ benchmark-tests:
.PHONY: python-env
python-env: ${ES_BEATS}/libbeat/tests/system/requirements.txt
test -d ${PYTHON_ENV} || virtualenv ${PYTHON_ENV}
. ${PYTHON_ENV}/bin/activate && pip install --upgrade pip ; \
if [ -a ./tests/system/requirements.txt ] && [ ! ${ES_BEATS}/libbeat/tests/system/requirements.txt -ef ./tests/system/requirements.txt ] ; then \
. ${PYTHON_ENV}/bin/activate && pip install -Ur ${ES_BEATS}/libbeat/tests/system/requirements.txt -Ur ./tests/system/requirements.txt ; \
else \
Expand Down
3 changes: 1 addition & 2 deletions libbeat/tests/system/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
pip
nose
jinja2
PyYAML
nose-timer
pip