#1 Update to 2.3.0 and add Python 3 support
Merged 2 years ago by ishcherb. Opened 2 years ago by ishcherb.
rpms/ ishcherb/python-bucky master  into  master

file modified
+1

@@ -3,3 +3,4 @@ 

  /bucky-0.2.4.tar.gz

  /bucky-0.2.6.tar.gz

  /bucky-2.2.2.tar.gz

+ /bucky-2.3.0.tar.gz

file modified
+48 -11

@@ -1,20 +1,20 @@ 

- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}

- 

  Name:           python-bucky

- Version:        2.2.2

- Release:        10%{?dist}

+ Version:        2.3.0

+ Release:        1%{?dist}

  Summary:        CollectD and StatsD adapter for Graphite

  

  Group:          System Environment/Daemons

  License:        ASL 2.0

  URL:            http://pypi.python.org/pypi/bucky

  

- Source0:        http://pypi.python.org/packages/source/b/bucky/bucky-%{version}.tar.gz

+ Source0:        https://files.pythonhosted.org/packages/source/b/bucky/bucky-%{version}.tar.gz

  Source1:        python-bucky-example.conf

  Source2:        python-bucky-supervisord-example.conf

  

  BuildArch:      noarch

+ 

  BuildRequires:  python2-devel, python2-setuptools

+ BuildRequires:  python3-devel, python3-setuptools

  

  %global _description\

  Bucky is a small server for collecting and translating metrics for\

@@ -25,23 +25,44 @@ 

  

  %package -n python2-bucky

  Summary: %summary

- Requires:       collectd, python2-setuptools, python2-watchdog, python2-setproctitle

+ Requires:       collectd

+ Requires:       python2-six

+ Requires:       python2-setuptools

+ Requires:       python2-watchdog

+ Requires:       python2-setproctitle

+ Requires:       python2-crypto

  %{?python_provide:%python_provide python2-bucky}

  

  %description -n python2-bucky %_description

  

+ %package -n python3-bucky

+ Summary: %summary

+ Requires:       collectd

+ Requires:       python3-six

+ Requires:       python3-setuptools

+ Requires:       python3-watchdog

+ Requires:       python3-setproctitle

+ Requires:       python3-crypto

+ %{?python_provide:%python_provide python3-bucky}

+ 

+ %description -n python3-bucky %_description

+ 

  %prep

  %setup -q -n bucky-%{version}

  %{__install} -m 644 %{SOURCE2} .

  

  

  %build

- %{__python} setup.py build

+ %py2_build

+ %py3_build

  

  

  %install

- rm -rf $RPM_BUILD_ROOT

- %{__python} setup.py install -O1 --skip-build --root %{buildroot}

+ %py2_install

+ # Delete the Python 2 executable so that the Python 3

+ # version can take it's place.

+ rm -rf %{_bindir}/bucky

+ %py3_install

  %{__mkdir_p} %{buildroot}%{_localstatedir}/log/bucky

  %{__mkdir_p} %{buildroot}%{_localstatedir}/run/bucky

  %{__mkdir_p} %{buildroot}%{_sysconfdir}/bucky

@@ -63,15 +84,31 @@ 

  

   

  %files -n python2-bucky

- %doc THANKS README.rst LICENSE python-bucky-supervisord-example.conf

+ %license LICENSE

+ %doc THANKS README.rst python-bucky-supervisord-example.conf

+ %attr(-,bucky,bucky) %{_localstatedir}/log/bucky

+ %attr(-,bucky,bucky) %{_localstatedir}/run/bucky

+ %config(noreplace) %{_sysconfdir}/bucky/bucky.conf

+ %{python2_sitelib}/bucky/

+ %{python2_sitelib}/bucky-%{version}-py?.?.egg-info

+ 

+ %files -n python3-bucky

+ %license LICENSE

+ %doc THANKS README.rst python-bucky-supervisord-example.conf

  %{_bindir}/bucky

  %attr(-,bucky,bucky) %{_localstatedir}/log/bucky

  %attr(-,bucky,bucky) %{_localstatedir}/run/bucky

  %config(noreplace) %{_sysconfdir}/bucky/bucky.conf

- %{python_sitelib}/*

+ %{python3_sitelib}/bucky/

+ %{python3_sitelib}/bucky-%{version}-py?.?.egg-info

  

  

  %changelog

+ * Fri Apr 13 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.3.0-1

+ - Add Python 3 subpackage and modernize spec file

+ - Add a missing dependency on python2/3-crypto

+ - Update to version 2.3.0

+ 

  * Wed Feb 14 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.2.2-10

  - Update Python 2 dependency declarations to new packaging standards

    (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- 258ed64258b468d15328ec4ef9633580  bucky-2.2.2.tar.gz

+ SHA512 (bucky-2.3.0.tar.gz) = c9e3e028990be98f2120bcc701ec4cafadb6b983fefcbe0a5969c5bd8ee587bc7db4e37a411193343ae29016cb35b31a8be16e3afbbd1d3da1dca81c27306c38

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1367012

  • Update to 2.3.0
  • Provide Python 3 subpackage
  • Modernize spec to use macros

rebased onto 6fd6b2f

2 years ago

Pull-Request has been merged by ishcherb

2 years ago