This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-cli. from b050d3e pyhoca-cli.spec: use modern python build and install macros. new 4f98092 setup.py: backport Python 2 support via io.open. new 6ebecc4 pyhoca-cli.spec: Build-Require python-rpm-macros for OpenSuSE builds. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ pyhoca-cli.spec | 3 +++ setup.py | 6 ++++++ 3 files changed, 11 insertions(+) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-cli. commit 4f98092b4f933d4facfe26e1be9f5e19be6b256b Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 10 13:35:57 2018 +0100 setup.py: backport Python 2 support via io.open. --- debian/changelog | 1 + setup.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4f98e35..087f1d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (0.6.0.1): + - setup.py: backport Python 2 support via io.open. * pyhoca-cli.spec: - Build with Python 2 on CentOS, drop python3-argparse dependency (part of stdlib). diff --git a/setup.py b/setup.py index 6376de7..878e68b 100755 --- a/setup.py +++ b/setup.py @@ -22,6 +22,12 @@ import os from setuptools import setup +# Specifying file encoding at open time only works with Python 3 directly, +# but Python >2.6 has some support for this in the IO module. +# It's said to be slow, but we can live with that. +if sys.version_info[0] < 3: + from io import open + __VERSION__ = "0.0.0.0" for line in open(os.path.join('pyhoca', 'cli', '__init__.py'),encoding='utf-8').readlines(): if (line.startswith('__VERSION__')): -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-cli. commit 6ebecc40fd9c0eb38e8063e056e6bc035be898c2 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 10 13:39:46 2018 +0100 pyhoca-cli.spec: Build-Require python-rpm-macros for OpenSuSE builds. --- debian/changelog | 1 + pyhoca-cli.spec | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 087f1d2..28d16cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium - It's still %endif, not %fi. - Either EL6 or EL7, not both at the same time. - Use modern python build and install macros. + - Build-Require python-rpm-macros for OpenSuSE builds. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 19 Sep 2018 15:20:43 +0200 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index f35650e..050dedf 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -26,6 +26,9 @@ Requires: python3-x2go >= 0.6.0.1 %endif %if 0%{?suse_version} BuildRequires: fdupes +%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) +BuildRequires: python-rpm-macros +%endif %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
-
git-admin＠x2go.org