Skip to content

Commit

Permalink
Merge branch 'release/v1.0.9'
Browse files Browse the repository at this point in the history
Switch to python3 (Updates #2)
  • Loading branch information
shalomb committed Aug 4, 2020
2 parents 2bc543a + a2d171a commit de9b254
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ script:
- docker exec -it "$instance_id"
sh -c " ./test.yml --syntax-check "
- docker exec -it "$instance_id"
sh -c " ./test.yml --list-tasks --list-hosts --list-tags -vv "
sh -c " ./test.yml --list-tasks --list-tags -vv "
- docker exec -it "$instance_id"
sh -c " ./test.yml -l localhost -vvvv "

Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
v1.0.9 - 2020-08-04T10:30:05
----------------------------

* Switch to Python 3 (Closes #2)
* Switch to ansible 2.8 for tests in Travis CI
(we are not able to do > 2.8 due to bug in python < 3.7
(https://github.com/ansible/ansible/issues/21982#issuecomment-282778843)
and this is not available in <= Debian Stretch, Ubuntu Bionic) (Opens #3)

v1.0.6 - 2018-07-30T14:10:10
----------------------------

Expand Down
5 changes: 2 additions & 3 deletions tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@
# Containers and slim images may not have dbus installed.
- name: Install dbus systemd dependency
apt:
name: '{{ item }}'
name:
- dbus
state: present
update_cache: yes
when:
- ansible_virtualization_type == 'docker'
- ansible_os_family == 'Debian'
with_items:
- dbus
tags:
- dbus
- systemd
Expand Down
13 changes: 8 additions & 5 deletions tests/env-prep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ if type -P apt; then
export DEBIAN_FRONTEND=noninteractive
apt-get -qq -y update
apt-get install -y --no-install-recommends --no-install-suggests \
ca-certificates curl dbus procps python-minimal python-urllib3 \
ca-certificates curl dbus procps \
python3-minimal python3-setuptools python3-wheel \
tzdata

elif type -P zypper; then
Expand All @@ -31,13 +32,15 @@ elif type -P yum; then

fi

if type -P pip; then
pip install --upgrade pip
if type -P pip3; then
pip3 install --upgrade pip
else
curl https://bootstrap.pypa.io/get-pip.py | python
curl https://bootstrap.pypa.io/get-pip.py | python3
fi

pip install --upgrade ansible==2.5.5
pip3 install --upgrade ansible==2.8.0

ansible --version

systemctl --version

Expand Down
2 changes: 1 addition & 1 deletion tests/inventory
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
localhost ansible_connection=local
localhost ansible_connection=local ansible_python_interpreter=/usr/bin/python3

0 comments on commit de9b254

Please sign in to comment.