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

Jump to bottom

Fixes #14881: Move away from python 2 to python 3 #1910

Merged
merged 1 commit into from
May 14, 2019
Merged

Fixes #14881: Move away from python 2 to python 3 #1910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions rudder-server-relay/SPECS/dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sles-12:python-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel
sles-15:python-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel
rhel-7:python-devel selinux-policy-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel
sles-12:python3-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel
sles-15:python3-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel
rhel-7:python3-devel selinux-policy-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel
rust:yes
6 changes: 3 additions & 3 deletions rudder-server-relay/SPECS/rudder-server-relay.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ AutoReq: 0
AutoProv: 0

## General
BuildRequires: python, python-devel, pkgconfig, postgresql-devel, openssl-devel, zlib-devel, xz-devel
Requires: rudder-agent >= %{real_epoch}:%{real_version}, rsyslog, openssl, %{apache}, %{apache_tools}, python, binutils, xz, zlib, postgresql
BuildRequires: python3, python3-devel, pkgconfig, postgresql-devel, openssl-devel, zlib-devel, xz-devel
Requires: rudder-agent >= %{real_epoch}:%{real_version}, rsyslog, openssl, %{apache}, %{apache_tools}, python3, binutils, xz, zlib, postgresql
## RHEL
%if 0%{?rhel}
Requires: mod_ssl mod_wsgi shadow-utils crontabs
Expand All @@ -78,7 +78,7 @@ BuildRequires: selinux-policy-devel

## SLES
%if 0%{?suse_version}
Requires: apache2-mod_wsgi pwdutils cron python-pyOpenSSL
Requires: apache2-mod_wsgi pwdutils cron
%endif

%description
Expand Down
4 changes: 2 additions & 2 deletions rudder-server-relay/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ Source: rudder-server-relay
Section: web
Priority: extra
Maintainer: Rudder Team <dev@rudder.io>
Build-Depends: debhelper (>= 9), python, libpython-dev | libpython2.7-dev | python2.7-dev, ca-certificates, curl, pkg-config, libpq-dev, libssl-dev, zlib1g-dev, lzma-dev
Build-Depends: debhelper (>= 9), python3, libpython3-dev | python3-dev, ca-certificates, curl, pkg-config, libpq-dev, libssl-dev, zlib1g-dev, lzma-dev
Standards-Version: 3.8.0
Homepage: https://www.rudder.io

Package: rudder-server-relay
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python, rudder-agent (>= ${binary:Version}), apache2, apache2-utils, rsyslog, openssl, libapache2-mod-wsgi, cron, binutils, xz-utils, zlib1g, libpq, systemd
Depends: ${shlibs:Depends}, ${misc:Depends}, python3, rudder-agent (>= ${binary:Version}), apache2, apache2-utils, rsyslog, openssl, libapache2-mod-wsgi, cron, binutils, xz-utils, zlib1g, libpq, systemd
Description: Configuration management and audit tool - Server relay package
Rudder is an open source configuration management and audit solution.
.
Expand Down
3 changes: 1 addition & 2 deletions rudder-webapp/SOURCES/rudder-metrics-reporting
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/python
#!/usr/bin/python3

from __future__ import print_function
Copy link
Contributor

Choose a reason for hiding this comment

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

this is mandatory to make the script work in python2 for rhel7

#####################################################################################
# Copyright 2014 Normation SAS
#####################################################################################
Expand Down
4 changes: 3 additions & 1 deletion rudder-webapp/SPECS/dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
rhel-7:java-1.8.0-openjdk-devel selinux-policy-devel
sles-12:python3-devel
sles-15:python3-devel
rhel-7:python3-devel java-1.8.0-openjdk-devel selinux-policy-devel
java:jdk
6 changes: 3 additions & 3 deletions rudder-webapp/SPECS/rudder-webapp.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ AutoReq: 0
AutoProv: 0

# Add Requires here - order is important
BuildRequires: python
Requires: python
BuildRequires: python3
Requires: python3

# Smooth upgrade
Obsoletes: ncf, ncf-api-virtualenv, rudder-techniques
Expand Down Expand Up @@ -112,7 +112,7 @@ Requires: perl-Digest-SHA
## SLES
%if 0%{?suse_version}
BuildRequires: jdk >= 1.8
Requires: apache2 apache2-mod_wsgi pwdutils python-pyOpenSSL
Requires: apache2 apache2-mod_wsgi pwdutils
%endif

%if 0%{?sle_version} && 0%{?sle_version} >= 150000
Expand Down
4 changes: 2 additions & 2 deletions rudder-webapp/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ Source: rudder-webapp
Section: web
Priority: extra
Maintainer: Rudder packaging team <rudder-packaging@rudder-project.org>
Build-Depends: debhelper (>= 9), python, ca-certificates, curl, openjdk-8-jdk-headless
Build-Depends: debhelper (>= 9), python3, ca-certificates, curl, openjdk-8-jdk-headless
Standards-Version: 3.8.0
Homepage: http://www.rudder-project.org

Package: rudder-webapp
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, systemd, python, rudder-ldap (= ${binary:Version}), rudder-server-relay (= ${binary:Version}), apache2, apache2-utils, libapache2-mod-wsgi, git-core, rsync, lsb-release, openssl, ldap-utils, postgresql-client (>=9.2), java8-runtime-headless | openjdk-8-jre-headless | oracle-java8-installer, curl
Depends: ${shlibs:Depends}, ${misc:Depends}, systemd, python3, rudder-ldap (= ${binary:Version}), rudder-server-relay (= ${binary:Version}), apache2, apache2-utils, libapache2-mod-wsgi, git-core, rsync, lsb-release, openssl, ldap-utils, postgresql-client (>=9.2), java8-runtime-headless | openjdk-8-jre-headless | oracle-java8-installer, curl
Breaks: ncf, ncf-api-virtualenv, rudder-techniques, rudder-inventory-endpoint, rudder-jetty
Replaces: ncf, ncf-api-virtualenv, rudder-techniques, rudder-inventory-endpoint, rudder-jetty
Description: Configuration management and audit tool - webapp
Expand Down