Skip to content

Commit d9bc0b9

Browse files
committed
Fix pycodestyle / pylint
1 parent ec91d5c commit d9bc0b9

File tree

5 files changed

+9
-14
lines changed

5 files changed

+9
-14
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
branch: develop
5959
tags: true
6060
- stage: Bintray deployment
61+
python: 3.6
6162
script: |
6263
echo "Deploying to BinTray packages...";
6364
echo "Branch: $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION";

MANIFEST.in

-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,3 @@ recursive-include contrib *.*
99
recursive-include alignak *.*
1010
global-exclude *.pyc
1111
global-exclude *.log
12-
prune dev
13-
prune doc
14-
prune tests
15-
prune tests_integ

package.sh

+1-6
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ else
123123
fi
124124

125125
# Run fpm:
126-
# - verbose mode to have information
126+
# Add --verbose for a verbose (very...) mode to have more information
127127
# - from python to deb packages, for all architectures
128128
# Use python dependencies - all Alignak python packages
129129
# are packaged in the main distros so it will use the
@@ -133,7 +133,6 @@ echo "Running fpm..."
133133
if [ "${output_type}" = "deb" ]; then
134134
fpm \
135135
--force \
136-
--verbose \
137136
--input-type ${input_type} \
138137
--output-type ${output_type} \
139138
--package "./bin" \
@@ -165,8 +164,6 @@ if [ "${output_type}" = "deb" ]; then
165164
elif [ "${output_type}" = "rpm" ]; then
166165
fpm \
167166
--force \
168-
--verbose \
169-
--input-type virtualenv \
170167
--input-type ${input_type} \
171168
--output-type ${output_type} \
172169
--package "./bin" \
@@ -188,8 +185,6 @@ elif [ "${output_type}" = "rpm" ]; then
188185
else
189186
fpm \
190187
--force \
191-
--verbose \
192-
--input-type virtualenv \
193188
--input-type ${input_type} \
194189
--output-type ${output_type} \
195190
--package "./bin" \

setup.py

-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ def extract_requirement(line):
6868
if package_files:
6969
data_files.append((target, package_files))
7070

71-
print(data_files)
72-
7371
setup(
7472
name='alignak',
7573
version=VERSION,

tox.ini

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ envlist = py27,py34,py35,py36
44
skip_missing_interpreters=True
55

66
[testenv]
7-
changedir=test
8-
deps = -rtest/requirements.txt
7+
changedir=tests
8+
deps = -rtests/requirements.txt
9+
commands= pytest --basetemp={envtmpdir} --maxfail=6 --verbose --durations=10 --no-print-logs --cov=alignak --cov-report term-missing --cov-config .coveragerc {posargs}
10+
11+
[testenv:integration]
12+
changedir=tests_integ
13+
deps = -rtests/requirements.txt
914
commands= pytest --basetemp={envtmpdir} --maxfail=6 --verbose --durations=10 --no-print-logs --cov=alignak --cov-report term-missing --cov-config .coveragerc {posargs}

0 commit comments

Comments
 (0)