Skip to content

Commit b610558

Browse files
authored
Merge pull request #44 from elliotweiser/deps-update
Update molecule/ansible dependencies
2 parents ced633d + c9b7f5b commit b610558

File tree

3 files changed

+37
-43
lines changed

3 files changed

+37
-43
lines changed

.travis.yml

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,23 @@ language: generic
44
matrix:
55
include:
66
- os: osx
7-
osx_image: xcode9.4
8-
env: ANSIBLE_VERSION=2.6.1
7+
osx_image: xcode10
8+
env: ANSIBLE_VERSION='<2.7.0'
99
- os: osx
10-
osx_image: xcode9.4
11-
env: ANSIBLE_VERSION=2.5.6
10+
osx_image: xcode10
11+
env: ANSIBLE_VERSION='<2.6.0'
1212
- os: osx
13-
osx_image: xcode9.4
14-
env: ANSIBLE_VERSION=2.4.6.0
15-
- os: osx
16-
osx_image: xcode9.4
17-
env: ANSIBLE_VERSION=2.3.3.0
18-
- os: osx
19-
osx_image: xcode9.4
20-
env: ANSIBLE_VERSION=2.2.3.0
13+
osx_image: xcode10
14+
env: ANSIBLE_VERSION='<2.5.0'
2115
- os: osx
2216
osx_image: xcode9.2
23-
env: ANSIBLE_VERSION=2.6.1
24-
- os: osx
25-
osx_image: xcode8.3
26-
env: ANSIBLE_VERSION=2.6.1
17+
env: ANSIBLE_VERSION='<2.7.0'
2718
- os: osx
28-
osx_image: xcode7.3
29-
env: ANSIBLE_VERSION=2.6.1
19+
osx_image: xcode8
20+
env: ANSIBLE_VERSION='<2.7.0'
3021
- os: osx
3122
osx_image: xcode6.4
32-
env: ANSIBLE_VERSION=2.6.1
23+
env: ANSIBLE_VERSION='<2.7.0'
3324

3425
branches:
3526
only:
@@ -52,11 +43,11 @@ before_install:
5243
- virtualenv --version
5344
- virtualenv .venv
5445
- source .venv/bin/activate
55-
- pip install -U pip
56-
- pip install ansible==${ANSIBLE_VERSION}
57-
- pip install ansible-lint
58-
- pip install testinfra
59-
- pip install yamllint
46+
- pip install -U 'pip'
47+
- pip install "ansible${ANSIBLE_VERSION}"
48+
- pip install 'ansible-lint'
49+
- pip install 'testinfra'
50+
- pip install 'yamllint'
6051

6152
# For version_check.py
6253
- pip install requests

tests/test-requirements.txt

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
ansible==2.6.1
1+
ansible==2.6.4
22
ansible-lint==3.4.23
3-
anyconfig==0.9.4
3+
anyconfig==0.9.7
44
arrow==0.12.1
55
asn1crypto==0.24.0
6-
atomicwrites==1.1.5
7-
attrs==18.1.0
6+
atomicwrites==1.2.1
7+
attrs==18.2.0
88
backports.functools-lru-cache==1.5
99
bcrypt==3.1.4
1010
binaryornot==0.4.4
1111
Cerberus==1.2
12-
certifi==2018.4.16
12+
certifi==2018.8.24
1313
cffi==1.11.5
1414
chardet==3.0.4
1515
click==6.7
1616
click-completion==0.3.1
1717
colorama==0.3.9
1818
configparser==3.5.0
1919
cookiecutter==1.6.0
20-
cryptography==2.3
20+
cryptography==2.3.1
2121
enum34==1.1.6
2222
fasteners==0.14.1
2323
flake8==3.5.0
@@ -30,33 +30,35 @@ Jinja2==2.10
3030
jinja2-time==0.2.0
3131
MarkupSafe==1.0
3232
mccabe==0.6.1
33-
molecule==2.16.0
33+
molecule==2.18.1
3434
monotonic==1.5
35-
more-itertools==4.2.0
36-
paramiko==2.4.1
37-
pathspec==0.5.6
38-
pbr==4.0.4
35+
more-itertools==4.3.0
36+
paramiko==2.4.2
37+
pathlib2==2.3.2
38+
pathspec==0.5.9
39+
pbr==4.1.0
3940
pexpect==4.6.0
40-
pluggy==0.6.0
41+
pluggy==0.7.1
4142
poyo==0.4.1
4243
psutil==5.4.6
4344
ptyprocess==0.6.0
44-
py==1.5.4
45-
pyasn1==0.4.3
45+
py==1.6.0
46+
pyasn1==0.4.4
4647
pycodestyle==2.3.1
47-
pycparser==2.18
48+
pycparser==2.19
4849
pyflakes==1.6.0
4950
PyNaCl==1.2.1
50-
pytest==3.6.3
51+
pytest==3.8.1
5152
python-dateutil==2.7.3
5253
python-gilt==1.2.1
5354
python-vagrant==0.5.15
54-
PyYAML==3.12
55+
PyYAML==3.13
5556
requests==2.19.1
57+
scandir==1.9.0
5658
sh==1.12.14
5759
six==1.11.0
5860
tabulate==0.8.2
59-
testinfra==1.14.0
61+
testinfra==1.14.1
6062
tree-format==0.1.2
6163
urllib3==1.23
6264
whichcraft==0.4.1

tests/test_default.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ def test_clt_package_metadata(host):
2424
def test_git_is_useable(host):
2525
c = host.command('/usr/bin/git --version')
2626
assert c.rc == 0
27-
assert re.match('^git version \d+(.\d+)* \(Apple Git-\d+(\.\d+)*\)$', c.stdout)
27+
assert re.match('^git version \d+(.\d+)* \(Apple Git-\d+(\.\d+)*\)$',
28+
c.stdout)

0 commit comments

Comments
 (0)