Skip to content

Commit

Permalink
pep8 dependency is deprecated, remove and replace it with pycodestyle
Browse files Browse the repository at this point in the history
  • Loading branch information
Coop56 committed Mar 12, 2019
1 parent 1d8d6a0 commit 0586d35
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ kombu==4.2.1 # python-kombu (4.1.0 in our ppa)
coreschema==0.0.4 # python-coreschema (0.0.4 in our ppa)
autoflake<=0.7 # python-autoflake (0.7 in our ppa)
flake8>=2.6.2,<=3.5.0 # python-flake8 (2.5.4) FIXME
pycodestyle<=2.3.0 # missing TODO
pycodestyle<=2.5.0 # missing TODO
pyflakes>=1.2.3,<=1.6.0 # python-pyflakes (1.6.0 in our ppa) FIXME
pep8<=1.7.1 # python-pep8 (1.7.1 in our ppa)
boto<=2.38.0 # python-boto (2.38.0)
six<1.11.0 # https://github.com/benjaminp/six/issues/210 (1.10.0 in ppa)
tqdm==4.23.3
Expand Down
6 changes: 3 additions & 3 deletions scripts/jenkins/jenkins-geonode-dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pip install --quiet clonedigger
# Setup and Build GeoNode
git clean -dxff
# run this here while we have a clean dir.
/usr/bin/sloccount --duplicates --wide --details geonode/ > sloccount.out
/usr/bin/sloccount --duplicates --wide --details geonode/ > sloccount.out
python /usr/local/bin/clokins.py --exclude-list-file=scripts/jenkins/clokins.exclude . > clokins.output
pip install -e .
# Just in case
Expand Down Expand Up @@ -72,14 +72,14 @@ cp TEST-nose.xml upload-TEST-nose.xml
cp coverage.xml upload-coverage.xml
cp coverage -R upload-coverage

# Run the javascript tests
# Run the javascript tests
paver test_javascript
mv geonode/static/geonode/junit.xml ./javascript-TEST-nose.xml

# Run Code Quality Tools
export DJANGO_SETTINGS_MODULE=geonode.settings
pylint -f parseable geonode/ | tee pylint.out
pep8 --repeat geonode | tee pep8.out
pycodestyle geonode | tee pycodestyle.out
find . -type f -iname "*.py" | egrep -v '^./tests/'|xargs pyflakes > pyflakes.out || :
clonedigger --cpd-output . || :
mv output.xml clonedigger.out
Expand Down
8 changes: 4 additions & 4 deletions scripts/jenkins/jenkins-geonode-master.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ pip install --quiet nosexcover
pip install --quiet pylint
pip install --quiet pyflakes
pip install --quiet clonedigger
pip install --quiet pep8
pip install --quiet pycodestyle

# Setup and Build GeoNode
git clean -dxff

# run this here while we have a clean dir.
#/usr/bin/sloccount --duplicates --wide --details geonode/ > sloccount.out
#/usr/bin/sloccount --duplicates --wide --details geonode/ > sloccount.out
#python /usr/local/bin/clokins.py --exclude-list-file=scripts/jenkins/clokins.exclude . > clokins.output

pip install -e .
Expand Down Expand Up @@ -64,14 +64,14 @@ cp TEST-nose.xml csw-TEST-nose.xml
cp coverage.xml csw-coverage.xml
cp coverage -R csw-coverage

# Run the javascript tests
# Run the javascript tests
#paver test_javascript
#mv geonode/static/geonode/junit.xml ./javascript-TEST-nose.xml

# Run Code Quality Tools
export DJANGO_SETTINGS_MODULE=geonode.settings
pylint -f parseable geonode/ | tee pylint.out
pep8 --repeat geonode | tee pep8.out
pycodestyle geonode | tee pycodestyle.out
find . -type f -iname "*.py" | egrep -v '^./tests/'|xargs pyflakes > pyflakes.out || :
clonedigger --cpd-output . || :
mv output.xml clonedigger.out
Expand Down

0 comments on commit 0586d35

Please sign in to comment.