8000 fix travis build (#543) · uwydoc/PyMySQL@7742180 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7742180

Browse files
methanemethane
authored
fix travis build (PyMySQL#543)
* update some MySQL and PyPy3 versions * stop using tox * not use cache for MySQL download * don't use sudo * Use trusty vm * don't install mariadb-test package * Throw away PAM. I can't maintain it. * remove tests using same Python version * travis: Add "3.7-dev" python
1 parent e22a14a commit 7742180

File tree

1 file changed

+38
-70
lines changed

1 file changed

+38
-70
lines changed

‎.travis.yml

Lines changed: 38 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,55 @@
1-
sudo: false
1+
sudo: required
2+
dist: trusty
23
language: python
3-
python: "3.5"
4-
cache:
5-
directories:
6-
- $HOME/.cache/pip
7-
- $HOME/mysql
4+
python:
5+
- "3.7-dev"
6+
- "3.6"
7+
- "2.6"
8+
- "pypy3.3-5.2-alpha1"
89

9-
env:
10-
matrix:
11-
- TOX_ENV=py26
12-
- TOX_ENV=py27
13-
- TOX_ENV=py33
14-
- TOX_ENV=py34
15-
- TOX_ENV=py35
16-
- TOX_ENV=pypy
17-
- TOX_ENV=pypy3
10+
cache: pip
1811

1912
matrix:
20-
include:
21-
- addons:
22-
mariadb: 5.5
23-
env:
24-
- TOX_ENV=py27
25-
- EXTRAPKG=mariadb-test
26-
sudo: required
13+
include:
14+
- addons:
15+
mariadb: 5.5
16+
python: "3.5"
2717

28-
- addons:
29-
mariadb: 10.0
30-
env:
31-
- TOX_ENV=py33
32-
- EXTRAPKG=mariadb-test
33-
- PAMCLEAR=1
34-
sudo: required
18+
- addons:
19+
mariadb: 10.0
20+
python: "pypy"
3521

36-
- addons:
37-
mariadb: 10.1
38-
env:
39-
- TOX_ENV=py34
40-
- EXTRAPKG=mariadb-test
41-
sudo: required
22+
- addons:
23+
mariadb: 10.1
24+
python: "2.7"
4225

43-
- env:
44-
- TOX_ENV=py34
45-
- DB=5.6.32
46-
addons:
47-
apt:
48-
packages:
49-
- libaio-dev
50-
python: 3.3
26+
- env:
27+
- DB=5.6.35
28+
addons:
29+
apt:
30+
packages:
31+
- libaio-dev
32+
python: "3.3"
5133

52-
- env:
53-
- TOX_ENV=py34
54-
- DB=5.7.14
55-
addons:
56-
apt:
57-
packages:
58-
- libaio-dev
59-
python: 3.4
34+
- env:
35+
- DB=5.7.17
36+
addons:
37+
apt:
38+
packages:
39+
- libaio-dev
40+
python: "3.4"
6041

61-
allow_failures:
62-
- env: DB=5.7.14
6342

64-
# different py version from 5.6 and 5.7 as cache seems to be based on py version
6543

44+
# different py version from 5.6 and 5.7 as cache see 8000 ms to be based on py version
6645
# http://dev.mysql.com/downloads/mysql/5.7.html has latest development release version
67-
6846
# really only need libaio1 for DB builds however libaio-dev is whitelisted for container builds and liaio1 isn't
69-
7047
install:
7148
- if [ -n "${EXTRAPKG}" ]; then
7249
sudo apt-get install ${EXTRAPKG};
7350
fi
74-
- if [ -n "${PAMCLEAR}" ]; then
75-
echo -e '[mysqld]\n\npam-use-cleartext-plugin' | sudo tee -a /etc/mysql/conf.d/pam-cleartext.cnf;
76-
mysql -u root -e "install plugin pam soname 'auth_pam.so'";
77-
sudo service mysql restart;
78-
fi
7951
- export PASSWORD=travis;
80-
- export PAMSERVICE=chfn;
81-
- pip install -U tox coveralls
52+
- pip install -U coveralls unittest2 coverage
8253

8354
before_script:
8455
- ./.travis/initializedb.sh
@@ -87,21 +58,18 @@ before_script:
8758
- mysql -u root -e "create user travis_pymysql2 identified by 'some password'; grant all on test_pymysql2.* to travis_pymysql2;"
8859
- mysql -u root -e "create user travis_pymysql2@localhost identified by 'some password'; grant all on test_pymysql2.* to travis_pymysql2@localhost;"
8960
- mysql -e 'select VERSION()'
61+
- python -VV
9062
- rm -f ~/.my.cnf # set in .travis.initialize.db.sh for the above commands - we should be using database.json however
9163
- export COVERALLS_PARALLEL=true
9264

9365
script:
94-
- tox -e $TOX_ENV
66+
- coverage run ./runtests.py
9567

9668
after_success:
9769
- coveralls
9870
- cat /tmp/mysql.err
99-
- if [ -n "${PAMCLEAR}" ]; then
100-
sudo cat /var/log/syslog;
101-
fi
10271

10372
after_failure:
10473
- cat /tmp/mysql.err
105-
- if [ -n "${PAMCLEAR}" ]; then
106-
sudo cat /var/log/syslog;
107-
fi
74+
75+
# vim: sw=2 ts=2 sts=2 expandtab

0 commit comments

Comments
 (0)
0