Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dependency on python3-pkg-resources #33

Merged
merged 3 commits into from
Oct 30, 2024
Merged

Remove dependency on python3-pkg-resources #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
104eca6
remove pkg-resources.
ernstleierzopf Oct 21, 2024
2790888
install cerberus via pip by default.
ernstleierzopf Oct 28, 2024
043413c
fix cerberus installation.
ernstleierzopf Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions tasks/RedHat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
- name: Install python3-cerberus
pip:
name: cerberus
executable: pip3
state: latest

- name: pip self-update
pip:
name: pip
Expand Down
6 changes: 0 additions & 6 deletions tasks/debian-buster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
executable: pip3
state: latest

- name: Install python3-cerberus
pip:
name: cerberus
executable: pip3
state: latest

Comment on lines -7 to -12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please keep it for the old debian buster

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved this to the main task so it is installed for all OSes via pip anyways. This would be a duplicate installation.

@whotwagner please review this again as no change is needed IMO.

- name: Install python3-kafka
pip:
name: kafka-python
Expand Down
41 changes: 21 additions & 20 deletions tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
Expand All @@ -164,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 }}"
Expand All @@ -178,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}}"
Expand Down Expand Up @@ -220,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}}"
Expand Down Expand Up @@ -262,12 +269,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"
Expand Down
2 changes: 0 additions & 2 deletions vars/RedHat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ aminer_packages:
- python3-pytz
- python3-scipy
- python3-numpy
- python3-pkg-resources
- python3-setuptools
- python3-dateutil
- python3-six
- python3-cerberus
- python3-urllib3
- python3-defusedxml
- python3-yaml
Expand Down
2 changes: 0 additions & 2 deletions vars/debian-bookworm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ aminer_packages:
- python3-tz
- python3-scipy
- python3-numpy
- python3-pkg-resources
- python3-setuptools
- python3-dateutil
- python3-six
- python3-cerberus
- python3-kafka
- python3-urllib3
- python3-statsmodels
Expand Down
2 changes: 0 additions & 2 deletions vars/debian-bullseye.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ aminer_packages:
- python3-tz
- python3-scipy
- python3-numpy
- python3-pkg-resources
- python3-setuptools
- python3-dateutil
- python3-six
- python3-cerberus
- python3-kafka
- python3-urllib3
- python3-statsmodels
Expand Down
1 change: 0 additions & 1 deletion vars/debian-buster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ aminer_packages:
- python3-tz
- python3-scipy
- python3-numpy
- python3-pkg-resources
- python3-setuptools
- python3-dateutil
- python3-six
Expand Down
2 changes: 0 additions & 2 deletions vars/fedora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ aminer_packages:
- python3-pytz
- python3-scipy
- python3-numpy
- python3-pkg-resources
- python3-setuptools
- python3-dateutil
- python3-six
- python3-cerberus
- python3-kafka
- python3-urllib3
- python3-statsmodels
Expand Down
2 changes: 0 additions & 2 deletions vars/ubuntu-2004.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ aminer_packages:
- python3-tz
- python3-scipy
- python3-numpy
- python3-pkg-resources
- python3-setuptools
- python3-dateutil
- python3-six
- python3-cerberus
- python3-kafka
- python3-urllib3
- python3-statsmodels
Expand Down
2 changes: 0 additions & 2 deletions vars/ubuntu-2204.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ aminer_packages:
- python3-tz
- python3-scipy
- python3-numpy
- python3-pkg-resources
- python3-setuptools
- python3-dateutil
- python3-six
- python3-cerberus
- python3-kafka
- python3-urllib3
- python3-statsmodels
Expand Down