From 104eca6da47cfc1ec2bc5f6dc7f94bed11f7ef53 Mon Sep 17 00:00:00 2001 From: Ernst Leierzopf Date: Mon, 21 Oct 2024 10:15:54 +0200 Subject: [PATCH 1/3] remove pkg-resources. --- tasks/main.yml | 6 ------ vars/RedHat.yml | 1 - vars/debian-bookworm.yml | 1 - vars/debian-bullseye.yml | 1 - vars/debian-buster.yml | 1 - vars/fedora.yml | 1 - vars/ubuntu-2004.yml | 1 - vars/ubuntu-2204.yml | 1 - 8 files changed, 13 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 7ee4611..d5728b3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -262,12 +262,6 @@ state: link with_items: "{{numpy.files }}" -- name: Link python3-pkg_resources - file: - src: "{{aminer_pythonpath[0]}}/pkg_resources" - dest: "/etc/aminer/conf-enabled/pkg_resources" - state: link - - name: Link yaml file: src: "{{aminer_pythonpath[0]}}/yaml" diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 229944a..c1497a9 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -4,7 +4,6 @@ aminer_packages: - python3-pytz - python3-scipy - python3-numpy - - python3-pkg-resources - python3-setuptools - python3-dateutil - python3-six diff --git a/vars/debian-bookworm.yml b/vars/debian-bookworm.yml index 9d62a24..37f6151 100644 --- a/vars/debian-bookworm.yml +++ b/vars/debian-bookworm.yml @@ -4,7 +4,6 @@ aminer_packages: - python3-tz - python3-scipy - python3-numpy - - python3-pkg-resources - python3-setuptools - python3-dateutil - python3-six diff --git a/vars/debian-bullseye.yml b/vars/debian-bullseye.yml index a189441..fb9caa2 100644 --- a/vars/debian-bullseye.yml +++ b/vars/debian-bullseye.yml @@ -4,7 +4,6 @@ aminer_packages: - python3-tz - python3-scipy - python3-numpy - - python3-pkg-resources - python3-setuptools - python3-dateutil - python3-six diff --git a/vars/debian-buster.yml b/vars/debian-buster.yml index 21b10fb..e5ce7c9 100644 --- a/vars/debian-buster.yml +++ b/vars/debian-buster.yml @@ -4,7 +4,6 @@ aminer_packages: - python3-tz - python3-scipy - python3-numpy - - python3-pkg-resources - python3-setuptools - python3-dateutil - python3-six diff --git a/vars/fedora.yml b/vars/fedora.yml index 31e5896..4408b98 100644 --- a/vars/fedora.yml +++ b/vars/fedora.yml @@ -4,7 +4,6 @@ aminer_packages: - python3-pytz - python3-scipy - python3-numpy - - python3-pkg-resources - python3-setuptools - python3-dateutil - python3-six diff --git a/vars/ubuntu-2004.yml b/vars/ubuntu-2004.yml index 52fe766..5c3f55c 100644 --- a/vars/ubuntu-2004.yml +++ b/vars/ubuntu-2004.yml @@ -4,7 +4,6 @@ aminer_packages: - python3-tz - python3-scipy - python3-numpy - - python3-pkg-resources - python3-setuptools - python3-dateutil - python3-six diff --git a/vars/ubuntu-2204.yml b/vars/ubuntu-2204.yml index 582066c..895d471 100644 --- a/vars/ubuntu-2204.yml +++ b/vars/ubuntu-2204.yml @@ -4,7 +4,6 @@ aminer_packages: - python3-tz - python3-scipy - python3-numpy - - python3-pkg-resources - python3-setuptools - python3-dateutil - python3-six From 27908886d8375f56e59b98638a729d371c414cd5 Mon Sep 17 00:00:00 2001 From: Ernst Leierzopf Date: Mon, 28 Oct 2024 20:40:55 +0100 Subject: [PATCH 2/3] install cerberus via pip by default. --- tasks/RedHat.yml | 6 ------ tasks/debian-buster.yml | 6 ------ tasks/main.yml | 7 +++++++ vars/RedHat.yml | 1 - vars/debian-bookworm.yml | 1 - vars/debian-bullseye.yml | 1 - vars/fedora.yml | 1 - vars/ubuntu-2004.yml | 1 - vars/ubuntu-2204.yml | 1 - 9 files changed, 7 insertions(+), 18 deletions(-) diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml index 508f79a..8b2d8e0 100644 --- a/tasks/RedHat.yml +++ b/tasks/RedHat.yml @@ -1,9 +1,3 @@ -- name: Install python3-cerberus - pip: - name: cerberus - executable: pip3 - state: latest - - name: pip self-update pip: name: pip diff --git a/tasks/debian-buster.yml b/tasks/debian-buster.yml index 41371ba..4503aec 100644 --- a/tasks/debian-buster.yml +++ b/tasks/debian-buster.yml @@ -4,12 +4,6 @@ executable: pip3 state: latest -- name: Install python3-cerberus - pip: - name: cerberus - executable: pip3 - state: latest - - name: Install python3-kafka pip: name: kafka-python diff --git a/tasks/main.yml b/tasks/main.yml index d5728b3..fd0dc65 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -150,6 +150,13 @@ state: latest extra_args: "{{pip_extra_args}}" +- name: Install python3-cerberus + pip: + name: cerberus + executable: pip3 + state: latest + extra_args: "{{pip_extra_args}}" + - name: Find zmq find: paths: "{{aminer_pythonpath}}" diff --git a/vars/RedHat.yml b/vars/RedHat.yml index c1497a9..663cdd9 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -7,7 +7,6 @@ aminer_packages: - python3-setuptools - python3-dateutil - python3-six - - python3-cerberus - python3-urllib3 - python3-defusedxml - python3-yaml diff --git a/vars/debian-bookworm.yml b/vars/debian-bookworm.yml index 37f6151..456b191 100644 --- a/vars/debian-bookworm.yml +++ b/vars/debian-bookworm.yml @@ -7,7 +7,6 @@ aminer_packages: - python3-setuptools - python3-dateutil - python3-six - - python3-cerberus - python3-kafka - python3-urllib3 - python3-statsmodels diff --git a/vars/debian-bullseye.yml b/vars/debian-bullseye.yml index fb9caa2..58c634c 100644 --- a/vars/debian-bullseye.yml +++ b/vars/debian-bullseye.yml @@ -7,7 +7,6 @@ aminer_packages: - python3-setuptools - python3-dateutil - python3-six - - python3-cerberus - python3-kafka - python3-urllib3 - python3-statsmodels diff --git a/vars/fedora.yml b/vars/fedora.yml index 4408b98..0c6a350 100644 --- a/vars/fedora.yml +++ b/vars/fedora.yml @@ -7,7 +7,6 @@ aminer_packages: - python3-setuptools - python3-dateutil - python3-six - - python3-cerberus - python3-kafka - python3-urllib3 - python3-statsmodels diff --git a/vars/ubuntu-2004.yml b/vars/ubuntu-2004.yml index 5c3f55c..935e7d1 100644 --- a/vars/ubuntu-2004.yml +++ b/vars/ubuntu-2004.yml @@ -7,7 +7,6 @@ aminer_packages: - python3-setuptools - python3-dateutil - python3-six - - python3-cerberus - python3-kafka - python3-urllib3 - python3-statsmodels diff --git a/vars/ubuntu-2204.yml b/vars/ubuntu-2204.yml index 895d471..20808df 100644 --- a/vars/ubuntu-2204.yml +++ b/vars/ubuntu-2204.yml @@ -7,7 +7,6 @@ aminer_packages: - python3-setuptools - python3-dateutil - python3-six - - python3-cerberus - python3-kafka - python3-urllib3 - python3-statsmodels From 043413c99c6490c2f84346a305120273ce48126a Mon Sep 17 00:00:00 2001 From: Ernst Leierzopf Date: Mon, 28 Oct 2024 21:17:58 +0100 Subject: [PATCH 3/3] fix cerberus installation. --- tasks/main.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index fd0dc65..b37e352 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -171,6 +171,13 @@ file_type: "directory" register: pyzmqlibs +- name: Find cerberus + find: + paths: "{{aminer_pythonpath}}" + patterns: 'cerberus' + file_type: "directory" + register: cerberus + - name: Link zmq file: src: "{{ item.path }}" @@ -185,6 +192,13 @@ state: link with_items: "{{pyzmqlibs.files }}" +- name: Link cerberus + file: + src: "{{ item.path }}" + dest: "/etc/aminer/conf-enabled/{{item.path.split('/')[-1]}}" + state: link + with_items: "{{cerberus.files }}" + - name: Find json.cpython find: paths: "{{aminer_pythonpath}}" @@ -227,20 +241,6 @@ state: link with_items: "{{scipy.files }}" -- name: Find cerberus - find: - paths: "{{aminer_pythonpath}}" - patterns: 'cerberus' - file_type: "directory" - register: cerberus - -- name: Link cerberus - file: - src: "{{ item.path }}" - dest: "/etc/aminer/conf-enabled/{{item.path.split('/')[-1]}}" - state: link - with_items: "{{cerberus.files }}" - - name: Find kafka find: paths: "{{aminer_pythonpath}}"