Accepting request 847778 from home:matwey:branches:devel:languages:python

- Version 0.7
- Fix CInf parse
- Drop make_sphinx_optional.patch

OBS-URL: https://build.opensuse.org/request/show/847778
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pybeam?expand=0&rev=34
This commit is contained in:
Matej Cepl 2020-11-11 16:20:44 +00:00 committed by Git OBS Bridge
parent a56bbe86a5
commit e772bc73a4
5 changed files with 11 additions and 71 deletions

View File

@ -1,65 +0,0 @@
From c1b08b470291b8f9334e600563efa6d2651c2a66 Mon Sep 17 00:00:00 2001
From: StefanBruens <stefan.bruens@rwth-aachen.de>
Date: Sun, 15 Dec 2019 02:29:27 +0100
Subject: [PATCH] Do no require Sphinx when doing just a regular build
Only the 'build_sphinx' command requires sphinx, so do the
import from the command.
---
setup.py | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/setup.py b/setup.py
index 2057839..04a5917 100644
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,27 @@
-from setuptools import find_packages, setup
-from sphinx.setup_command import BuildDoc
-cmdclass = {'build_sphinx': BuildDoc}
+from setuptools import find_packages, setup, Command
name="pybeam"
version="0.6"
test_suite="test"
+class BuildSphinx(Command):
+ description = 'Build Sphinx documentation'
+ user_options = []
+
+ def initialize_options(self):
+ pass
+
+ def finalize_options(self):
+ pass
+
+ def run(self):
+ import sphinx.cmd.build as scb
+ scb.build_main(['-b', 'html',
+ '-D', 'project=' + name,
+ '-D', 'version=' + version,
+ '-D', 'release=' + version,
+ './doc', './build/html'])
+
setup(name=name,
version=version,
description='Python module to parse Erlang BEAM files',
@@ -15,13 +31,6 @@ setup(name=name,
license='MIT',
packages=find_packages(exclude=(test_suite,)),
test_suite=test_suite,
- install_requires=['construct>=2.9,<2.11', 'six', 'sphinx'],
- command_options={
- 'build_sphinx': {
- 'project': ('setup.py', name),
- 'version': ('setup.py', version),
- 'release': ('setup.py', version),
- 'source_dir': ('setup.py', 'doc')
- }
- },
+ install_requires=['construct>=2.9,<2.11', 'six'],
+ cmdclass = {'build_sphinx': BuildSphinx},
zip_safe=False)
--
2.24.0

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dbbc2ca76308f5dd502938c029ad1bf6b968f177c262e4881c32d820640ead6a
size 11363

BIN
pybeam-0.7.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Nov 5 15:33:34 UTC 2020 - Matwey Kornilov <matwey.kornilov@gmail.com>
- Version 0.7
- Fix CInf parse
- Drop make_sphinx_optional.patch
-------------------------------------------------------------------
Fri Feb 14 09:50:49 UTC 2020 - Matwey Kornilov <matwey.kornilov@gmail.com>

View File

@ -26,14 +26,13 @@
%bcond_with test
%endif
Name: python-pybeam%{?psuffix}
Version: 0.6
Version: 0.7
Release: 0
Summary: Python module to parse Erlang BEAM files
License: MIT
Group: Development/Languages/Python
URL: https://github.com/matwey/pybeam
Source: https://files.pythonhosted.org/packages/source/p/pybeam/pybeam-%{version}.tar.gz
Patch0: make_sphinx_optional.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@ -64,7 +63,6 @@ chunks in pretty python format.
%prep
%setup -q -n pybeam-%{version}
%patch0 -p1
%build
%if %{without test}