Skip to content

Commit

Permalink
Changed pylint CI test to Ubuntu 20.04 (#155)
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz authored May 20, 2020
1 parent c757e1f commit 494e187
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ os: linux
dist: bionic
jobs:
include:
- name: "Pylint on Ubuntu Bionic (18.04) (Docker) with Python 3.6"
env: [TARGET="pylint", UBUNTU_VERSION="18.04"]
- name: "Pylint on Ubuntu Bionic (20.04) (Docker) with Python 3.8"
env: [TARGET="pylint", UBUNTU_VERSION="20.04"]
group: edge
language: python
python: 3.6
python: 3.8
services:
- docker
- name: "Fedora 31 (Docker) with Python 3.7"
Expand Down
4 changes: 0 additions & 4 deletions config/travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ then
then
docker exec ${CONTAINER_NAME} add-apt-repository universe;
docker exec ${CONTAINER_NAME} add-apt-repository ppa:deadsnakes/ppa -y;

elif test ${TARGET} = "pylint";
then
docker exec ${CONTAINER_NAME} add-apt-repository ppa:gift/pylint3 -y;
fi
docker exec ${CONTAINER_NAME} add-apt-repository ppa:gift/dev -y;

Expand Down
6 changes: 5 additions & 1 deletion config/travis/run_pylint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ set -e;

pylint --version

for FILE in $(find setup.py config dfdatetime tests -name \*.py);
# Ignore setup.py for now due to:
# setup.py:15:0: E0001: Cannot import 'distutils.command.bdist_msi' due to
# syntax error 'expected an indented block (<unknown>, line 347)' (syntax-error)

for FILE in $(find config dfdatetime tests -name \*.py);
do
echo "Checking: ${FILE}";

Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
class BdistMSICommand(bdist_msi):
"""Custom handler for the bdist_msi command."""

# pylint: disable=invalid-name
def run(self):
"""Builds an MSI."""
# Command bdist_msi does not support the library version, neither a date
Expand All @@ -55,6 +56,7 @@ def run(self):
class BdistRPMCommand(bdist_rpm):
"""Custom handler for the bdist_rpm command."""

# pylint: disable=invalid-name
def _make_spec_file(self):
"""Generates the text of an RPM spec file.
Expand Down

0 comments on commit 494e187

Please sign in to comment.