Skip to content

build: remove python2 support#1520

Merged
BareosBot merged 16 commits intobareos:masterfrom
pstorz:dev/pstorz/master/remove-python2-support
Aug 24, 2023
Merged

build: remove python2 support#1520
BareosBot merged 16 commits intobareos:masterfrom
pstorz:dev/pstorz/master/remove-python2-support

Conversation

@pstorz
Copy link
Member

@pstorz pstorz commented Aug 8, 2023

Python 2 is already EOL since January 1, 2020. This PR now removes Python2 support from bareos.

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

Make sure you check/merge the PR using devtools/pr-tool to have some simple automated checks run and a proper changelog record added.

General
  • git.bareos.com/bareos/CD PR-1520 needs to be merged for windows build
  • Is the PR title usable as CHANGELOG entry?
  • Purpose of the PR is understood
  • Commit descriptions are understandable and well formatted
  • Check backport line
  • Required backport PRs have been created
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR

Copy link
Member

@arogge arogge left a comment

Choose a reason for hiding this comment

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

Mostly trivial stuff. However, I'm not sure if the new python ldap plugin will still be tested with the patch applied. Maybe we need to double-check.

if(Python2_FOUND)
list(APPEND DEBIAN_CONTROL_SNIPPETS "bareos-filedaemon-python2-plugin")
endif()
if(ENABLE_PYTHON AND Python3_FOUND)
Copy link
Member

Choose a reason for hiding this comment

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

the next if is redundant

AND ENABLE_PYTHON
AND (Python2_FOUND OR Python3_FOUND)
AND Python3_FOUND
)
Copy link
Member

Choose a reason for hiding this comment

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

the next if is redundant

Comment on lines 60 to 62
%if ! 0%{?skip_python3}
%py3_build
%endif
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
%if ! 0%{?skip_python3}
%py3_build
%endif
%py3_build

%endif

%if ! 0%{?skip_python3}
%py3_install
Copy link
Member

Choose a reason for hiding this comment

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

here the if is also not needed

@arogge arogge added the removal this PR removes functionality label Aug 22, 2023
@arogge arogge force-pushed the dev/pstorz/master/remove-python2-support branch 2 times, most recently from d84a181 to ca0071e Compare August 23, 2023 14:51
@arogge arogge force-pushed the dev/pstorz/master/remove-python2-support branch from ca0071e to a9e16a1 Compare August 24, 2023 08:02
@BareosBot BareosBot force-pushed the dev/pstorz/master/remove-python2-support branch from 186c969 to 77a2d34 Compare August 24, 2023 09:10
@BareosBot BareosBot merged commit 4acf3b1 into bareos:master Aug 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

removal this PR removes functionality

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants