Skip to content

Commit 494e187

Browse files
authored
Changed pylint CI test to Ubuntu 20.04 (#155)
1 parent c757e1f commit 494e187

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ os: linux
44
dist: bionic
55
jobs:
66
include:
7-
- name: "Pylint on Ubuntu Bionic (18.04) (Docker) with Python 3.6"
8-
env: [TARGET="pylint", UBUNTU_VERSION="18.04"]
7+
- name: "Pylint on Ubuntu Bionic (20.04) (Docker) with Python 3.8"
8+
env: [TARGET="pylint", UBUNTU_VERSION="20.04"]
99
group: edge
1010
language: python
11-
python: 3.6
11+
python: 3.8
1212
services:
1313
- docker
1414
- name: "Fedora 31 (Docker) with Python 3.7"

config/travis/install.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ then
6464
then
6565
docker exec ${CONTAINER_NAME} add-apt-repository universe;
6666
docker exec ${CONTAINER_NAME} add-apt-repository ppa:deadsnakes/ppa -y;
67-
68-
elif test ${TARGET} = "pylint";
69-
then
70-
docker exec ${CONTAINER_NAME} add-apt-repository ppa:gift/pylint3 -y;
7167
fi
7268
docker exec ${CONTAINER_NAME} add-apt-repository ppa:gift/dev -y;
7369

config/travis/run_pylint.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ set -e;
1010

1111
pylint --version
1212

13-
for FILE in $(find setup.py config dfdatetime tests -name \*.py);
13+
# Ignore setup.py for now due to:
14+
# setup.py:15:0: E0001: Cannot import 'distutils.command.bdist_msi' due to
15+
# syntax error 'expected an indented block (<unknown>, line 347)' (syntax-error)
16+
17+
for FILE in $(find config dfdatetime tests -name \*.py);
1418
do
1519
echo "Checking: ${FILE}";
1620

setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
class BdistMSICommand(bdist_msi):
4141
"""Custom handler for the bdist_msi command."""
4242

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

59+
# pylint: disable=invalid-name
5860
def _make_spec_file(self):
5961
"""Generates the text of an RPM spec file.
6062

0 commit comments

Comments
 (0)