From 8429ec5bc12891eb5d672d553f5309df100071c7 Mon Sep 17 00:00:00 2001 From: Manu <3916435+m3nu@users.noreply.github.com> Date: Mon, 28 Feb 2022 10:28:37 +0400 Subject: [PATCH] Support Borg 1.2.0 (#94) * Move common Python packages to main.yml, install dependent Python packages first. --- tasks/main.yml | 8 +++++++- vars/Archlinux.yml | 5 ----- vars/Debian.yml | 6 +----- vars/Fedora.yml | 5 ----- vars/RedHat-8.yml | 5 ----- vars/RedHat-9.yml | 5 ----- vars/RedHat.yml | 5 ----- vars/main.yml | 7 +++++++ 8 files changed, 15 insertions(+), 31 deletions(-) create mode 100644 vars/main.yml diff --git a/tasks/main.yml b/tasks/main.yml index 2421a71..2c1bac6 100755 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -33,7 +33,13 @@ virtualenv: /opt/borgmatic virtualenv_command: "{{ python_bin }} -m venv" -- name: Install required Python Packages +- name: Install dependent Python Packages + pip: + name: "{{ borg_dependent_python_packages }}" + virtualenv: /opt/borgmatic + when: borg_dependent_python_packages is defined + +- name: Install main Python Packages pip: name: "{{ borg_python_packages }}" virtualenv: /opt/borgmatic diff --git a/vars/Archlinux.yml b/vars/Archlinux.yml index 0da7866..639f070 100644 --- a/vars/Archlinux.yml +++ b/vars/Archlinux.yml @@ -5,10 +5,5 @@ borg_packages: - openssh - cronie -borg_python_packages: - - cython - - borgbackup - - borgmatic - python_bin: python3 pip_bin: pip3 diff --git a/vars/Debian.yml b/vars/Debian.yml index 50cb548..5dbed10 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -7,6 +7,7 @@ borg_packages: - python3-setuptools - python3-dev - python3-pip + - python3-pkgconfig - python3-msgpack - python3-venv - openssh-client @@ -14,8 +15,3 @@ borg_packages: python_bin: python3 pip_bin: pip3 - -borg_python_packages: - - cython - - borgbackup - - borgmatic diff --git a/vars/Fedora.yml b/vars/Fedora.yml index e9f43c2..9f12d89 100644 --- a/vars/Fedora.yml +++ b/vars/Fedora.yml @@ -15,8 +15,3 @@ borg_packages: python_bin: python3 pip_bin: pip3 - -borg_python_packages: - - cython - - borgbackup - - borgmatic diff --git a/vars/RedHat-8.yml b/vars/RedHat-8.yml index 54366d9..7ee2d7e 100644 --- a/vars/RedHat-8.yml +++ b/vars/RedHat-8.yml @@ -15,8 +15,3 @@ borg_packages: python_bin: python3 pip_bin: pip3 - -borg_python_packages: - - cython - - borgbackup - - borgmatic diff --git a/vars/RedHat-9.yml b/vars/RedHat-9.yml index 54366d9..7ee2d7e 100644 --- a/vars/RedHat-9.yml +++ b/vars/RedHat-9.yml @@ -15,8 +15,3 @@ borg_packages: python_bin: python3 pip_bin: pip3 - -borg_python_packages: - - cython - - borgbackup - - borgmatic diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 461aeac..bd2fd08 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -14,8 +14,3 @@ borg_packages: python_bin: python3 pip_bin: pip3 - -borg_python_packages: - - cython - - borgbackup - - borgmatic diff --git a/vars/main.yml b/vars/main.yml new file mode 100644 index 0000000..a5deaf2 --- /dev/null +++ b/vars/main.yml @@ -0,0 +1,7 @@ +--- +borg_dependent_python_packages: + - cython + - pkgconfig +borg_python_packages: + - borgbackup + - borgmatic