From nobody Mon Nov 1 21:29:20 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D473E183FC2C; Mon, 1 Nov 2021 21:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HjmPs2D5Vz4vQC; Mon, 1 Nov 2021 21:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E3DE818C2E; Mon, 1 Nov 2021 21:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1A1LTKHB071810; Mon, 1 Nov 2021 21:29:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A1LTK0D071809; Mon, 1 Nov 2021 21:29:20 GMT (envelope-from git) Date: Mon, 1 Nov 2021 21:29:20 GMT Message-Id: <202111012129.1A1LTK0D071809@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 8ad9338b22e7 - main - biology/libsbml: Fix build with Python 3.10 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ad9338b22e7ee14b690dfedfe5ad6c248c68dbf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ad9338b22e7ee14b690dfedfe5ad6c248c68dbf commit 8ad9338b22e7ee14b690dfedfe5ad6c248c68dbf Author: Po-Chuan Hsieh AuthorDate: 2021-11-01 21:18:34 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-11-01 21:28:40 +0000 biology/libsbml: Fix build with Python 3.10 Obtained from: https://github.com/sbmlteam/libsbml/commit/4f01a15fde1d8afa9eaffb4c13dfc83a3404f183 (based on) --- biology/libsbml/Makefile | 2 +- ...-bindings-python-doc-converter-rewrite_pydoc.py | 279 +++++++++++++++++++++ 2 files changed, 280 insertions(+), 1 deletion(-) diff --git a/biology/libsbml/Makefile b/biology/libsbml/Makefile index 39e627a55eff..a682cbdb522e 100644 --- a/biology/libsbml/Makefile +++ b/biology/libsbml/Makefile @@ -35,7 +35,7 @@ LIBXML2_USE= GNOME=libxml2 LIBXML2_USES= gnome PYTHON_BUILD_DEPENDS= swig:devel/swig PYTHON_CMAKE_BOOL= WITH_PYTHON -PYTHON_USES= python:-3.9 +PYTHON_USES= python:3.6+ PYTHON_CMAKE_ON= WITH_SWIG RUBY_BUILD_DEPENDS= swig:devel/swig RUBY_CMAKE_BOOL= WITH_RUBY diff --git a/biology/libsbml/files/patch-src-bindings-python-doc-converter-rewrite_pydoc.py b/biology/libsbml/files/patch-src-bindings-python-doc-converter-rewrite_pydoc.py new file mode 100644 index 000000000000..fb1a6b0be7d9 --- /dev/null +++ b/biology/libsbml/files/patch-src-bindings-python-doc-converter-rewrite_pydoc.py @@ -0,0 +1,279 @@ +Obtained from: https://github.com/sbmlteam/libsbml/commit/4f01a15fde1d8afa9eaffb4c13dfc83a3404f183 (based on) + +--- src/bindings/python/doc-converter/rewrite_pydoc.py.orig 2020-11-25 11:03:01 UTC ++++ src/bindings/python/doc-converter/rewrite_pydoc.py +@@ -118,7 +118,273 @@ import re + import sys + import os + import textwrap +-from formatter import NullWriter, AbstractFormatter ++try: ++ from formatter import NullWriter, AbstractFormatter ++except Exception: ++ # issue 173 these classes have been removed in 3.10, so ++ # as per the 3.10 release notes: Existing users should copy whatever ++ # classes they use into their code. (Contributed by Dong-hee Na and ++ # Terry J. Reedy in bpo-42299.) ++ # ++ # So here they are: ++ ++ ++ class NullWriter: ++ """Minimal writer interface to use in testing & inheritance. ++ ++ A writer which only provides the interface definition; no actions are ++ taken on any methods. This should be the base class for all writers ++ which do not need to inherit any implementation methods. ++ ++ """ ++ def __init__(self): pass ++ def flush(self): pass ++ def new_alignment(self, align): pass ++ def new_font(self, font): pass ++ def new_margin(self, margin, level): pass ++ def new_spacing(self, spacing): pass ++ def new_styles(self, styles): pass ++ def send_paragraph(self, blankline): pass ++ def send_line_break(self): pass ++ def send_hor_rule(self, *args, **kw): pass ++ def send_label_data(self, data): pass ++ def send_flowing_data(self, data): pass ++ def send_literal_data(self, data): pass ++ ++ class AbstractFormatter: ++ """The standard formatter. ++ ++ This implementation has demonstrated wide applicability to many writers, ++ and may be used directly in most circumstances. It has been used to ++ implement a full-featured World Wide Web browser. ++ ++ """ ++ ++ # Space handling policy: blank spaces at the boundary between elements ++ # are handled by the outermost context. "Literal" data is not checked ++ # to determine context, so spaces in literal data are handled directly ++ # in all circumstances. ++ ++ def __init__(self, writer): ++ self.writer = writer # Output device ++ self.align = None # Current alignment ++ self.align_stack = [] # Alignment stack ++ self.font_stack = [] # Font state ++ self.margin_stack = [] # Margin state ++ self.spacing = None # Vertical spacing state ++ self.style_stack = [] # Other state, e.g. color ++ self.nospace = 1 # Should leading space be suppressed ++ self.softspace = 0 # Should a space be inserted ++ self.para_end = 1 # Just ended a paragraph ++ self.parskip = 0 # Skipped space between paragraphs? ++ self.hard_break = 1 # Have a hard break ++ self.have_label = 0 ++ ++ def end_paragraph(self, blankline): ++ if not self.hard_break: ++ self.writer.send_line_break() ++ self.have_label = 0 ++ if self.parskip < blankline and not self.have_label: ++ self.writer.send_paragraph(blankline - self.parskip) ++ self.parskip = blankline ++ self.have_label = 0 ++ self.hard_break = self.nospace = self.para_end = 1 ++ self.softspace = 0 ++ ++ def add_line_break(self): ++ if not (self.hard_break or self.para_end): ++ self.writer.send_line_break() ++ self.have_label = self.parskip = 0 ++ self.hard_break = self.nospace = 1 ++ self.softspace = 0 ++ ++ def add_hor_rule(self, *args, **kw): ++ if not self.hard_break: ++ self.writer.send_line_break() ++ self.writer.send_hor_rule(*args, **kw) ++ self.hard_break = self.nospace = 1 ++ self.have_label = self.para_end = self.softspace = self.parskip = 0 ++ ++ def add_label_data(self, format, counter, blankline = None): ++ if self.have_label or not self.hard_break: ++ self.writer.send_line_break() ++ if not self.para_end: ++ self.writer.send_paragraph((blankline and 1) or 0) ++ if isinstance(format, str): ++ self.writer.send_label_data(self.format_counter(format, counter)) ++ else: ++ self.writer.send_label_data(format) ++ self.nospace = self.have_label = self.hard_break = self.para_end = 1 ++ self.softspace = self.parskip = 0 ++ ++ def format_counter(self, format, counter): ++ label = '' ++ for c in format: ++ if c == '1': ++ label = label + ('%d' % counter) ++ elif c in 'aA': ++ if counter > 0: ++ label = label + self.format_letter(c, counter) ++ elif c in 'iI': ++ if counter > 0: ++ label = label + self.format_roman(c, counter) ++ else: ++ label = label + c ++ return label ++ ++ def format_letter(self, case, counter): ++ label = '' ++ while counter > 0: ++ counter, x = divmod(counter-1, 26) ++ # This makes a strong assumption that lowercase letters ++ # and uppercase letters form two contiguous blocks, with ++ # letters in order! ++ s = chr(ord(case) + x) ++ label = s + label ++ return label ++ ++ def format_roman(self, case, counter): ++ ones = ['i', 'x', 'c', 'm'] ++ fives = ['v', 'l', 'd'] ++ label, index = '', 0 ++ # This will die of IndexError when counter is too big ++ while counter > 0: ++ counter, x = divmod(counter, 10) ++ if x == 9: ++ label = ones[index] + ones[index+1] + label ++ elif x == 4: ++ label = ones[index] + fives[index] + label ++ else: ++ if x >= 5: ++ s = fives[index] ++ x = x-5 ++ else: ++ s = '' ++ s = s + ones[index]*x ++ label = s + label ++ index = index + 1 ++ if case == 'I': ++ return label.upper() ++ return label ++ ++ def add_flowing_data(self, data): ++ if not data: return ++ prespace = data[:1].isspace() ++ postspace = data[-1:].isspace() ++ data = " ".join(data.split()) ++ if self.nospace and not data: ++ return ++ elif prespace or self.softspace: ++ if not data: ++ if not self.nospace: ++ self.softspace = 1 ++ self.parskip = 0 ++ return ++ if not self.nospace: ++ data = ' ' + data ++ self.hard_break = self.nospace = self.para_end = \ ++ self.parskip = self.have_label = 0 ++ self.softspace = postspace ++ self.writer.send_flowing_data(data) ++ ++ def add_literal_data(self, data): ++ if not data: return ++ if self.softspace: ++ self.writer.send_flowing_data(" ") ++ self.hard_break = data[-1:] == '\n' ++ self.nospace = self.para_end = self.softspace = \ ++ self.parskip = self.have_label = 0 ++ self.writer.send_literal_data(data) ++ ++ def flush_softspace(self): ++ if self.softspace: ++ self.hard_break = self.para_end = self.parskip = \ ++ self.have_label = self.softspace = 0 ++ self.nospace = 1 ++ self.writer.send_flowing_data(' ') ++ ++ def push_alignment(self, align): ++ if align and align != self.align: ++ self.writer.new_alignment(align) ++ self.align = align ++ self.align_stack.append(align) ++ else: ++ self.align_stack.append(self.align) ++ ++ def pop_alignment(self): ++ if self.align_stack: ++ del self.align_stack[-1] ++ if self.align_stack: ++ self.align = align = self.align_stack[-1] ++ self.writer.new_alignment(align) ++ else: ++ self.align = None ++ self.writer.new_alignment(None) ++ ++ def push_font(self, font): ++ size, i, b, tt = font ++ if self.softspace: ++ self.hard_break = self.para_end = self.softspace = 0 ++ self.nospace = 1 ++ self.writer.send_flowing_data(' ') ++ if self.font_stack: ++ csize, ci, cb, ctt = self.font_stack[-1] ++ if size is AS_IS: size = csize ++ if i is AS_IS: i = ci ++ if b is AS_IS: b = cb ++ if tt is AS_IS: tt = ctt ++ font = (size, i, b, tt) ++ self.font_stack.append(font) ++ self.writer.new_font(font) ++ ++ def pop_font(self): ++ if self.font_stack: ++ del self.font_stack[-1] ++ if self.font_stack: ++ font = self.font_stack[-1] ++ else: ++ font = None ++ self.writer.new_font(font) ++ ++ def push_margin(self, margin): ++ self.margin_stack.append(margin) ++ fstack = filter(None, self.margin_stack) ++ if not margin and fstack: ++ margin = fstack[-1] ++ self.writer.new_margin(margin, len(fstack)) ++ ++ def pop_margin(self): ++ if self.margin_stack: ++ del self.margin_stack[-1] ++ fstack = filter(None, self.margin_stack) ++ if fstack: ++ margin = fstack[-1] ++ else: ++ margin = None ++ self.writer.new_margin(margin, len(fstack)) ++ ++ def set_spacing(self, spacing): ++ self.spacing = spacing ++ self.writer.new_spacing(spacing) ++ ++ def push_style(self, *styles): ++ if self.softspace: ++ self.hard_break = self.para_end = self.softspace = 0 ++ self.nospace = 1 ++ self.writer.send_flowing_data(' ') ++ for style in styles: ++ self.style_stack.append(style) ++ self.writer.new_styles(tuple(self.style_stack)) ++ ++ def pop_style(self, n=1): ++ del self.style_stack[-n:] ++ self.writer.new_styles(tuple(self.style_stack)) ++ ++ def assert_line_data(self, flag=1): ++ self.nospace = self.hard_break = not flag ++ self.para_end = self.parskip = self.have_label = 0 ++ ++ + try: + from htmllib import HTMLParser + except Exception: