March 2023 - openSUSE Commits - openSUSE Mailing Lists

commit python-Markdown for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-Markdown for openSUSE:Factory checked in at 2023-03-31 21:14:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Markdown (Old) and /work/SRC/openSUSE:Factory/.python-Markdown.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Markdown" Fri Mar 31 21:14:07 2023 rev:40 rq:1074478 version:3.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Markdown/python-Markdown.changes 2022-08-04 13:23:20.368477554 +0200 +++ /work/SRC/openSUSE:Factory/.python-Markdown.new.31432/python-Markdown.changes 2023-03-31 21:14:11.506087020 +0200 @@ -1,0 +2,12 @@ +Fri Mar 24 17:07:05 UTC 2023 - Beno��t Monin <benoit.monin(a)gmx.fr> + +- update to version 3.4.3: bug-fix release + * Restore console script (#1327). +- additional changes from version 3.4.2: bug-fix release + * Improve standalone * and _ parsing (#1300). + * Consider <html> HTML tag a block-level element (#1309). + * Officially support Python 3.11. + * Switch from setup.py to pyproject.toml. +- drop macros in spec file: already provided by python-rpm-macros + +------------------------------------------------------------------- Old: ---- Markdown-3.4.1.tar.gz New: ---- Markdown-3.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Markdown.spec ++++++ --- /var/tmp/diff_new_pack.HTRWTq/_old 2023-03-31 21:14:12.010088817 +0200 +++ /var/tmp/diff_new_pack.HTRWTq/_new 2023-03-31 21:14:12.014088831 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-Markdown # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,8 @@ # -%define skip_python2 1 -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define oldpython python Name: python-Markdown -Version: 3.4.1 +Version: 3.4.3 Release: 0 Summary: Python implementation of Markdown License: BSD-3-Clause ++++++ Markdown-3.4.1.tar.gz -> Markdown-3.4.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/MANIFEST.in new/Markdown-3.4.3/MANIFEST.in --- old/Markdown-3.4.1/MANIFEST.in 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/MANIFEST.in 2023-03-23 14:15:27.000000000 +0100 @@ -1,8 +1,6 @@ recursive-include markdown *.py recursive-include docs * recursive-include tests *.txt *.html *.py -include setup.py -include setup.cfg include makefile include LICENSE.md include README.md diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/Markdown.egg-info/PKG-INFO new/Markdown-3.4.3/Markdown.egg-info/PKG-INFO --- old/Markdown-3.4.1/Markdown.egg-info/PKG-INFO 2022-07-15 21:15:35.000000000 +0200 +++ new/Markdown-3.4.3/Markdown.egg-info/PKG-INFO 2023-03-23 14:15:38.000000000 +0100 @@ -1,16 +1,47 @@ Metadata-Version: 2.1 Name: Markdown -Version: 3.4.1 -Summary: Python implementation of Markdown. -Home-page: https://Python-Markdown.github.io/ -Author: Manfred Stienstra, Yuri takhteyev and Waylan limberg -Author-email: python.markdown(a)gmail.com -Maintainer: Waylan Limberg -Maintainer-email: python.markdown(a)gmail.com -License: BSD License +Version: 3.4.3 +Summary: Python implementation of John Gruber's Markdown. +Author: Manfred Stienstra, Yuri Takhteyev +Author-email: Waylan limberg <python.markdown(a)gmail.com> +Maintainer: Isaac Muse +Maintainer-email: Waylan Limberg <python.markdown(a)gmail.com> +License: Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later) + Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b) + Copyright 2004 Manfred Stienstra (the original version) + + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the Python Markdown Project nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''AS IS'' AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +Project-URL: Homepage, https://Python-Markdown.github.io/ Project-URL: Documentation, https://Python-Markdown.github.io/ -Project-URL: GitHub Project, https://github.com/Python-Markdown/markdown +Project-URL: Repository, https://github.com/Python-Markdown/markdown Project-URL: Issue Tracker, https://github.com/Python-Markdown/markdown/issues +Project-URL: Changelog, https://github.com/Python-Markdown/markdown/blob/master/docs/change_log/ind… +Keywords: markdown,markdown-parser,python-markdown,markdown-to-html Classifier: Development Status :: 5 - Production/Stable Classifier: License :: OSI Approved :: BSD License Classifier: Operating System :: OS Independent @@ -20,6 +51,7 @@ Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: 3.10 +Classifier: Programming Language :: Python :: 3.11 Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/Markdown.egg-info/SOURCES.txt new/Markdown-3.4.3/Markdown.egg-info/SOURCES.txt --- old/Markdown-3.4.1/Markdown.egg-info/SOURCES.txt 2022-07-15 21:15:35.000000000 +0200 +++ new/Markdown-3.4.3/Markdown.egg-info/SOURCES.txt 2023-03-23 14:15:38.000000000 +0100 @@ -6,8 +6,6 @@ makefile mkdocs.yml pyproject.toml -setup.cfg -setup.py Markdown.egg-info/PKG-INFO Markdown.egg-info/SOURCES.txt Markdown.egg-info/dependency_links.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/PKG-INFO new/Markdown-3.4.3/PKG-INFO --- old/Markdown-3.4.1/PKG-INFO 2022-07-15 21:15:35.000000000 +0200 +++ new/Markdown-3.4.3/PKG-INFO 2023-03-23 14:15:38.000000000 +0100 @@ -1,16 +1,47 @@ Metadata-Version: 2.1 Name: Markdown -Version: 3.4.1 -Summary: Python implementation of Markdown. -Home-page: https://Python-Markdown.github.io/ -Author: Manfred Stienstra, Yuri takhteyev and Waylan limberg -Author-email: python.markdown(a)gmail.com -Maintainer: Waylan Limberg -Maintainer-email: python.markdown(a)gmail.com -License: BSD License +Version: 3.4.3 +Summary: Python implementation of John Gruber's Markdown. +Author: Manfred Stienstra, Yuri Takhteyev +Author-email: Waylan limberg <python.markdown(a)gmail.com> +Maintainer: Isaac Muse +Maintainer-email: Waylan Limberg <python.markdown(a)gmail.com> +License: Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later) + Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b) + Copyright 2004 Manfred Stienstra (the original version) + + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the Python Markdown Project nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''AS IS'' AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +Project-URL: Homepage, https://Python-Markdown.github.io/ Project-URL: Documentation, https://Python-Markdown.github.io/ -Project-URL: GitHub Project, https://github.com/Python-Markdown/markdown +Project-URL: Repository, https://github.com/Python-Markdown/markdown Project-URL: Issue Tracker, https://github.com/Python-Markdown/markdown/issues +Project-URL: Changelog, https://github.com/Python-Markdown/markdown/blob/master/docs/change_log/ind… +Keywords: markdown,markdown-parser,python-markdown,markdown-to-html Classifier: Development Status :: 5 - Production/Stable Classifier: License :: OSI Approved :: BSD License Classifier: Operating System :: OS Independent @@ -20,6 +51,7 @@ Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: 3.10 +Classifier: Programming Language :: Python :: 3.11 Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/docs/change_log/index.md new/Markdown-3.4.3/docs/change_log/index.md --- old/Markdown-3.4.1/docs/change_log/index.md 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/docs/change_log/index.md 2023-03-23 14:15:27.000000000 +0100 @@ -3,6 +3,17 @@ Python-Markdown Change Log ========================= +March 23, 2023: version 3.4.3 (a bug-fix release). + +* Restore console script (#1327). + +March 22, 2023: version 3.4.2 (a bug-fix release). + +* Improve standalone * and _ parsing (#1300). +* Consider `<html>` HTML tag a block-level element (#1309). +* Officially support Python 3.11. +* Switch from `setup.py` to `pyproject.toml`. + July 15, 2022: version 3.4.1 (a bug-fix release). * Fix an import issue with `importlib.util` (#1274). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/docs/extensions/fenced_code_blocks.md new/Markdown-3.4.3/docs/extensions/fenced_code_blocks.md --- old/Markdown-3.4.1/docs/extensions/fenced_code_blocks.md 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/docs/extensions/fenced_code_blocks.md 2023-03-23 14:15:27.000000000 +0100 @@ -37,7 +37,7 @@ ```` To include a set of backticks (or tildes) within a code block, use a different number of backticks for the -deliminators. +delimiters. `````md ```` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/docs/extensions/meta_data.md new/Markdown-3.4.3/docs/extensions/meta_data.md --- old/Markdown-3.4.1/docs/extensions/meta_data.md 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/docs/extensions/meta_data.md 2023-03-23 14:15:27.000000000 +0100 @@ -45,11 +45,11 @@ The first blank line ends all meta-data for the document. Therefore, the first line of a document must not be blank. -Alternatively, You may use YAML style deliminators to mark the start and/or end +Alternatively, You may use YAML style delimiters to mark the start and/or end of your meta-data. When doing so, the first line of your document must be `---`. The meta-data ends at the first blank line or the first line containing an end deliminator (either `---` or `...`), whichever comes first. Even though YAML -deliminators are supported, meta-data is not parsed as YAML. +delimiters are supported, meta-data is not parsed as YAML. All meta-data is stripped from the document prior to any further processing by Markdown. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/docs/extensions/toc.md new/Markdown-3.4.3/docs/extensions/toc.md --- old/Markdown-3.4.1/docs/extensions/toc.md 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/docs/extensions/toc.md 2023-03-23 14:15:27.000000000 +0100 @@ -195,7 +195,7 @@ * **`slugify`**: Callable to generate anchors. - Default: `markdown.extensions.headerid.slugify` + Default: `markdown.extensions.toc.slugify` In order to use a different algorithm to define the id attributes, define and pass in a callable which takes the following two arguments: @@ -206,7 +206,7 @@ The callable must return a string appropriate for use in HTML `id` attributes. An alternate version of the default callable supporting Unicode strings is also - provided as `markdown.extensions.headerid.slugify_unicode`. + provided as `markdown.extensions.toc.slugify_unicode`. * **`separator`**: Word separator. Character which replaces white space in id. Defaults to "`-`". diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/docs/reference.md new/Markdown-3.4.3/docs/reference.md --- old/Markdown-3.4.1/docs/reference.md 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/docs/reference.md 2023-03-23 14:15:27.000000000 +0100 @@ -169,7 +169,7 @@ Supported formats are: * `"xhtml"`: Outputs XHTML style tags. **Default**. - * `"html5"`: Outputs HTML style tags. + * `"html"`: Outputs HTML style tags. The values can be in either lowercase or uppercase. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/makefile new/Markdown-3.4.3/makefile --- old/Markdown-3.4.1/makefile 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/makefile 2023-03-23 14:15:27.000000000 +0100 @@ -8,31 +8,26 @@ @echo ' install Install Python-Markdown locally' @echo ' deploy Register and upload a new release to PyPI' @echo ' build Build a source distribution' - @echo ' build-win Build a Windows exe distribution' @echo ' docs Build documentation' @echo ' test Run all tests' @echo ' clean Clean up the source directories' .PHONY : install install: - python setup.py install + pip install . .PHONY : deploy deploy: rm -rf build rm -rf dist - python setup.py bdist_wheel sdist --formats gztar + python -m build twine upload dist/* .PHONY : build build: rm -rf build rm -rf dist - python setup.py bdist_wheel sdist --formats gztar - -.PHONY : build-win -build-win: - python setup.py bdist_wininst + python -m build .PHONY : docs docs: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/markdown/__meta__.py new/Markdown-3.4.3/markdown/__meta__.py --- old/Markdown-3.4.1/markdown/__meta__.py 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/markdown/__meta__.py 2023-03-23 14:15:27.000000000 +0100 @@ -26,7 +26,7 @@ # (1, 2, 0, 'beta', 2) => "1.2b2" # (1, 2, 0, 'rc', 4) => "1.2rc4" # (1, 2, 0, 'final', 0) => "1.2" -__version_info__ = (3, 4, 1, 'final', 0) +__version_info__ = (3, 4, 3, 'final', 0) def _get_version(version_info): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/markdown/core.py new/Markdown-3.4.3/markdown/core.py --- old/Markdown-3.4.1/markdown/core.py 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/markdown/core.py 2023-03-23 14:15:27.000000000 +0100 @@ -31,6 +31,7 @@ from .postprocessors import build_postprocessors from .extensions import Extension from .serializers import to_html_string, to_xhtml_string +from .util import BLOCK_LEVEL_ELEMENTS __all__ = ['Markdown', 'markdown', 'markdownFromFile'] @@ -72,18 +73,7 @@ self.ESCAPED_CHARS = ['\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!'] - self.block_level_elements = [ - # Elements which are invalid to wrap in a `` tag. - # See https://w3c.github.io/html/grouping-content.html#the-p-element - 'address', 'article', 'aside', 'blockquote', 'details', 'div', 'dl', - 'fieldset', 'figcaption', 'figure', 'footer', 'form', 'h1', 'h2', 'h3', - 'h4', 'h5', 'h6', 'header', 'hgroup', 'hr', 'main', 'menu', 'nav', 'ol', - 'p', 'pre', 'section', 'table', 'ul', - # Other elements which Markdown should not be mucking up the contents of. - 'canvas', 'colgroup', 'dd', 'body', 'dt', 'group', 'iframe', 'li', 'legend', - 'math', 'map', 'noscript', 'output', 'object', 'option', 'progress', 'script', - 'style', 'summary', 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'tr', 'video' - ] + self.block_level_elements = BLOCK_LEVEL_ELEMENTS.copy() self.registeredExtensions = [] self.docType = "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/markdown/extensions/codehilite.py new/Markdown-3.4.3/markdown/extensions/codehilite.py --- old/Markdown-3.4.1/markdown/extensions/codehilite.py 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/markdown/extensions/codehilite.py 2023-03-23 14:15:27.000000000 +0100 @@ -122,7 +122,7 @@ def hilite(self, shebang=True): """ - Pass code to the [Pygments](http://pygments.pocoo.org/) highliter with + Pass code to the [Pygments](https://pygments.org/) highliter with optional line numbers. The output should then be styled with css to your liking. No styles are applied by default - only styling hooks (i.e.: ). @@ -182,7 +182,7 @@ def _parseHeader(self): """ Determines language of a code block from shebang line and whether the - said line should be removed or left in place. If the sheband line + said line should be removed or left in place. If the shebang line contains a path (even a single /) then it is assumed to be a real shebang line and left alone. However, if no path is given (e.i.: #!python or :::python) then it is assumed to be a mock shebang diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/markdown/extensions/footnotes.py new/Markdown-3.4.3/markdown/extensions/footnotes.py --- old/Markdown-3.4.1/markdown/extensions/footnotes.py 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/markdown/extensions/footnotes.py 2023-03-23 14:15:27.000000000 +0100 @@ -256,7 +256,7 @@ return False def detectTabbed(self, blocks): - """ Find indented text and remove indent before further proccesing. + """ Find indented text and remove indent before further processing. Returns: a list of blocks with indentation removed. """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/markdown/inlinepatterns.py new/Markdown-3.4.3/markdown/inlinepatterns.py --- old/Markdown-3.4.1/markdown/inlinepatterns.py 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/markdown/inlinepatterns.py 2023-03-23 14:15:27.000000000 +0100 @@ -154,7 +154,7 @@ IMAGE_REFERENCE_RE = IMAGE_LINK_RE # stand-alone * or _ -NOT_STRONG_RE = r'((^|\s)(\*|_)(\s|$))' +NOT_STRONG_RE = r'((^|(?<=\s))(\*{1,3}|_{1,3})(?=\s|$))' # <http://www.123.com> AUTOLINK_RE = r'<((?:[Ff]|[Hh][Tt])[Tt][Pp][Ss]?://[^<>]*)>' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/markdown/util.py new/Markdown-3.4.3/markdown/util.py --- old/Markdown-3.4.1/markdown/util.py 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/markdown/util.py 2023-03-23 14:15:27.000000000 +0100 @@ -41,9 +41,9 @@ 'h4', 'h5', 'h6', 'header', 'hgroup', 'hr', 'main', 'menu', 'nav', 'ol', 'p', 'pre', 'section', 'table', 'ul', # Other elements which Markdown should not be mucking up the contents of. - 'canvas', 'colgroup', 'dd', 'body', 'dt', 'group', 'iframe', 'li', 'legend', + 'canvas', 'colgroup', 'dd', 'body', 'dt', 'group', 'html', 'iframe', 'li', 'legend', 'math', 'map', 'noscript', 'output', 'object', 'option', 'progress', 'script', - 'style', 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'tr', 'video' + 'style', 'summary', 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'tr', 'video' ] # Placeholders diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/mkdocs.yml new/Markdown-3.4.3/mkdocs.yml --- old/Markdown-3.4.1/mkdocs.yml 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/mkdocs.yml 2023-03-23 14:15:27.000000000 +0100 @@ -2,7 +2,7 @@ site_url: https://Python-Markdown.github.io/ repo_url: https://github.com/Python-Markdown/markdown site_author: "The Python-Markdown Project" -copyright: "Copyright © 2010-2017" +copyright: "Copyright © 2010-2023" use_directory_urls: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/pyproject.toml new/Markdown-3.4.3/pyproject.toml --- old/Markdown-3.4.1/pyproject.toml 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/pyproject.toml 2023-03-23 14:15:27.000000000 +0100 @@ -1,4 +1,90 @@ [build-system] # Minimum requirements for the build system to execute. -requires = ["setuptools>=36.6", "wheel"] +requires = ["setuptools>=61.2", "wheel"] build-backend = "setuptools.build_meta" + +[project] +name = 'Markdown' +dynamic = ['version'] +description = "Python implementation of John Gruber's Markdown." +readme = {file = 'README.md', content-type='text/markdown'} +authors = [ + {name = 'Manfred Stienstra'}, + {name = 'Yuri Takhteyev'}, + {name = 'Waylan limberg', email = 'python.markdown(a)gmail.com'} +] +maintainers = [ + {name = 'Waylan Limberg', email = 'python.markdown(a)gmail.com'}, + {name = 'Isaac Muse'} +] +license = {file = 'LICENSE.md'} +requires-python = '>=3.7' +dependencies = [ + "importlib-metadata>=4.4;python_version<'3.10'" +] +keywords = ['markdown', 'markdown-parser', 'python-markdown', 'markdown-to-html'] +classifiers = [ + 'Development Status :: 5 - Production/Stable', + 'License :: OSI Approved :: BSD License', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: Implementation :: CPython', + 'Programming Language :: Python :: Implementation :: PyPy', + 'Topic :: Communications :: Email :: Filters', + 'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries', + 'Topic :: Internet :: WWW/HTTP :: Site Management', + 'Topic :: Software Development :: Documentation', + 'Topic :: Software Development :: Libraries :: Python Modules', + 'Topic :: Text Processing :: Filters', + 'Topic :: Text Processing :: Markup :: HTML', + 'Topic :: Text Processing :: Markup :: Markdown' +] + +[project.optional-dependencies] +testing = [ + 'coverage', + 'pyyaml', +] + +[project.urls] +'Homepage' = 'https://Python-Markdown.github.io/' +'Documentation' = 'https://Python-Markdown.github.io/' +'Repository' = 'https://github.com/Python-Markdown/markdown' +'Issue Tracker' = 'https://github.com/Python-Markdown/markdown/issues' +'Changelog' = 'https://github.com/Python-Markdown/markdown/blob/master/docs/change_log/ind…' + +[project.scripts] +markdown_py = 'markdown.__main__:run' + +[project.entry-points.'markdown.extensions'] +abbr = 'markdown.extensions.abbr:AbbrExtension' +admonition = 'markdown.extensions.admonition:AdmonitionExtension' +attr_list = 'markdown.extensions.attr_list:AttrListExtension' +codehilite = 'markdown.extensions.codehilite:CodeHiliteExtension' +def_list = 'markdown.extensions.def_list:DefListExtension' +extra = 'markdown.extensions.extra:ExtraExtension' +fenced_code = 'markdown.extensions.fenced_code:FencedCodeExtension' +footnotes = 'markdown.extensions.footnotes:FootnoteExtension' +md_in_html = 'markdown.extensions.md_in_html:MarkdownInHtmlExtension' +meta = 'markdown.extensions.meta:MetaExtension' +nl2br = 'markdown.extensions.nl2br:Nl2BrExtension' +sane_lists = 'markdown.extensions.sane_lists:SaneListExtension' +smarty = 'markdown.extensions.smarty:SmartyExtension' +tables = 'markdown.extensions.tables:TableExtension' +toc = 'markdown.extensions.toc:TocExtension' +wikilinks = 'markdown.extensions.wikilinks:WikiLinkExtension' +legacy_attrs = 'markdown.extensions.legacy_attrs:LegacyAttrExtension' +legacy_em = 'markdown.extensions.legacy_em:LegacyEmExtension' + +[tool.setuptools] +packages = ['markdown', 'markdown.extensions'] + +[tool.setuptools.dynamic] +version = {attr = 'markdown.__meta__.__version__'} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/setup.cfg new/Markdown-3.4.3/setup.cfg --- old/Markdown-3.4.1/setup.cfg 2022-07-15 21:15:35.000000000 +0200 +++ new/Markdown-3.4.3/setup.cfg 2023-03-23 14:15:38.000000000 +0100 @@ -1,6 +1,3 @@ -[metadata] -license_file = LICENSE.md - [egg_info] tag_build = tag_date = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/setup.py new/Markdown-3.4.3/setup.py --- old/Markdown-3.4.1/setup.py 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/setup.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,132 +0,0 @@ -#!/usr/bin/env python -""" -Python Markdown - -A Python implementation of John Gruber's Markdown. - -Documentation: https://python-markdown.github.io/ -GitHub: https://github.com/Python-Markdown/markdown/ -PyPI: https://pypi.org/project/Markdown/ - -Started by Manfred Stienstra (http://www.dwerg.net/). -Maintained for a few years by Yuri Takhteyev (http://www.freewisdom.org). -Currently maintained by Waylan Limberg (https://github.com/waylan), -Dmitry Shachnev (https://github.com/mitya57) and Isaac Muse (https://github.com/facelessuser). - -Copyright 2007-2018 The Python Markdown Project (v. 1.7 and later) -Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b) -Copyright 2004 Manfred Stienstra (the original version) - -License: BSD (see LICENSE.md for details). -""" - - -import os -from setuptools import setup - - -def get_version(): - """Get version and version_info from markdown/__meta__.py file.""" - module_path = os.path.join(os.path.dirname('__file__'), 'markdown', '__meta__.py') - - import importlib.util - spec = importlib.util.spec_from_file_location('__meta__', module_path) - meta = importlib.util.module_from_spec(spec) - spec.loader.exec_module(meta) - return meta.__version__, meta.__version_info__ - - -__version__, __version_info__ = get_version() - -# Get development Status for classifiers -dev_status_map = { - 'dev': '2 - Pre-Alpha', - 'alpha': '3 - Alpha', - 'beta': '4 - Beta', - 'rc': '4 - Beta', - 'final': '5 - Production/Stable' -} -DEVSTATUS = dev_status_map[__version_info__[3]] - -# The command line script name. Currently set to "markdown_py" so as not to -# conflict with the perl implementation (which uses "markdown"). -SCRIPT_NAME = 'markdown_py' - -with open('README.md') as f: - long_description = f.read() - -setup( - name='Markdown', - version=__version__, - url='https://Python-Markdown.github.io/', - project_urls={ - 'Documentation': 'https://Python-Markdown.github.io/', - 'GitHub Project': 'https://github.com/Python-Markdown/markdown', - 'Issue Tracker': 'https://github.com/Python-Markdown/markdown/issues' - }, - description='Python implementation of Markdown.', - long_description=long_description, - long_description_content_type='text/markdown', - author='Manfred Stienstra, Yuri takhteyev and Waylan limberg', - author_email='python.markdown(a)gmail.com', - maintainer='Waylan Limberg', - maintainer_email='python.markdown(a)gmail.com', - license='BSD License', - packages=['markdown', 'markdown.extensions'], - python_requires='>=3.7', - install_requires=["importlib-metadata>=4.4;python_version<'3.10'"], - extras_require={ - 'testing': [ - 'coverage', - 'pyyaml', - ], - }, - entry_points={ - 'console_scripts': [ - '%s = markdown.__main__:run' % SCRIPT_NAME, - ], - # Register the built in extensions - 'markdown.extensions': [ - 'abbr = markdown.extensions.abbr:AbbrExtension', - 'admonition = markdown.extensions.admonition:AdmonitionExtension', - 'attr_list = markdown.extensions.attr_list:AttrListExtension', - 'codehilite = markdown.extensions.codehilite:CodeHiliteExtension', - 'def_list = markdown.extensions.def_list:DefListExtension', - 'extra = markdown.extensions.extra:ExtraExtension', - 'fenced_code = markdown.extensions.fenced_code:FencedCodeExtension', - 'footnotes = markdown.extensions.footnotes:FootnoteExtension', - 'md_in_html = markdown.extensions.md_in_html:MarkdownInHtmlExtension', - 'meta = markdown.extensions.meta:MetaExtension', - 'nl2br = markdown.extensions.nl2br:Nl2BrExtension', - 'sane_lists = markdown.extensions.sane_lists:SaneListExtension', - 'smarty = markdown.extensions.smarty:SmartyExtension', - 'tables = markdown.extensions.tables:TableExtension', - 'toc = markdown.extensions.toc:TocExtension', - 'wikilinks = markdown.extensions.wikilinks:WikiLinkExtension', - 'legacy_attrs = markdown.extensions.legacy_attrs:LegacyAttrExtension', - 'legacy_em = markdown.extensions.legacy_em:LegacyEmExtension', - ] - }, - classifiers=[ - 'Development Status :: %s' % DEVSTATUS, - 'License :: OSI Approved :: BSD License', - 'Operating System :: OS Independent', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3 :: Only', - 'Programming Language :: Python :: Implementation :: CPython', - 'Programming Language :: Python :: Implementation :: PyPy', - 'Topic :: Communications :: Email :: Filters', - 'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries', - 'Topic :: Internet :: WWW/HTTP :: Site Management', - 'Topic :: Software Development :: Documentation', - 'Topic :: Software Development :: Libraries :: Python Modules', - 'Topic :: Text Processing :: Filters', - 'Topic :: Text Processing :: Markup :: HTML', - 'Topic :: Text Processing :: Markup :: Markdown' - ] -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/tests/test_legacy.py new/Markdown-3.4.3/tests/test_legacy.py --- old/Markdown-3.4.1/tests/test_legacy.py 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/tests/test_legacy.py 2023-03-23 14:15:27.000000000 +0100 @@ -66,7 +66,7 @@ Code block in a list item: We match markdown.pl - not sure how php gets that output?? PHP-Specific Bugs: Not sure what to make of the escaping stuff here. - Why is PHP not removing a blackslash? + Why is PHP not removing a backslash? """ location = os.path.join(parent_test_dir, 'php') normalize = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markdown-3.4.1/tests/test_syntax/inline/test_emphasis.py new/Markdown-3.4.3/tests/test_syntax/inline/test_emphasis.py --- old/Markdown-3.4.1/tests/test_syntax/inline/test_emphasis.py 2022-07-15 21:15:31.000000000 +0200 +++ new/Markdown-3.4.3/tests/test_syntax/inline/test_emphasis.py 2023-03-23 14:15:27.000000000 +0100 @@ -36,6 +36,42 @@ '_' ) + def test_standalone_asterisks_consecutive(self): + self.assertMarkdownRenders( + 'Foo * * * *', + 'Foo * * * *' + ) + + def test_standalone_understore_consecutive(self): + self.assertMarkdownRenders( + 'Foo _ _ _ _', + 'Foo _ _ _ _' + ) + + def test_standalone_asterisks_pairs(self): + self.assertMarkdownRenders( + 'Foo ** ** ** **', + 'Foo ** ** ** **' + ) + + def test_standalone_understore_pairs(self): + self.assertMarkdownRenders( + 'Foo __ __ __ __', + 'Foo __ __ __ __' + ) + + def test_standalone_asterisks_triples(self): + self.assertMarkdownRenders( + 'Foo *** *** *** ***', + 'Foo *** *** *** ***' + ) + + def test_standalone_understore_triples(self): + self.assertMarkdownRenders( + 'Foo ___ ___ ___ ___', + 'Foo ___ ___ ___ ___' + ) + def test_standalone_asterisk_in_text(self): self.assertMarkdownRenders( 'foo * bar', @@ -72,10 +108,16 @@ 'foo\n_ bar _\nbaz' ) - def test_standalone_asterisks_at_end(self): + def test_standalone_underscore_at_begin(self): + self.assertMarkdownRenders( + '_ foo_ bar', + '_ foo_ bar' + ) + + def test_standalone_asterisk_at_end(self): self.assertMarkdownRenders( - 'foo * bar *', - 'foo * bar *' + 'foo *bar *', + 'foo *bar *' ) def test_standalone_understores_at_begin_end(self):

1 0

commit python-numpy for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-numpy for openSUSE:Factory checked in at 2023-03-31 21:14:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-numpy (Old) and /work/SRC/openSUSE:Factory/.python-numpy.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-numpy" Fri Mar 31 21:14:05 2023 rev:115 rq:1074078 version:1.24.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-numpy/python-numpy.changes 2023-03-11 18:24:30.475026916 +0100 +++ /work/SRC/openSUSE:Factory/.python-numpy.new.31432/python-numpy.changes 2023-03-31 21:14:10.574083697 +0200 @@ -1,0 +2,14 @@ +Fri Mar 24 07:02:57 UTC 2023 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Add patch ignore-pkg_resources-deprecation.patch: + * Ignore DeprecationWarning from pkg_resources. + +------------------------------------------------------------------- +Wed Mar 22 13:08:22 UTC 2023 - Dirk M��ller <dmueller(a)suse.com> + +- update to 1.24.2: + just bugfixes, see + https://github.com/numpy/numpy/releases/tag/v1.24.2 + for details + +------------------------------------------------------------------- Old: ---- numpy-1.24.1.tar.gz New: ---- ignore-pkg_resources-deprecation.patch numpy-1.24.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-numpy.spec ++++++ --- /var/tmp/diff_new_pack.Hze8u1/_old 2023-03-31 21:14:11.254086121 +0200 +++ /var/tmp/diff_new_pack.Hze8u1/_new 2023-03-31 21:14:11.262086150 +0200 @@ -17,8 +17,8 @@ %global flavor @BUILD_FLAVOR@%{nil} -%define ver 1.24.1 -%define _ver 1_24_1 +%define ver 1.24.2 +%define _ver 1_24_2 %define pname python-numpy %define plainpython python %define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') @@ -85,6 +85,8 @@ Patch0: numpy-buildfix.patch # PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure Patch1: numpy-1.9.0-remove-__declspec.patch +# PATCH-FIX-OPENSUSE Ignore DeprecationWarnings when importing pkg_resources +Patch2: ignore-pkg_resources-deprecation.patch BuildRequires: %{python_module Cython >= 0.29.30} BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module devel} ++++++ ignore-pkg_resources-deprecation.patch ++++++ Index: numpy-1.24.2/pytest.ini =================================================================== --- numpy-1.24.2.orig/pytest.ini +++ numpy-1.24.2/pytest.ini @@ -25,5 +25,7 @@ filterwarnings = # Ignore DeprecationWarnings from distutils ignore::DeprecationWarning:.*distutils ignore:\n\n `numpy.distutils`:DeprecationWarning +# Ignore DeprecationWarning from pkg_resources + ignore:pkg_resources:DeprecationWarning # Ignore mypy >= 0.971 DeprecationWarnings ignore:path is deprecated\. Use files instead:DeprecationWarning:mypy ++++++ numpy-1.24.1.tar.gz -> numpy-1.24.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-numpy/numpy-1.24.1.tar.gz /work/SRC/openSUSE:Factory/.python-numpy.new.31432/numpy-1.24.2.tar.gz differ: char 5, line 1

1 0

commit python-build for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-build for openSUSE:Factory checked in at 2023-03-31 21:14:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-build (Old) and /work/SRC/openSUSE:Factory/.python-build.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-build" Fri Mar 31 21:14:04 2023 rev:7 rq:1073633 version:0.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-build/python-build.changes 2023-01-03 15:04:17.810135671 +0100 +++ /work/SRC/openSUSE:Factory/.python-build.new.31432/python-build.changes 2023-03-31 21:14:09.326079246 +0200 @@ -1,0 +2,13 @@ +Tue Mar 21 19:16:14 UTC 2023 - Ben Greiner <code(a)bnavigator.de> + +- Update to 0.10.0 + * Replace pep517 dependency with pyproject_hooks, into which + pep517 has been renamed (PR #539, Fixes #529) + * Change build backend from setuptools to flit (PR #470, Fixes + #394) + * Dropped support for Python 3.6 (PR #532) +- Avoid namespace clashes with build/ directory + * gh#openSUSE/python-rpm-macros#157 +- Drop build-pr550-packaging22.patch + +------------------------------------------------------------------- Old: ---- build-0.9.0.tar.gz build-pr550-packaging22.patch flit_core-2.3.0-py2.py3-none-any.whl pytoml-0.1.21-py2.py3-none-any.whl New: ---- build-0.10.0.tar.gz flit_core-3.8.0-py3-none-any.whl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-build.spec ++++++ --- /var/tmp/diff_new_pack.OeTu0n/_old 2023-03-31 21:14:10.078081927 +0200 +++ /var/tmp/diff_new_pack.OeTu0n/_new 2023-03-31 21:14:10.082081942 +0200 @@ -24,35 +24,30 @@ %define psuffix %{nil} %bcond_with test %endif +# wheeldir of name build does not work well with this packagename gh#openSUSE/python-rpm-macros#157 +%define _pyproject_wheeldir distwheel -%define skip_python2 1 Name: python-build%{psuffix} -Version: 0.9.0 +Version: 0.10.0 Release: 0 Summary: Simple PEP517 package builder License: MIT Group: Development/Languages/Python URL: https://github.com/pypa/build Source0: https://github.com/pypa/build/archive/%{version}.tar.gz#/build-%{version}.t… -# Needs the wheels for wheel, flit-core (<3), pytoml, and tomli for testing +# Needs the wheels for wheel, flit-core, pytoml, and tomli for testing Source10: https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.37.1-py2.py… -Source11: https://files.pythonhosted.org/packages/py2.py3/f/flit-core/flit_core-2.3.0… -Source12: https://files.pythonhosted.org/packages/py2.py3/p/pytoml/pytoml-0.1.21-py2.… -Source13: https://files.pythonhosted.org/packages/py3/t/tomli/tomli-2.0.1-py3-none-an… -# PATCH-FIX-UPSTREAM build-pr550-packaging22.patch gh#pypa/build#550 -Patch1: https://github.com/pypa/build/pull/550.patch#/build-pr550-packaging22.patch -BuildRequires: %{python_module base >= 3.6} -BuildRequires: %{python_module importlib-metadata >= 0.22 if %python-base < 3.8} -BuildRequires: %{python_module packaging >= 19.0} -BuildRequires: %{python_module pep517 >= 0.9.1} -BuildRequires: %{python_module setuptools >= 42} -BuildRequires: %{python_module tomli >= 1.0.0 if %python-base < 3.11} +Source11: https://files.pythonhosted.org/packages/py3/f/flit-core/flit_core-3.8.0-py3… +Source12: https://files.pythonhosted.org/packages/py3/t/tomli/tomli-2.0.1-py3-none-an… +BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module flit-core >= 3.4} +BuildRequires: %{python_module pip} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-packaging >= 0.19.0 -Requires: python-pep517 >= 0.9.1 +Requires: python-pyproject-hooks Requires: (python-importlib-metadata >= 0.22 if python-base < 3.8) -Requires: (python-tomli if python-base < 3.11) +Requires: (python-tomli >= 1.1.0 if python-base < 3.11) Recommends: python-virtualenv >= 20.0.35 Requires(post): update-alternatives Requires(postun):update-alternatives @@ -64,6 +59,8 @@ BuildRequires: %{python_module pytest-mock >= 2} BuildRequires: %{python_module pytest-rerunfailures >= 9.1} BuildRequires: %{python_module pytest-xdist >= 1.34} +BuildRequires: %{python_module setuptools >= 42 if %python-base < 3.10} +BuildRequires: %{python_module setuptools >= 56 if %python-base >= 3.11} BuildRequires: %{python_module toml >= 0.10.0} BuildRequires: %{python_module wheel >= 0.36} BuildRequires: python3-setuptools-wheel @@ -79,10 +76,10 @@ %if !%{with test} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/pyproject-build %python_expand %fdupes %{buildroot}%{$python_sitelib} %endif @@ -90,9 +87,11 @@ %if %{with test} %check mkdir -p wheels -cp %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} wheels/ +cp %{SOURCE10} %{SOURCE11} %{SOURCE12} wheels/ export PIP_FIND_LINKS="%{python3_sitelib}/../wheels $PWD/wheels" -%pytest tests -n auto +pushd tests +%pytest -n auto -x +popd %endif %if !%{with test} ++++++ build-0.9.0.tar.gz -> build-0.10.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/.github/workflows/check.yml new/build-0.10.0/.github/workflows/check.yml --- old/build-0.9.0/.github/workflows/check.yml 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/.github/workflows/check.yml 2023-01-11 21:31:00.000000000 +0100 @@ -18,10 +18,10 @@ steps: - uses: actions/checkout@v3 - - name: Setup Python 3.9 + - name: Setup Python 3.10 uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: "3.10" - name: Install tox run: python -m pip install tox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/.github/workflows/test.yml new/build-0.10.0/.github/workflows/test.yml --- old/build-0.9.0/.github/workflows/test.yml 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/.github/workflows/test.yml 2023-01-11 21:31:00.000000000 +0100 @@ -41,11 +41,20 @@ - "3.9" - "3.8" - "3.7" - - "3.6" tox-target: - "tox" - "min" + continue-on-error: >- # jobs not required in branch protection + ${{ + ( + startsWith(matrix.py, 'pypy-') + && (!endsWith(matrix.py, '-3.7') || matrix.os == 'windows') + ) + && true + || false + }} + steps: - uses: actions/checkout@v3 with: @@ -129,3 +138,19 @@ - name: Run check for type run: tox -e type --skip-pkg-install + + # https://github.com/marketplace/actions/alls-green#why + required-checks-pass: # This job does nothing and is only used for the branch protection + if: always() + + needs: + - pytest + - type + + runs-on: ubuntu-latest + + steps: + - name: Decide whether the needed jobs succeeded or failed + uses: re-actors/alls-green@release/v1 + with: + jobs: ${{ toJSON(needs) }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/.pre-commit-config.yaml new/build-0.10.0/.pre-commit-config.yaml --- old/build-0.9.0/.pre-commit-config.yaml 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/.pre-commit-config.yaml 2023-01-11 21:31:00.000000000 +0100 @@ -4,7 +4,7 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: check-ast - id: check-builtin-literals @@ -17,13 +17,17 @@ - id: end-of-file-fixer - id: trailing-whitespace - id: double-quote-string-fixer + - repo: https://github.com/abravalheri/validate-pyproject + rev: v0.10.1 + hooks: + - id: validate-pyproject - repo: https://github.com/asottile/pyupgrade - rev: v3.1.0 + rev: v3.3.1 hooks: - id: pyupgrade - args: ["--py36-plus"] + args: ["--py37-plus"] - repo: https://github.com/psf/black - rev: 22.10.0 + rev: 22.12.0 hooks: - id: black - repo: https://github.com/asottile/blacken-docs @@ -32,20 +36,15 @@ - id: blacken-docs additional_dependencies: [black==22.6] - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.0-alpha.2" + rev: "v3.0.0-alpha.4" hooks: - id: prettier - repo: https://github.com/PyCQA/isort - rev: 5.10.1 + rev: 5.11.4 hooks: - id: isort - - repo: https://github.com/asottile/setup-cfg-fmt - rev: v2.1.0 - hooks: - - id: setup-cfg-fmt - args: [--include-version-classifiers, --max-py-version=3.11] - repo: https://github.com/PyCQA/flake8 - rev: "5.0.4" + rev: "6.0.0" hooks: - id: flake8 additional_dependencies: ["flake8-bugbear==22.7.1"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/CHANGELOG.rst new/build-0.10.0/CHANGELOG.rst --- old/build-0.9.0/CHANGELOG.rst 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/CHANGELOG.rst 2023-01-11 21:31:00.000000000 +0100 @@ -3,6 +3,23 @@ +++++++++ +0.10.0 (2023-01-11) +=================== + +- Replace ``pep517`` dependency with ``pyproject_hooks``, + into which ``pep517`` has been renamed + (`PR #539`_, Fixes `#529`_) +- Change build backend from ``setuptools`` to ``flit`` + (`PR #470`_, Fixes `#394`_) +- Dropped support for Python 3.6 (`PR #532`_) + +.. _PR #470: https://github.com/pypa/build/pull/470 +.. _PR #532: https://github.com/pypa/build/pull/532 +.. _#394: https://github.com/pypa/build/issues/394 +.. _PR #539: https://github.com/pypa/build/pull/539 +.. _#529: https://github.com/pypa/build/issues/529 + + 0.9.0 (2022-10-27) ================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/README.md new/build-0.10.0/README.md --- old/build-0.9.0/README.md 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/README.md 2023-01-11 21:31:00.000000000 +0100 @@ -9,7 +9,7 @@ [![PyPI version](https://badge.fury.io/py/build.svg)](https://pypi.org/project/buil… [![Discord](https://img.shields.io/discord/803025117553754132?label=Discord%20chat%20%23build&style=flat-square)](https://discord.gg/pypa) -A simple, correct PEP 517 build frontend. +A simple, correct Python build frontend. See the [documentation](https://pypa-build.readthedocs.io/en/latest/) for more information. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/docs/conf.py new/build-0.10.0/docs/conf.py --- old/build-0.9.0/docs/conf.py 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/docs/conf.py 2023-01-11 21:31:00.000000000 +0100 @@ -65,3 +65,8 @@ # html_static_path = ['_static'] autoclass_content = 'both' + +nitpick_ignore = [ + # https://github.com/python/importlib_metadata/issues/316 + ('py:class', 'importlib.metadata._meta.PackageMetadata'), +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/docs/index.rst new/build-0.10.0/docs/index.rst --- old/build-0.9.0/docs/index.rst 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/docs/index.rst 2023-01-11 21:31:00.000000000 +0100 @@ -43,6 +43,7 @@ :hidden: test_suite + release .. toctree:: :caption: Project Links diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/docs/installation.rst new/build-0.10.0/docs/installation.rst --- old/build-0.9.0/docs/installation.rst 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/docs/installation.rst 2023-01-11 21:31:00.000000000 +0100 @@ -47,13 +47,11 @@ ``build`` is verified to be compatible with the following Python versions: -- 2.7 -- 3.5 -- 3.6 - 3.7 - 3.8 - 3.9 -- PyPy(2) +- 3.10 +- 3.11 - PyPy3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/docs/release.rst new/build-0.10.0/docs/release.rst --- old/build-0.9.0/docs/release.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/build-0.10.0/docs/release.rst 2023-01-11 21:31:00.000000000 +0100 @@ -0,0 +1,30 @@ +*************** +Release Process +*************** + +As this project is critical to the Python ecosystem's supply chain security, all +releases are PGP signed with one of the keys listed in the `installation page`_. +Before releasing please make sure your PGP key is listed there, and preferably +signed by one of the other key holders. If your key is not signed by one of the +other key holders, please make sure the PR that added your key to the +`installation page`_ was approved by at least one other maintainer. + +After that is done, you may release the project by following these steps: + +#. Bump the versions in ``pyproject.toml`` and ``src/build/__init__.py`` +#. Update ``CHANGELOG.rst`` with the new version and current date +#. Make a release commit with the changes made above + - The commit message should follow the ``release X.Y.Z`` format +#. Make a signed tag (``git tag -s X.Y.Z``) + - The tag title should follow the ``build X.Y.Z`` format + - The tag body should be a plaintext version of the changelog for the current + release +#. Push the commit and tag to the repository (``git push`` and ``git push --tags``) +#. Build the Python artifacts (``python -m build``) +#. Sign and push the artifacts to PyPI (``twine upload -s dist/*``) + +If you have any questions, please look at previous releases and/or ping the +other maintainers. + + +.. _installation page: installation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/pyproject.toml new/build-0.10.0/pyproject.toml --- old/build-0.9.0/pyproject.toml 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/pyproject.toml 2023-01-11 21:31:00.000000000 +0100 @@ -1,6 +1,79 @@ [build-system] -requires = ["setuptools >=42.0"] -build-backend = "setuptools.build_meta" +requires = ["flit-core >= 3.4"] +build-backend = "flit_core.buildapi" + +[project] +name = "build" +version = "0.10.0" +description = "A simple, correct Python build frontend" +readme = "README.md" +requires-python = ">= 3.7" +license.file = "LICENSE" +authors = [ + { name = "Filipe La��ns", email = "lains(a)riseup.net" }, + { name = "Bern��t G��bor", email = "gaborjbernat(a)gmail.com" }, + { name = "layday", email = "layday(a)protonmail.com" }, + { name = "Henry Schreiner", email = "henryschreineriii(a)gmail.com" }, +] +classifiers = [ + "License :: OSI Approved :: MIT License", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: PyPy", +] +urls.homepage = "https://github.com/pypa/build" +urls.changelog = "https://pypa-build.readthedocs.io/en/stable/changelog.html" + +dependencies = [ + "packaging >= 19.0", + "pyproject_hooks", + # not actually a runtime dependency, only supplied as there is not "recommended dependency" support + 'colorama; os_name == "nt"', + 'importlib-metadata >= 0.22; python_version < "3.8"', + # toml can be used instead -- in case it makes bootstrapping easier + 'tomli >= 1.1.0; python_version < "3.11"', +] + +[project.optional-dependencies] +docs = [ + "furo >= 2021.08.31", + "sphinx ~= 4.0", + "sphinx-argparse-cli >= 1.5", + "sphinx-autodoc-typehints >= 1.10", +] +test = [ + "filelock >= 3", + "pytest >= 6.2.4", + "pytest-cov >= 2.12", + "pytest-mock >= 2", + "pytest-rerunfailures >= 9.1", + "pytest-xdist >= 1.34", + "toml >= 0.10.0", + "wheel >= 0.36.0", + 'setuptools >= 42.0.0; python_version < "3.10"', + 'setuptools >= 56.0.0; python_version >= "3.10"', +] +typing = [ + "importlib-metadata >= 5.1", + "mypy == 0.991", + "tomli", + "typing-extensions >= 3.7.4.3", +] +virtualenv = [ + "virtualenv >= 20.0.35", +] + +[project.scripts] +pyproject-build = "build.__main__:entrypoint" + +[project.entry-points."pipx.run"] +build = "build.__main__:entrypoint" [tool.coverage.run] source = [ @@ -44,16 +117,15 @@ [tool.mypy] files = "src" -python_version = "3.6" +python_version = "3.7" strict = true show_error_codes = true enable_error_code = ["ignore-without-code", "truthy-bool", "redundant-expr"] - [[tool.mypy.overrides]] module = [ "colorama", # Optional dependency - "pep517.*", # Untyped + "pyproject_hooks.*", # Untyped "virtualenv", # Optional dependency ] ignore_missing_imports = true @@ -61,7 +133,7 @@ [tool.black] line-length = 127 skip-string-normalization = true -target-version = ["py39", "py38", "py37", "py36"] +target-version = ["py311", "py310", "py39", "py38", "py37"] [tool.isort] profile = "black" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/setup.cfg new/build-0.10.0/setup.cfg --- old/build-0.9.0/setup.cfg 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/setup.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -[metadata] -name = build -version = 0.9.0 -description = A simple, correct PEP 517 build frontend -long_description = file: README.md -long_description_content_type = text/markdown -author = Filipe La��ns -author_email = lains(a)riseup.net -license = MIT -license_file = LICENSE -classifiers = - License :: OSI Approved :: MIT License - Programming Language :: Python :: 3 - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Programming Language :: Python :: Implementation :: PyPy -project_urls = - homepage = https://github.com/pypa/build - changelog = https://pypa-build.readthedocs.io/en/stable/changelog.html - -[options] -packages = find: -install_requires = - packaging>=19.0 - pep517>=0.9.1 - colorama;os_name == "nt" # not actually a runtime dependency, only supplied as there is not "recommended dependency" support - importlib-metadata>=0.22;python_version < "3.8" - tomli>=1.0.0;python_version < "3.11" # toml can be used instead -- in case it makes bootstrapping easier -python_requires = >=3.6 -package_dir = - =src - -[options.packages.find] -where = src - -[options.entry_points] -console_scripts = - pyproject-build = build.__main__:entrypoint -pipx.run = - build = build.__main__:entrypoint - -[options.extras_require] -docs = - furo>=2021.08.31 - sphinx~=4.0 - sphinx-argparse-cli>=1.5 - sphinx-autodoc-typehints>=1.10 -test = - filelock>=3 - pytest>=6.2.4 - pytest-cov>=2.12 - pytest-mock>=2 - pytest-rerunfailures>=9.1 - pytest-xdist>=1.34 - toml>=0.10.0 - wheel>=0.36.0 - setuptools>=42.0.0;python_version < "3.10" - setuptools>=56.0.0;python_version >= "3.10" -typing = - importlib-metadata>=4.6.4 - mypy==0.950 - typing-extensions>=3.7.4.3;python_version < "3.8" -virtualenv = - virtualenv>=20.0.35 - -[options.package_data] -build = - py.typed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/setup.py new/build-0.10.0/setup.py --- old/build-0.9.0/setup.py 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/setup.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -from setuptools import setup - - -setup() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/src/build/__init__.py new/build-0.10.0/src/build/__init__.py --- old/build-0.9.0/src/build/__init__.py 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/src/build/__init__.py 2023-01-11 21:31:00.000000000 +0100 @@ -4,7 +4,10 @@ build - A simple, correct PEP 517 build frontend """ -__version__ = '0.9.0' +from __future__ import annotations + + +__version__ = '0.10.0' import contextlib import difflib @@ -19,27 +22,13 @@ import zipfile from collections import OrderedDict -from typing import ( - AbstractSet, - Any, - Callable, - Dict, - Iterator, - List, - Mapping, - MutableMapping, - Optional, - Sequence, - Set, - Tuple, - Type, - Union, -) +from collections.abc import Iterator, Set +from typing import Any, Callable, Mapping, MutableMapping, Optional, Sequence, Tuple, Type, Union -import pep517.wrappers +import pyproject_hooks -TOMLDecodeError: Type[Exception] +TOMLDecodeError: type[Exception] toml_loads: Callable[[str], MutableMapping[str, Any]] if sys.version_info >= (3, 11): @@ -88,7 +77,7 @@ """ def __init__( - self, exception: Exception, description: Optional[str] = None, exc_info: _ExcInfoType = (None, None, None) + self, exception: Exception, description: str | None = None, exc_info: _ExcInfoType = (None, None, None) ) -> None: super().__init__() self.exception = exception @@ -137,18 +126,6 @@ """ -(a)contextlib.contextmanager -def _working_directory(path: str) -> Iterator[None]: - current = os.getcwd() - - os.chdir(path) - - try: - yield - finally: - os.chdir(current) - - def _validate_source_directory(srcdir: PathType) -> None: if not os.path.isdir(srcdir): raise BuildException(f'Source {srcdir} is not a directory') @@ -159,8 +136,8 @@ def check_dependency( - req_string: str, ancestral_req_strings: Tuple[str, ...] = (), parent_extras: AbstractSet[str] = frozenset() -) -> Iterator[Tuple[str, ...]]: + req_string: str, ancestral_req_strings: tuple[str, ...] = (), parent_extras: Set[str] = frozenset() +) -> Iterator[tuple[str, ...]]: """ Verify that a dependency and all of its dependencies are met. @@ -217,7 +194,7 @@ ) -def _parse_build_system_table(pyproject_toml: Mapping[str, Any]) -> Dict[str, Any]: +def _parse_build_system_table(pyproject_toml: Mapping[str, Any]) -> dict[str, Any]: # If pyproject.toml is missing (per PEP 517) or [build-system] is missing # (per PEP 518), use default values if 'build-system' not in pyproject_toml: @@ -265,8 +242,8 @@ self, srcdir: PathType, python_executable: str = sys.executable, - scripts_dir: Optional[str] = None, - runner: RunnerType = pep517.wrappers.default_subprocess_runner, + scripts_dir: str | None = None, + runner: RunnerType = pyproject_hooks.default_subprocess_runner, ) -> None: """ :param srcdir: The source directory @@ -305,7 +282,7 @@ self._backend = self._build_system['build-backend'] self._scripts_dir = scripts_dir self._hook_runner = runner - self._hook = pep517.wrappers.Pep517HookCaller( + self._hook = pyproject_hooks.BuildBackendHookCaller( self.srcdir, self._backend, backend_path=self._build_system.get('backend-path'), @@ -313,12 +290,10 @@ runner=self._runner, ) - def _runner( - self, cmd: Sequence[str], cwd: Optional[str] = None, extra_environ: Optional[Mapping[str, str]] = None - ) -> None: + def _runner(self, cmd: Sequence[str], cwd: str | None = None, extra_environ: Mapping[str, str] | None = None) -> None: # if script dir is specified must be inserted at the start of PATH (avoid duplicate path while doing so) if self.scripts_dir is not None: - paths: Dict[str, None] = OrderedDict() + paths: dict[str, None] = OrderedDict() paths[str(self.scripts_dir)] = None if 'PATH' in os.environ: paths.update((i, None) for i in os.environ['PATH'].split(os.pathsep)) @@ -345,18 +320,18 @@ self._hook.python_executable = value @property - def scripts_dir(self) -> Optional[str]: + def scripts_dir(self) -> str | None: """ The folder where the scripts are stored for the python executable. """ return self._scripts_dir @scripts_dir.setter - def scripts_dir(self, value: Optional[str]) -> None: + def scripts_dir(self, value: str | None) -> None: self._scripts_dir = value @property - def build_system_requires(self) -> Set[str]: + def build_system_requires(self) -> set[str]: """ The dependencies defined in the ``pyproject.toml``'s ``build-system.requires`` field or the default build dependencies @@ -364,7 +339,7 @@ """ return set(self._build_system['requires']) - def get_requires_for_build(self, distribution: str, config_settings: Optional[ConfigSettingsType] = None) -> Set[str]: + def get_requires_for_build(self, distribution: str, config_settings: ConfigSettingsType | None = None) -> set[str]: """ Return the dependencies defined by the backend in addition to :attr:`build_system_requires` for a given distribution. @@ -380,9 +355,7 @@ with self._handle_backend(hook_name): return set(get_requires(config_settings)) - def check_dependencies( - self, distribution: str, config_settings: Optional[ConfigSettingsType] = None - ) -> Set[Tuple[str, ...]]: + def check_dependencies(self, distribution: str, config_settings: ConfigSettingsType | None = None) -> set[tuple[str, ...]]: """ Return the dependencies which are not satisfied from the combined set of :attr:`build_system_requires` and :meth:`get_requires_for_build` for a given @@ -396,8 +369,8 @@ return {u for d in dependencies for u in check_dependency(d)} def prepare( - self, distribution: str, output_directory: PathType, config_settings: Optional[ConfigSettingsType] = None - ) -> Optional[str]: + self, distribution: str, output_directory: PathType, config_settings: ConfigSettingsType | None = None + ) -> str | None: """ Prepare metadata for a distribution. @@ -415,7 +388,7 @@ _allow_fallback=False, ) except BuildBackendException as exception: - if isinstance(exception.exception, pep517.wrappers.HookMissing): + if isinstance(exception.exception, pyproject_hooks.HookMissing): return None raise @@ -423,8 +396,8 @@ self, distribution: str, output_directory: PathType, - config_settings: Optional[ConfigSettingsType] = None, - metadata_directory: Optional[str] = None, + config_settings: ConfigSettingsType | None = None, + metadata_directory: str | None = None, ) -> str: """ Build a distribution. @@ -470,7 +443,7 @@ return os.path.join(output_directory, distinfo) def _call_backend( - self, hook_name: str, outdir: PathType, config_settings: Optional[ConfigSettingsType] = None, **kwargs: Any + self, hook_name: str, outdir: PathType, config_settings: ConfigSettingsType | None = None, **kwargs: Any ) -> str: outdir = os.path.abspath(outdir) @@ -489,21 +462,20 @@ @contextlib.contextmanager def _handle_backend(self, hook: str) -> Iterator[None]: - with _working_directory(self.srcdir): - try: - yield - except pep517.wrappers.BackendUnavailable as exception: - raise BuildBackendException( # noqa: B904 # use raise from - exception, - f"Backend '{self._backend}' is not available.", - sys.exc_info(), - ) - except subprocess.CalledProcessError as exception: - raise BuildBackendException( # noqa: B904 # use raise from - exception, f'Backend subprocess exited when trying to invoke {hook}' - ) - except Exception as exception: - raise BuildBackendException(exception, exc_info=sys.exc_info()) # noqa: B904 # use raise from + try: + yield + except pyproject_hooks.BackendUnavailable as exception: + raise BuildBackendException( # noqa: B904 # use raise from + exception, + f"Backend '{self._backend}' is not available.", + sys.exc_info(), + ) + except subprocess.CalledProcessError as exception: + raise BuildBackendException( # noqa: B904 # use raise from + exception, f'Backend subprocess exited when trying to invoke {hook}' + ) + except Exception as exception: + raise BuildBackendException(exception, exc_info=sys.exc_info()) # noqa: B904 # use raise from @staticmethod def log(message: str) -> None: @@ -535,5 +507,5 @@ ] -def __dir__() -> List[str]: +def __dir__() -> list[str]: return __all__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/src/build/__main__.py new/build-0.10.0/src/build/__main__.py --- old/build-0.9.0/src/build/__main__.py 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/src/build/__main__.py 2023-01-11 21:31:00.000000000 +0100 @@ -1,5 +1,6 @@ # SPDX-License-Identifier: MIT +from __future__ import annotations import argparse import contextlib @@ -14,7 +15,8 @@ import traceback import warnings -from typing import Dict, Iterator, List, NoReturn, Optional, Sequence, TextIO, Type, Union +from collections.abc import Iterator, Sequence +from typing import NoReturn, TextIO import build @@ -34,7 +36,7 @@ _NO_COLORS = {color: '' for color in _COLORS} -def _init_colors() -> Dict[str, str]: +def _init_colors() -> dict[str, str]: if 'NO_COLOR' in os.environ: if 'FORCE_COLOR' in os.environ: warnings.warn('Both NO_COLOR and FORCE_COLOR environment variables are set, disabling color') @@ -52,12 +54,12 @@ def _showwarning( - message: Union[Warning, str], - category: Type[Warning], + message: Warning | str, + category: type[Warning], filename: str, lineno: int, - file: Optional[TextIO] = None, - line: Optional[str] = None, + file: TextIO | None = None, + line: str | None = None, ) -> None: # pragma: no cover _cprint('{yellow}WARNING{reset} {}', str(message)) @@ -102,7 +104,7 @@ def _build_in_isolated_env( - builder: ProjectBuilder, outdir: PathType, distribution: str, config_settings: Optional[ConfigSettingsType] + builder: ProjectBuilder, outdir: PathType, distribution: str, config_settings: ConfigSettingsType | None ) -> str: with _IsolatedEnvBuilder() as env: builder.python_executable = env.executable @@ -118,7 +120,7 @@ builder: ProjectBuilder, outdir: PathType, distribution: str, - config_settings: Optional[ConfigSettingsType], + config_settings: ConfigSettingsType | None, skip_dependency_check: bool = False, ) -> str: if not skip_dependency_check: @@ -136,7 +138,7 @@ builder: ProjectBuilder, outdir: PathType, distribution: str, - config_settings: Optional[ConfigSettingsType], + config_settings: ConfigSettingsType | None, skip_dependency_check: bool, ) -> str: if isolation: @@ -186,7 +188,7 @@ srcdir: PathType, outdir: PathType, distributions: Sequence[str], - config_settings: Optional[ConfigSettingsType] = None, + config_settings: ConfigSettingsType | None = None, isolation: bool = True, skip_dependency_check: bool = False, ) -> Sequence[str]: @@ -200,7 +202,7 @@ :param isolation: Isolate the build in a separate environment :param skip_dependency_check: Do not perform the dependency check """ - built: List[str] = [] + built: list[str] = [] builder = _ProjectBuilder(srcdir) for distribution in distributions: out = _build(isolation, builder, outdir, distribution, config_settings, skip_dependency_check) @@ -212,7 +214,7 @@ srcdir: PathType, outdir: PathType, distributions: Sequence[str], - config_settings: Optional[ConfigSettingsType] = None, + config_settings: ConfigSettingsType | None = None, isolation: bool = True, skip_dependency_check: bool = False, ) -> Sequence[str]: @@ -234,7 +236,7 @@ sdist_name = os.path.basename(sdist) sdist_out = tempfile.mkdtemp(prefix='build-via-sdist-') - built: List[str] = [] + built: list[str] = [] # extract sdist with tarfile.open(sdist) as t: t.extractall(sdist_out) @@ -258,7 +260,7 @@ description=textwrap.indent( textwrap.dedent( ''' - A simple, correct PEP 517 build frontend. + A simple, correct Python build frontend. By default, a source distribution (sdist) is built from {srcdir} and a binary distribution (wheel) is built from the sdist. @@ -328,7 +330,7 @@ return parser -def main(cli_args: Sequence[str], prog: Optional[str] = None) -> None: # noqa: C901 +def main(cli_args: Sequence[str], prog: str | None = None) -> None: # noqa: C901 """ Parse the CLI arguments and invoke the build process. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/src/build/env.py new/build-0.10.0/src/build/env.py --- old/build-0.9.0/src/build/env.py 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/src/build/env.py 2023-01-11 21:31:00.000000000 +0100 @@ -1,6 +1,9 @@ """ Creates and manages isolated build environments. """ + +from __future__ import annotations + import abc import functools import logging @@ -13,8 +16,8 @@ import tempfile import warnings +from collections.abc import Callable, Collection from types import TracebackType -from typing import Callable, Collection, List, Optional, Tuple, Type import build @@ -67,7 +70,7 @@ ) -def _subprocess(cmd: List[str]) -> None: +def _subprocess(cmd: list[str]) -> None: """Invoke subprocess and output stdout and stderr if it fails.""" try: subprocess.run(cmd, check=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) @@ -80,7 +83,7 @@ """Builder object for isolated environments.""" def __init__(self) -> None: - self._path: Optional[str] = None + self._path: str | None = None def __enter__(self) -> IsolatedEnv: """ @@ -113,7 +116,7 @@ raise def __exit__( - self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType] + self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None ) -> None: """ Delete the created isolated build environment. @@ -213,7 +216,7 @@ os.unlink(req_file.name) -def _create_isolated_env_virtualenv(path: str) -> Tuple[str, str]: +def _create_isolated_env_virtualenv(path: str) -> tuple[str, str]: """ We optionally can use the virtualenv package to provision a virtual environment. @@ -245,7 +248,7 @@ return False -def _create_isolated_env_venv(path: str) -> Tuple[str, str]: +def _create_isolated_env_venv(path: str) -> tuple[str, str]: """ On Python 3 we use the venv package from the standard library. @@ -293,7 +296,7 @@ return executable, script_dir -def _find_executable_and_scripts(path: str) -> Tuple[str, str, str]: +def _find_executable_and_scripts(path: str) -> tuple[str, str, str]: """ Detect the Python executable and script folder of a virtual environment. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/src/build/util.py new/build-0.10.0/src/build/util.py --- old/build-0.9.0/src/build/util.py 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/src/build/util.py 2023-01-11 21:31:00.000000000 +0100 @@ -1,11 +1,13 @@ # SPDX-License-Identifier: MIT +from __future__ import annotations + import os import pathlib import sys import tempfile -import pep517 +import pyproject_hooks import build import build.env @@ -17,17 +19,16 @@ import importlib_metadata -def _project_wheel_metadata(builder: build.ProjectBuilder) -> 'importlib_metadata.PackageMetadata': +def _project_wheel_metadata(builder: build.ProjectBuilder) -> importlib_metadata.PackageMetadata: with tempfile.TemporaryDirectory() as tmpdir: path = pathlib.Path(builder.metadata_path(tmpdir)) - # https://github.com/python/importlib_metadata/pull/343 - return importlib_metadata.PathDistribution(path).metadata # type: ignore[arg-type] + return importlib_metadata.PathDistribution(path).metadata def project_wheel_metadata( srcdir: build.PathType, isolated: bool = True, -) -> 'importlib_metadata.PackageMetadata': +) -> importlib_metadata.PackageMetadata: """ Return the wheel metadata for a project. @@ -41,7 +42,7 @@ """ builder = build.ProjectBuilder( os.fspath(srcdir), - runner=pep517.quiet_subprocess_runner, + runner=pyproject_hooks.quiet_subprocess_runner, ) if not isolated: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/tests/constraints.txt new/build-0.10.0/tests/constraints.txt --- old/build-0.9.0/tests/constraints.txt 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/tests/constraints.txt 2023-01-11 21:31:00.000000000 +0100 @@ -1,9 +1,9 @@ importlib-metadata==0.22 packaging==19.0 -pep517==0.9.1 +pyproject_hooks==1.0 setuptools==42.0.0; python_version < "3.10" setuptools==56.0.0; python_version >= "3.10" toml==0.10.0 -tomli==1.0.0 +tomli==1.1.0 virtualenv==20.0.35 wheel==0.36.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/tests/test_env.py new/build-0.10.0/tests/test_env.py --- old/build-0.9.0/tests/test_env.py 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/tests/test_env.py 2023-01-11 21:31:00.000000000 +0100 @@ -1,6 +1,5 @@ # SPDX-License-Identifier: MIT import collections -import inspect import logging import platform import subprocess @@ -106,7 +105,6 @@ caplog.set_level(logging.DEBUG) builder = build.env.IsolatedEnvBuilder() - frameinfo = inspect.getframeinfo(inspect.currentframe()) builder.log('something') # line number 106 with builder as env: env.install(['something']) @@ -116,20 +114,12 @@ ('INFO', 'Creating venv isolated environment...'), ('INFO', 'Installing packages in isolated environment... (something)'), ] - if sys.version_info >= (3, 8): # stacklevel - assert [(record.lineno) for record in caplog.records] == [ - frameinfo.lineno + 1, - frameinfo.lineno - 6, - frameinfo.lineno + 85, - ] @pytest.mark.isolated def test_default_pip_is_never_too_old(): with build.env.IsolatedEnvBuilder() as env: - version = subprocess.check_output( - [env.executable, '-c', 'import pip; print(pip.__version__)'], universal_newlines=True - ).strip() + version = subprocess.check_output([env.executable, '-c', 'import pip; print(pip.__version__)'], text=True).strip() assert Version(version) >= Version('19.1') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/tests/test_integration.py new/build-0.10.0/tests/test_integration.py --- old/build-0.9.0/tests/test_integration.py 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/tests/test_integration.py 2023-01-11 21:31:00.000000000 +0100 @@ -93,8 +93,8 @@ ) @pytest.mark.isolated def test_build(monkeypatch, project, args, call, tmp_path): - if project == 'flit' and '--no-isolation' in args: - pytest.xfail("can't build flit without isolation due to missing dependencies") + if project in {'build', 'flit'} and '--no-isolation' in args: + pytest.xfail(f"can't build {project} without isolation due to missing dependencies") if project == 'Solaar' and IS_WINDOWS and IS_PYPY3: pytest.xfail('Solaar fails building wheels via sdists on Windows on PyPy 3') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/tests/test_projectbuilder.py new/build-0.10.0/tests/test_projectbuilder.py --- old/build-0.9.0/tests/test_projectbuilder.py 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/tests/test_projectbuilder.py 2023-01-11 21:31:00.000000000 +0100 @@ -8,7 +8,7 @@ import sys import textwrap -import pep517.wrappers +import pyproject_hooks import pytest import build @@ -60,13 +60,13 @@ Metadata-Version: 2.2 Name: extras_dep Version: 1.0.0 - Provides-Extra: extra_without_associated_deps - Provides-Extra: extra_with_unmet_deps - Requires-Dist: unmet_dep; extra == 'extra_with_unmet_deps' - Provides-Extra: extra_with_met_deps - Requires-Dist: extras_dep; extra == 'extra_with_met_deps' - Provides-Extra: recursive_extra_with_unmet_deps - Requires-Dist: recursive_dep; extra == 'recursive_extra_with_unmet_deps' + Provides-Extra: extra-without-associated-deps + Provides-Extra: extra-with_unmet-deps + Requires-Dist: unmet_dep; extra == 'extra-with-unmet-deps' + Provides-Extra: extra-with-met-deps + Requires-Dist: extras_dep; extra == 'extra-with-met-deps' + Provides-Extra: recursive-extra-with-unmet-deps + Requires-Dist: recursive_dep; extra == 'recursive-extra-with-unmet-deps' """ ).strip() @@ -142,27 +142,27 @@ ('requireless_dep', None), ('extras_dep[undefined_extra]', None), # would the wheel builder filter this out? - ('extras_dep[extra_without_associated_deps]', None), + ('extras_dep[extra-without-associated-deps]', None), ( - 'extras_dep[extra_with_unmet_deps]', - ('extras_dep[extra_with_unmet_deps]', 'unmet_dep; extra == "extra_with_unmet_deps"'), + 'extras_dep[extra-with-unmet-deps]', + ('extras_dep[extra-with-unmet-deps]', 'unmet_dep; extra == "extra-with-unmet-deps"'), ), ( - 'extras_dep[recursive_extra_with_unmet_deps]', + 'extras_dep[recursive-extra-with-unmet-deps]', ( - 'extras_dep[recursive_extra_with_unmet_deps]', - 'recursive_dep; extra == "recursive_extra_with_unmet_deps"', + 'extras_dep[recursive-extra-with-unmet-deps]', + 'recursive_dep; extra == "recursive-extra-with-unmet-deps"', 'recursive_unmet_dep', ), ), - ('extras_dep[extra_with_met_deps]', None), + ('extras_dep[extra-with-met-deps]', None), ('missing_dep; python_version>"10"', None), ('missing_dep; python_version<="1"', None), ('missing_dep; python_version>="1"', ('missing_dep; python_version >= "1"',)), ('extras_dep == 1.0.0', None), ('extras_dep == 2.0.0', ('extras_dep==2.0.0',)), - ('extras_dep[extra_without_associated_deps] == 1.0.0', None), - ('extras_dep[extra_without_associated_deps] == 2.0.0', ('extras_dep[extra_without_associated_deps]==2.0.0',)), + ('extras_dep[extra-without-associated-deps] == 1.0.0', None), + ('extras_dep[extra-without-associated-deps] == 2.0.0', ('extras_dep[extra-without-associated-deps]==2.0.0',)), ('prerelease_dep >= 1.0.0', None), ('circular_dep', None), ], @@ -185,25 +185,25 @@ def test_init(mocker, package_test_flit, package_legacy, test_no_permission, package_test_bad_syntax): - mocker.patch('pep517.wrappers.Pep517HookCaller') + mocker.patch('pyproject_hooks.BuildBackendHookCaller') # correct flit pyproject.toml builder = build.ProjectBuilder(package_test_flit) - pep517.wrappers.Pep517HookCaller.assert_called_with( + pyproject_hooks.BuildBackendHookCaller.assert_called_with( package_test_flit, 'flit_core.buildapi', backend_path=None, python_executable=sys.executable, runner=builder._runner ) - pep517.wrappers.Pep517HookCaller.reset_mock() + pyproject_hooks.BuildBackendHookCaller.reset_mock() # custom python builder = build.ProjectBuilder(package_test_flit, python_executable='some-python') - pep517.wrappers.Pep517HookCaller.assert_called_with( + pyproject_hooks.BuildBackendHookCaller.assert_called_with( package_test_flit, 'flit_core.buildapi', backend_path=None, python_executable='some-python', runner=builder._runner ) - pep517.wrappers.Pep517HookCaller.reset_mock() + pyproject_hooks.BuildBackendHookCaller.reset_mock() # FileNotFoundError builder = build.ProjectBuilder(package_legacy) - pep517.wrappers.Pep517HookCaller.assert_called_with( + pyproject_hooks.BuildBackendHookCaller.assert_called_with( package_legacy, 'setuptools.build_meta:__legacy__', backend_path=None, @@ -221,6 +221,13 @@ build.ProjectBuilder(package_test_bad_syntax) +def test_init_makes_srcdir_absolute(package_test_flit): + rel_dir = os.path.relpath(package_test_flit, os.getcwd()) + assert not os.path.isabs(rel_dir) + builder = build.ProjectBuilder(rel_dir) + assert os.path.isabs(builder.srcdir) + + @pytest.mark.parametrize('value', [b'something', 'something_else']) def test_python_executable(package_test_flit, value): builder = build.ProjectBuilder(package_test_flit) @@ -256,15 +263,15 @@ def test_check_dependencies(mocker, package_test_flit): - mocker.patch('pep517.wrappers.Pep517HookCaller.get_requires_for_build_sdist') - mocker.patch('pep517.wrappers.Pep517HookCaller.get_requires_for_build_wheel') + mocker.patch('pyproject_hooks.BuildBackendHookCaller.get_requires_for_build_sdist') + mocker.patch('pyproject_hooks.BuildBackendHookCaller.get_requires_for_build_wheel') builder = build.ProjectBuilder(package_test_flit) side_effects = [ [], ['something'], - pep517.wrappers.BackendUnavailable, + pyproject_hooks.BackendUnavailable, ] builder._hook.get_requires_for_build_sdist.side_effect = copy.copy(side_effects) @@ -285,23 +292,8 @@ not builder.check_dependencies('wheel') -def test_working_directory(tmp_dir): - assert os.path.realpath(os.curdir) != os.path.realpath(tmp_dir) - with build._working_directory(tmp_dir): - assert os.path.realpath(os.curdir) == os.path.realpath(tmp_dir) - - -def test_working_directory_exc_is_not_transformed(mocker, package_test_flit, tmp_dir): - mocker.patch('build._working_directory', side_effect=OSError) - - builder = build.ProjectBuilder(package_test_flit) - with pytest.raises(OSError): - builder._call_backend('build_sdist', tmp_dir) - - def test_build(mocker, package_test_flit, tmp_dir): - mocker.patch('pep517.wrappers.Pep517HookCaller', autospec=True) - mocker.patch('build._working_directory', autospec=True) + mocker.patch('pyproject_hooks.BuildBackendHookCaller', autospec=True) builder = build.ProjectBuilder(package_test_flit) @@ -310,23 +302,19 @@ assert builder.build('sdist', tmp_dir) == os.path.join(tmp_dir, 'dist.tar.gz') builder._hook.build_sdist.assert_called_with(tmp_dir, None) - build._working_directory.assert_called_with(package_test_flit) assert builder.build('wheel', tmp_dir) == os.path.join(tmp_dir, 'dist.whl') builder._hook.build_wheel.assert_called_with(tmp_dir, None) - build._working_directory.assert_called_with(package_test_flit) with pytest.raises(build.BuildBackendException): - build._working_directory.assert_called_with(package_test_flit) builder.build('sdist', tmp_dir) with pytest.raises(build.BuildBackendException): - build._working_directory.assert_called_with(package_test_flit) builder.build('wheel', tmp_dir) def test_default_backend(mocker, package_legacy): - mocker.patch('pep517.wrappers.Pep517HookCaller', autospec=True) + mocker.patch('pyproject_hooks.BuildBackendHookCaller', autospec=True) builder = build.ProjectBuilder(package_legacy) @@ -334,7 +322,7 @@ def test_missing_backend(mocker, package_test_no_backend): - mocker.patch('pep517.wrappers.Pep517HookCaller', autospec=True) + mocker.patch('pyproject_hooks.BuildBackendHookCaller', autospec=True) builder = build.ProjectBuilder(package_test_no_backend) @@ -342,21 +330,21 @@ def test_missing_requires(mocker, package_test_no_requires): - mocker.patch('pep517.wrappers.Pep517HookCaller', autospec=True) + mocker.patch('pyproject_hooks.BuildBackendHookCaller', autospec=True) with pytest.raises(build.BuildException): build.ProjectBuilder(package_test_no_requires) def test_build_system_typo(mocker, package_test_typo): - mocker.patch('pep517.wrappers.Pep517HookCaller', autospec=True) + mocker.patch('pyproject_hooks.BuildBackendHookCaller', autospec=True) with pytest.warns(build.TypoWarning): build.ProjectBuilder(package_test_typo) def test_missing_outdir(mocker, tmp_dir, package_test_flit): - mocker.patch('pep517.wrappers.Pep517HookCaller', autospec=True) + mocker.patch('pyproject_hooks.BuildBackendHookCaller', autospec=True) builder = build.ProjectBuilder(package_test_flit) builder._hook.build_sdist.return_value = 'dist.tar.gz' @@ -368,7 +356,7 @@ def test_relative_outdir(mocker, tmp_dir, package_test_flit): - mocker.patch('pep517.wrappers.Pep517HookCaller', autospec=True) + mocker.patch('pyproject_hooks.BuildBackendHookCaller', autospec=True) builder = build.ProjectBuilder(package_test_flit) builder._hook.build_sdist.return_value = 'dist.tar.gz' @@ -379,7 +367,7 @@ def test_build_not_dir_outdir(mocker, tmp_dir, package_test_flit): - mocker.patch('pep517.wrappers.Pep517HookCaller', autospec=True) + mocker.patch('pyproject_hooks.BuildBackendHookCaller', autospec=True) builder = build.ProjectBuilder(package_test_flit) builder._hook.build_sdist.return_value = 'dist.tar.gz' @@ -449,29 +437,27 @@ def test_prepare(mocker, tmp_dir, package_test_flit): - mocker.patch('pep517.wrappers.Pep517HookCaller', autospec=True) - mocker.patch('build._working_directory', autospec=True) + mocker.patch('pyproject_hooks.BuildBackendHookCaller', autospec=True) builder = build.ProjectBuilder(package_test_flit) builder._hook.prepare_metadata_for_build_wheel.return_value = 'dist-1.0.dist-info' assert builder.prepare('wheel', tmp_dir) == os.path.join(tmp_dir, 'dist-1.0.dist-info') builder._hook.prepare_metadata_for_build_wheel.assert_called_with(tmp_dir, None, _allow_fallback=False) - build._working_directory.assert_called_with(package_test_flit) def test_prepare_no_hook(mocker, tmp_dir, package_test_flit): - mocker.patch('pep517.wrappers.Pep517HookCaller', autospec=True) + mocker.patch('pyproject_hooks.BuildBackendHookCaller', autospec=True) builder = build.ProjectBuilder(package_test_flit) - failure = pep517.wrappers.HookMissing('prepare_metadata_for_build_wheel') + failure = pyproject_hooks.HookMissing('prepare_metadata_for_build_wheel') builder._hook.prepare_metadata_for_build_wheel.side_effect = failure assert builder.prepare('wheel', tmp_dir) is None def test_prepare_error(mocker, tmp_dir, package_test_flit): - mocker.patch('pep517.wrappers.Pep517HookCaller', autospec=True) + mocker.patch('pyproject_hooks.BuildBackendHookCaller', autospec=True) builder = build.ProjectBuilder(package_test_flit) builder._hook.prepare_metadata_for_build_wheel.side_effect = Exception @@ -481,7 +467,7 @@ def test_prepare_not_dir_outdir(mocker, tmp_dir, package_test_flit): - mocker.patch('pep517.wrappers.Pep517HookCaller', autospec=True) + mocker.patch('pyproject_hooks.BuildBackendHookCaller', autospec=True) builder = build.ProjectBuilder(package_test_flit) @@ -493,7 +479,7 @@ def test_no_outdir_single(mocker, tmp_dir, package_test_flit): - mocker.patch('pep517.wrappers.Pep517HookCaller.prepare_metadata_for_build_wheel', return_value='') + mocker.patch('pyproject_hooks.BuildBackendHookCaller.prepare_metadata_for_build_wheel', return_value='') builder = build.ProjectBuilder(package_test_flit) @@ -504,7 +490,7 @@ def test_no_outdir_multiple(mocker, tmp_dir, package_test_flit): - mocker.patch('pep517.wrappers.Pep517HookCaller.prepare_metadata_for_build_wheel', return_value='') + mocker.patch('pyproject_hooks.BuildBackendHookCaller.prepare_metadata_for_build_wheel', return_value='') builder = build.ProjectBuilder(package_test_flit) @@ -578,7 +564,7 @@ @pytest.mark.skipif(sys.version_info >= (3, 11), reason='No need to test old toml support on 3.11+') def test_toml_instead_of_tomli(mocker, mock_tomli_not_available, tmp_dir, package_test_flit): - mocker.patch('pep517.wrappers.Pep517HookCaller', autospec=True) + mocker.patch('pyproject_hooks.BuildBackendHookCaller', autospec=True) builder = build.ProjectBuilder(package_test_flit) builder._hook.build_sdist.return_value = 'dist.tar.gz' @@ -589,7 +575,7 @@ def test_log(mocker, caplog, package_test_flit): - mocker.patch('pep517.wrappers.Pep517HookCaller', autospec=True) + mocker.patch('pyproject_hooks.BuildBackendHookCaller', autospec=True) mocker.patch('build.ProjectBuilder._call_backend', return_value='some_path') caplog.set_level(logging.DEBUG) @@ -609,8 +595,6 @@ ('INFO', 'Building wheel...'), ('INFO', 'something'), ] - if sys.version_info >= (3, 8): # stacklevel - assert caplog.records[-1].lineno == 602 @pytest.mark.parametrize( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/tests/test_self_packaging.py new/build-0.10.0/tests/test_self_packaging.py --- old/build-0.9.0/tests/test_self_packaging.py 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/tests/test_self_packaging.py 2023-01-11 21:31:00.000000000 +0100 @@ -18,17 +18,6 @@ 'PKG-INFO', 'README.md', 'pyproject.toml', - 'setup.cfg', - 'setup.py', - 'src', - 'src/build', - 'src/build.egg-info', - 'src/build.egg-info/PKG-INFO', - 'src/build.egg-info/SOURCES.txt', - 'src/build.egg-info/dependency_links.txt', - 'src/build.egg-info/entry_points.txt', - 'src/build.egg-info/requires.txt', - 'src/build.egg-info/top_level.txt', 'src/build/__init__.py', 'src/build/__main__.py', 'src/build/env.py', @@ -47,7 +36,6 @@ 'dist-info/RECORD', 'dist-info/WHEEL', 'dist-info/entry_points.txt', - 'dist-info/top_level.txt', } @@ -70,7 +58,7 @@ (sdist,) = tmpdir.visit('*.tar.gz') with tarfile.open(str(sdist), 'r:gz') as tar: - simpler = {n.split('/', 1)[-1] for n in tar.getnames()[1:]} + simpler = {n.split('/', 1)[-1] for n in tar.getnames()} assert simpler == sdist_files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-0.9.0/tox.ini new/build-0.10.0/tox.ini --- old/build-0.9.0/tox.ini 2022-10-27 12:42:48.000000000 +0200 +++ new/build-0.10.0/tox.ini 2023-01-11 21:31:00.000000000 +0100 @@ -4,7 +4,7 @@ type docs path - {py311, py310, py39, py38, py37, py36, pypy37, pypy38, pypy39}{, -min} + {py311, py310, py39, py38, py37, pypy37, pypy38, pypy39}{, -min} isolated_build = true skip_missing_interpreters = true minversion = 3.14 @@ -57,7 +57,7 @@ commands = mypy -[testenv:{py311, py310, py39, py38, py37, py36, pypy37, pypy38, pypy39}-min] +[testenv:{py311, py310, py39, py38, py37, pypy37, pypy38, pypy39}-min] description = check minimum versions required of all dependencies skip_install = true commands_pre = @@ -65,7 +65,7 @@ [testenv:docs] description = build documentations -basepython = python3.8 +basepython = python3.10 extras = docs commands = @@ -100,7 +100,7 @@ coverage xml -o {toxworkdir}/coverage.xml -i coverage html -d {toxworkdir}/htmlcov -i python -m diff_cover.diff_cover_tool --compare-branch {env:DIFF_AGAINST:origin/main} {toxworkdir}/coverage.xml -depends = {py311, py310, py39, py38, py37, py36, pypy37, pypy38, pypy39}{,-min}, path +depends = {py311, py310, py39, py38, py37, pypy37, pypy38, pypy39}{,-min}, path [flake8] max-line-length = 127

1 0

commit python-pytest-benchmark for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pytest-benchmark for openSUSE:Factory checked in at 2023-03-31 21:14:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pytest-benchmark (Old) and /work/SRC/openSUSE:Factory/.python-pytest-benchmark.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pytest-benchmark" Fri Mar 31 21:14:03 2023 rev:11 rq:1072990 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pytest-benchmark/python-pytest-benchmark.changes 2023-01-18 13:08:33.340037542 +0100 +++ /work/SRC/openSUSE:Factory/.python-pytest-benchmark.new.31432/python-pytest-benchmark.changes 2023-03-31 21:14:08.538076436 +0200 @@ -1,0 +2,6 @@ +Mon Mar 20 05:13:36 UTC 2023 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Add ptch ignore-deprecationwarning.patch: + * Ignore DeprecationWarning, some of our dependancies use pkg_resources. + +------------------------------------------------------------------- New: ---- ignore-deprecationwarning.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pytest-benchmark.spec ++++++ --- /var/tmp/diff_new_pack.Mus3rU/_old 2023-03-31 21:14:08.974077991 +0200 +++ /var/tmp/diff_new_pack.Mus3rU/_new 2023-03-31 21:14:08.978078005 +0200 @@ -27,6 +27,9 @@ Patch0: fix-test-fast.patch # PATCH-FIX-OPENSUSE py311.patch gh#ionelmc/pytest-benchmark#232 Patch1: py311.patch +# PATCH-FIX-OPENSUSE Ignore DeprecationWarning, some of our dependancies use +# pkg_resources. +Patch2: ignore-deprecationwarning.patch BuildRequires: %{python_module aspectlib} BuildRequires: %{python_module elasticsearch} BuildRequires: %{python_module freezegun} ++++++ ignore-deprecationwarning.patch ++++++ Index: pytest-benchmark-4.0.0/pytest.ini =================================================================== --- pytest-benchmark-4.0.0.orig/pytest.ini +++ pytest-benchmark-4.0.0/pytest.ini @@ -32,6 +32,7 @@ testpaths = # Idea from: https://til.simonwillison.net/pytest/treat-warnings-as-errors filterwarnings = error + ignore::DeprecationWarning # You can add exclusions, some examples: # ignore:'pytest_benchmark' defines default_app_config:PendingDeprecationWarning:: # ignore:The {{% if:::

1 0

commit python-setuptools for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-setuptools for openSUSE:Factory checked in at 2023-03-31 21:14:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-setuptools (Old) and /work/SRC/openSUSE:Factory/.python-setuptools.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-setuptools" Fri Mar 31 21:14:02 2023 rev:74 rq:1070290 version:67.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-setuptools/python-setuptools.changes 2022-11-26 18:45:01.747061945 +0100 +++ /work/SRC/openSUSE:Factory/.python-setuptools.new.31432/python-setuptools.changes 2023-03-31 21:14:06.390068776 +0200 @@ -1,0 +2,34 @@ +Thu Mar 9 05:04:25 UTC 2023 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Update to 67.6.0: + * Deprecations + + #3434: Added deprecation warning for pkg_resources.declare_namespace. + * Breaking Changes + + #3741: Removed patching of distutils._msvccompiler.gen_lib_options for + compatibility with Numpy < 1.11.2 -- by :user:`mgorny` + + #2497: Support for PEP 440 non-conforming versions has been removed. + * Changes + + #3804: Added caching for supported wheel tags. + + #3846: Added pruning heuristics to PackageFinder based on exclude. + + #3843: Although pkg_resources has been discouraged for use, some + projects still consider pkg_resources viable for usage. This change + makes it clear that pkg_resources should not be used, emitting a + DeprecationWarning when imported. + + #3809: Merge with distutils@8c3c3d29, including fix for + sysconfig.get_python_inc() (pypa/distutils#178), fix for segfault on + MinGW (pypa/distutils#196), and better has_function + support (pypa/distutils#195, #3648). + + #3795: Ensured that __file__ is an absolute path when executing setup.py + as part of setuptools.build_meta. + + #3685: Fix improper usage of deprecated/removed pkgutil APIs in + Python 3.12+. + + #3769: Replace 'appdirs' with 'platformdirs'. + * Misc + + #3838: Improved error messages for pyproject.toml validations. + + #3839: Fixed pkg_resources errors caused when parsing metadata of + packages that are already installed but do not conform with PEP 440. + + #3823: Fixes egg_info code path triggered during integration with pip. + + #3782: Fixed problem with file directive in tool.setuptools.dynamic + when value is a simple string instead of list. + +------------------------------------------------------------------- Old: ---- setuptools-65.6.3.tar.gz New: ---- setuptools-67.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-setuptools.spec ++++++ --- /var/tmp/diff_new_pack.PQH7Oa/_old 2023-03-31 21:14:06.890070560 +0200 +++ /var/tmp/diff_new_pack.PQH7Oa/_new 2023-03-31 21:14:06.894070573 +0200 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,7 +37,7 @@ # in order to avoid rewriting for subpackage generator %define mypython python Name: python-setuptools%{psuffix} -Version: 65.6.3 +Version: 67.6.0 Release: 0 Summary: Download, build, install, upgrade, and uninstall Python packages License: Apache-2.0 AND MIT AND BSD-2-Clause AND Python-2.0 @@ -89,14 +89,6 @@ %prep %autosetup -p1 -n setuptools-%{version} -# strip shebangs to fix rpmlint warnings -# "explain the sed": -# 1 = first line only -# s@...@...@ = same as s/.../.../ except with @ instead of / -# ^ = start; #!/ = shebang leading characters; .* = rest of line; $ = end -# replace with nothing -sed -r -i '1s@^#!/.*$@@' pkg_resources/_vendor/appdirs.py - %build %if ! %{with wheel} %python_build ++++++ setuptools-65.6.3.tar.gz -> setuptools-67.6.0.tar.gz ++++++ ++++ 40584 lines of diff (skipped)

1 0

commit spirv-tools for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package spirv-tools for openSUSE:Factory checked in at 2023-03-31 21:14:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spirv-tools (Old) and /work/SRC/openSUSE:Factory/.spirv-tools.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "spirv-tools" Fri Mar 31 21:14:00 2023 rev:38 rq:1075490 version:2023.2 Changes: -------- --- /work/SRC/openSUSE:Factory/spirv-tools/spirv-tools.changes 2023-01-21 19:10:06.604801413 +0100 +++ /work/SRC/openSUSE:Factory/.spirv-tools.new.31432/spirv-tools.changes 2023-03-31 21:14:04.802063114 +0200 @@ -1,0 +2,12 @@ +Thu Mar 30 07:42:40 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 2023.2 + * spirv-val: Initial SPV_EXT_mesh_shader builtins + * Add C interface for Optimizer + +------------------------------------------------------------------- +Wed Mar 29 18:42:49 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update buildrequires to match published dependency list + +------------------------------------------------------------------- Old: ---- v2023.1.tar.gz New: ---- v2023.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spirv-tools.spec ++++++ --- /var/tmp/diff_new_pack.4giNDW/_old 2023-03-31 21:14:05.446065410 +0200 +++ /var/tmp/diff_new_pack.4giNDW/_new 2023-03-31 21:14:05.458065453 +0200 @@ -17,10 +17,10 @@ %define _lto_cflags %nil -%define lname libSPIRV-Tools-2023_1 +%define lname libSPIRV-Tools-2023_2 Name: spirv-tools -Version: 2023.1 +Version: 2023.2 Release: 0 Summary: API and commands for processing SPIR-V modules License: Apache-2.0 @@ -31,12 +31,12 @@ Source9: baselibs.conf Patch1: ver.diff BuildRequires: bison -BuildRequires: cmake >= 2.8.12 +BuildRequires: cmake >= 3.17.2 BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: python3-base BuildRequires: python3-xml -BuildRequires: spirv-headers >= 1.6.1+sdk236+git7 +BuildRequires: spirv-headers >= 1.6.1+sdk243 %description The package includes an assembler, binary module parser, @@ -64,10 +64,9 @@ integration into other code bases directly. %prep -%define slibv 2023.1 %autosetup -p1 -n SPIRV-Tools-%version find . -type f -name CMakeLists.txt -exec \ - perl -i -pe 's{\@PACKAGE_VERSION\@}{%slibv}' CMakeLists.txt {} + + perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt {} + %build %cmake -DSPIRV-Headers_SOURCE_DIR="%_prefix" \ @@ -78,7 +77,7 @@ %cmake_install perl -i -lpe 's{^#!/usr/bin/env sh$}{#!/bin/sh}' "%buildroot/%_bindir/spirv-lesspipe.sh" for i in "" "-diff" "-link" "-lint" "-opt" "-reduce" "-shared"; do - ln -s "libSPIRV-Tools$i-%slibv.so" "%buildroot/%_libdir/libSPIRV-Tools$i.so" + ln -s "libSPIRV-Tools$i-%version.so" "%buildroot/%_libdir/libSPIRV-Tools$i.so" done %post -n %lname -p /sbin/ldconfig ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.4giNDW/_old 2023-03-31 21:14:05.498065596 +0200 +++ /var/tmp/diff_new_pack.4giNDW/_new 2023-03-31 21:14:05.502065610 +0200 @@ -1,5 +1,5 @@ -libSPIRV-Tools-2023_1 +libSPIRV-Tools-2023_2 spirv-tools-devel requires -spirv-tools-<targettype> - requires "libSPIRV-Tools-2023_1-<targettype> = <version>" + requires "libSPIRV-Tools-2023_2-<targettype> = <version>" ++++++ v2023.1.tar.gz -> v2023.2.tar.gz ++++++ ++++ 6136 lines of diff (skipped)

1 0

commit open-vm-tools for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at 2023-03-31 21:13:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-vm-tools (Old) and /work/SRC/openSUSE:Factory/.open-vm-tools.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "open-vm-tools" Fri Mar 31 21:13:59 2023 rev:109 rq:1075347 version:12.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/open-vm-tools/open-vm-tools.changes 2022-12-31 11:22:54.568452595 +0100 +++ /work/SRC/openSUSE:Factory/.open-vm-tools.new.31432/open-vm-tools.changes 2023-03-31 21:14:01.698052045 +0200 @@ -1,0 +2,24 @@ +Tue Mar 28 23:16:47 UTC 2023 - Kirk Allan <kallan(a)suse.com> + +- Update to 12.2.0 (build 21223074) (boo#1209128) + - There are no new features in the open-vm-tools 12.2.0 release. This is + primarily a maintenance release that addresses a few critical problems, + including: + - Linux quiesced snapshots have been updated to avoid intermittent hangs of + the vmtoolsd process. + - Updated the guestOps to handle some edge cases when File_GetSize() fails + or returns -1. + - A number of Coverity reported issues have been addressed. + - Detect the proto files for the containerd grpc client in alternate + locations. Pull request #626 + - FreeBSD: Support newer releases and code clean-up for earlier versions. + Pull request #584 + - Please refer to the release notes at + https://github.com/vmware/open-vm-tools/blob/stable-12.2.0/ReleaseNotes.md + - The granular changes that have gone into the 12.2.0 release are in the + ChangeLog at https://github.com/vmware/open-vm-tools/blob/stable-12.2.0/ + open-vm-tools/ChangeLog +- Update detect-suse-location.patch to remove upstream accepted portion of the + patch (jsc-PED-1344). + +------------------------------------------------------------------- Old: ---- open-vm-tools-12.1.5.tar.xz New: ---- open-vm-tools-12.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.5zo93W/_old 2023-03-31 21:14:02.898056324 +0200 +++ /var/tmp/diff_new_pack.5zo93W/_new 2023-03-31 21:14:02.926056424 +0200 @@ -1,7 +1,7 @@ # # spec file for package open-vm-tools # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. # # All modifications and additions to the file contributed by third parties @@ -38,7 +38,7 @@ %define with_X 1 Name: open-vm-tools -Version: 12.1.5 +Version: 12.2.0 Release: 0 Summary: Open Virtual Machine Tools License: BSD-3-Clause AND GPL-2.0-only AND LGPL-2.1-only ++++++ _service ++++++ --- /var/tmp/diff_new_pack.5zo93W/_old 2023-03-31 21:14:03.274057665 +0200 +++ /var/tmp/diff_new_pack.5zo93W/_new 2023-03-31 21:14:03.310057793 +0200 @@ -2,9 +2,9 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/vmware/open-vm-tools.git</param> - <param name="revision">stable-12.1.5</param> + <param name="revision">stable-12.2.0</param> <param name="filename">open-vm-tools</param> - <param name="versionformat">12.1.5</param> + <param name="versionformat">12.2.0</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ detect-suse-location.patch ++++++ --- /var/tmp/diff_new_pack.5zo93W/_old 2023-03-31 21:14:03.442058264 +0200 +++ /var/tmp/diff_new_pack.5zo93W/_new 2023-03-31 21:14:03.482058407 +0200 @@ -1,23 +1,8 @@ -diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 3c058135..203fdc6f 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac -@@ -726,12 +726,18 @@ AC_DEFUN([AC_VMW_CONTAINERINFO_MSG],[ - # - # proto files needed by containerd grpc client. - # -- shared_prefix=/usr/share/gocode/src/github.com -+ for d in /usr/share/gocode/src /usr/share/go/1.*/contrib/src; do -+ if test -d "$d"/github.com; then -+ src_prefix="$d" -+ break -+ fi -+ done -+ shared_prefix=$src_prefix/github.com - AC_SUBST(TYPES_DIR, github.com/containerd/containerd/api/types) +@@ -741,7 +741,7 @@ AC_DEFUN([AC_VMW_CONTAINERINFO_MSG],[ AC_SUBST(TASKS_PROTOPATH, $shared_prefix/containerd/containerd/api/services/tasks/v1) -- AC_SUBST(DEP_PROTOPATH, /usr/share/gocode/src) -+ AC_SUBST(DEP_PROTOPATH, $src_prefix) + AC_SUBST(DEP_PROTOPATH, $src_prefix) AC_SUBST(CONTAINERD_PROTOPATH, $shared_prefix/containerd/containerd/api/services/containers/v1) - AC_SUBST(GOGO_PROTOPATH, $shared_prefix/gogo/protobuf) + AC_SUBST(GOGO_PROTOPATH, $shared_prefix/containerd/containerd/vendor/github.com/gogo/protobuf) ++++++ open-vm-tools-12.1.5.tar.xz -> open-vm-tools-12.2.0.tar.xz ++++++ ++++ 8366 lines of diff (skipped)

1 0

commit spirv-headers for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package spirv-headers for openSUSE:Factory checked in at 2023-03-31 21:13:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spirv-headers (Old) and /work/SRC/openSUSE:Factory/.spirv-headers.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "spirv-headers" Fri Mar 31 21:13:58 2023 rev:35 rq:1075345 version:1.6.1+sdk243 Changes: -------- --- /work/SRC/openSUSE:Factory/spirv-headers/spirv-headers.changes 2023-01-30 17:16:40.858372599 +0100 +++ /work/SRC/openSUSE:Factory/.spirv-headers.new.31432/spirv-headers.changes 2023-03-31 21:14:00.590048094 +0200 @@ -1,0 +2,9 @@ +Wed Mar 29 18:40:35 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 1.6.1/SDK-1.3.243.0 + * Added SPRIV_INTEL_argument_interfaces, RegisterMapInterfaceINTEL, + SPV_QCOM_image_processing + * Added support for SPV_INTEL_fpga_latency_control extension + * Headers support for SPV_INTEL_bfloat16_conversion + +------------------------------------------------------------------- Old: ---- sdk-1.3.239.0.tar.gz New: ---- sdk-1.3.243.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spirv-headers.spec ++++++ --- /var/tmp/diff_new_pack.hBJRUC/_old 2023-03-31 21:14:01.126050006 +0200 +++ /var/tmp/diff_new_pack.hBJRUC/_new 2023-03-31 21:14:01.130050019 +0200 @@ -24,13 +24,14 @@ # and the independently increasing toolchain release number (239). Name: spirv-headers -Version: 1.6.1+sdk239 +Version: 1.6.1+sdk243 +%define innerver 1.3.243.0 Release: 0 Summary: Machine-readable files from the SPIR-V registry License: MIT Group: Development/Libraries/C and C++ URL: https://github.com/KhronosGroup/SPIRV-Headers -Source: https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-1.3.239.0.tar.gz +Source: https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-%innerver.tar.gz BuildArch: noarch BuildRequires: cmake >= 2.8 BuildRequires: fdupes @@ -47,7 +48,7 @@ * The XML registry file. %prep -%autosetup -n SPIRV-Headers-sdk-1.3.239.0 +%autosetup -n SPIRV-Headers-sdk-%innerver %build %cmake ++++++ sdk-1.3.239.0.tar.gz -> sdk-1.3.243.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/NonSemanticDebugBreak.h new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/NonSemanticDebugBreak.h --- old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/NonSemanticDebugBreak.h 1970-01-01 01:00:00.000000000 +0100 +++ new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/NonSemanticDebugBreak.h 2023-03-08 18:22:35.000000000 +0100 @@ -0,0 +1,50 @@ +// Copyright (c) 2020 The Khronos Group Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and/or associated documentation files (the +// "Materials"), to deal in the Materials without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Materials, and to +// permit persons to whom the Materials are furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Materials. +// +// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS +// KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS +// SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT +// https://www.khronos.org/registry/ +// +// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +// + +#ifndef SPIRV_UNIFIED1_NonSemanticDebugBreak_H_ +#define SPIRV_UNIFIED1_NonSemanticDebugBreak_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +enum { + NonSemanticDebugBreakRevision = 1, + NonSemanticDebugBreakRevision_BitWidthPadding = 0x7fffffff +}; + +enum NonSemanticDebugBreakInstructions { + NonSemanticDebugBreakDebugBreak = 1, + NonSemanticDebugBreakInstructionsMax = 0x7fffffff +}; + + +#ifdef __cplusplus +} +#endif + +#endif // SPIRV_UNIFIED1_NonSemanticDebugBreak_H_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/extinst.nonsemantic.debugbreak.grammar.json new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/extinst.nonsemantic.debugbreak.grammar.json --- old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/extinst.nonsemantic.debugbreak.grammar.json 1970-01-01 01:00:00.000000000 +0100 +++ new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/extinst.nonsemantic.debugbreak.grammar.json 2023-03-08 18:22:35.000000000 +0100 @@ -0,0 +1,9 @@ +{ + "revision" : 1, + "instructions" : [ + { + "opname" : "DebugBreak", + "opcode" : 1 + } + ] +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.bf new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.bf --- old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.bf 2023-01-04 16:17:40.000000000 +0100 +++ new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.bf 2023-03-08 18:22:35.000000000 +0100 @@ -193,6 +193,7 @@ NumSIMDWorkitemsINTEL = 5896, SchedulerTargetFmaxMhzINTEL = 5903, StreamingInterfaceINTEL = 6154, + RegisterMapInterfaceINTEL = 6160, NamedBarrierCountINTEL = 6417, } @@ -507,6 +508,8 @@ MaxByteOffsetId = 47, NoSignedWrap = 4469, NoUnsignedWrap = 4470, + WeightTextureQCOM = 4487, + BlockMatchTextureQCOM = 4488, ExplicitInterpAMD = 4999, OverrideCoverageNV = 5248, PassthroughNV = 5250, @@ -575,6 +578,17 @@ SingleElementVectorINTEL = 6085, VectorComputeCallableFunctionINTEL = 6087, MediaBlockIOINTEL = 6140, + LatencyControlLabelINTEL = 6172, + LatencyControlConstraintINTEL = 6173, + ConduitKernelArgumentINTEL = 6175, + RegisterMapKernelArgumentINTEL = 6176, + MMHostInterfaceAddressWidthINTEL = 6177, + MMHostInterfaceDataWidthINTEL = 6178, + MMHostInterfaceLatencyINTEL = 6179, + MMHostInterfaceReadWriteModeINTEL = 6180, + MMHostInterfaceMaxBurstINTEL = 6181, + MMHostInterfaceWaitRequestINTEL = 6182, + StableKernelArgumentINTEL = 6183, } [AllowDuplicates, CRepr] public enum BuiltIn @@ -1010,6 +1024,9 @@ RayQueryKHR = 4472, RayTraversalPrimitiveCullingKHR = 4478, RayTracingKHR = 4479, + TextureSampleWeightedQCOM = 4484, + TextureBoxFilterQCOM = 4485, + TextureBlockMatchQCOM = 4486, Float16ImageAMD = 5008, ImageGatherBiasLodAMD = 5009, FragmentMaskAMD = 5010, @@ -1137,7 +1154,11 @@ OptNoneINTEL = 6094, AtomicFloat16AddEXT = 6095, DebugInfoModuleINTEL = 6114, + BFloat16ConversionINTEL = 6115, SplitBarrierINTEL = 6141, + FPGAKernelAttributesv2INTEL = 6161, + FPGALatencyControlINTEL = 6171, + FPGAArgumentInterfacesINTEL = 6174, GroupUniformArithmeticKHR = 6400, } @@ -1624,6 +1645,10 @@ OpRayQueryConfirmIntersectionKHR = 4476, OpRayQueryProceedKHR = 4477, OpRayQueryGetIntersectionTypeKHR = 4479, + OpImageSampleWeightedQCOM = 4480, + OpImageBoxFilterQCOM = 4481, + OpImageBlockMatchSSDQCOM = 4482, + OpImageBlockMatchSADQCOM = 4483, OpGroupIAddNonUniformAMD = 5000, OpGroupFAddNonUniformAMD = 5001, OpGroupFMinNonUniformAMD = 5002, @@ -1941,6 +1966,8 @@ OpTypeStructContinuedINTEL = 6090, OpConstantCompositeContinuedINTEL = 6091, OpSpecConstantCompositeContinuedINTEL = 6092, + OpConvertFToBF16INTEL = 6116, + OpConvertBF16ToFINTEL = 6117, OpControlBarrierArriveINTEL = 6142, OpControlBarrierWaitINTEL = 6143, OpGroupIMulKHR = 6401, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.core.grammar.json new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.core.grammar.json --- old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.core.grammar.json 2023-01-04 16:17:40.000000000 +0100 +++ new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.core.grammar.json 2023-03-08 18:22:35.000000000 +0100 @@ -4593,6 +4593,66 @@ "version" : "None" }, { + "opname" : "OpImageSampleWeightedQCOM", + "class" : "Image", + "opcode" : 4480, + "operands" : [ + { "kind" : "IdResultType" }, + { "kind" : "IdResult" }, + { "kind" : "IdRef", "name" : "'Texture'" }, + { "kind" : "IdRef", "name" : "'Coordinates'" }, + { "kind" : "IdRef", "name" : "'Weights'" } + ], + "capabilities" : [ "TextureSampleWeightedQCOM" ], + "version" : "None" + }, + { + "opname" : "OpImageBoxFilterQCOM", + "class" : "Image", + "opcode" : 4481, + "operands" : [ + { "kind" : "IdResultType" }, + { "kind" : "IdResult" }, + { "kind" : "IdRef", "name" : "'Texture'" }, + { "kind" : "IdRef", "name" : "'Coordinates'" }, + { "kind" : "IdRef", "name" : "'Box Size'" } + ], + "capabilities" : [ "TextureBoxFilterQCOM" ], + "version" : "None" + }, + { + "opname" : "OpImageBlockMatchSSDQCOM", + "class" : "Image", + "opcode" : 4482, + "operands" : [ + { "kind" : "IdResultType" }, + { "kind" : "IdResult" }, + { "kind" : "IdRef", "name" : "'Target'" }, + { "kind" : "IdRef", "name" : "'Target Coordinates'" }, + { "kind" : "IdRef", "name" : "'Reference'" }, + { "kind" : "IdRef", "name" : "'Reference Coordinates'" }, + { "kind" : "IdRef", "name" : "'Block Size'" } + ], + "capabilities" : [ "TextureBlockMatchQCOM" ], + "version" : "None" + }, + { + "opname" : "OpImageBlockMatchSADQCOM", + "class" : "Image", + "opcode" : 4483, + "operands" : [ + { "kind" : "IdResultType" }, + { "kind" : "IdResult" }, + { "kind" : "IdRef", "name" : "'Target'" }, + { "kind" : "IdRef", "name" : "'Target Coordinates'" }, + { "kind" : "IdRef", "name" : "'Reference'" }, + { "kind" : "IdRef", "name" : "'Reference Coordinates'" }, + { "kind" : "IdRef", "name" : "'Block Size'" } + ], + "capabilities" : [ "TextureBlockMatchQCOM" ], + "version" : "None" + }, + { "opname" : "OpGroupIAddNonUniformAMD", "class" : "Group", "opcode" : 5000, @@ -4751,7 +4811,6 @@ { "kind" : "IdScope", "name" : "'Scope'" } ], "capabilities" : [ "ShaderClockKHR" ], - "extensions" : [ "SPV_KHR_shader_clock" ], "version" : "None" }, { @@ -9045,6 +9104,30 @@ "version" : "None" }, { + "opname" : "OpConvertFToBF16INTEL", + "class" : "Conversion", + "opcode" : 6116, + "operands" : [ + { "kind" : "IdResultType" }, + { "kind" : "IdResult" }, + { "kind" : "IdRef", "name" : "'Float Value'" } + ], + "capabilities" : [ "BFloat16ConversionINTEL" ], + "version" : "None" + }, + { + "opname" : "OpConvertBF16ToFINTEL", + "class" : "Conversion", + "opcode" : 6117, + "operands" : [ + { "kind" : "IdResultType" }, + { "kind" : "IdResult" }, + { "kind" : "IdRef", "name" : "'BFloat16 Value'" } + ], + "capabilities" : [ "BFloat16ConversionINTEL" ], + "version" : "None" + }, + { "opname" : "OpControlBarrierArriveINTEL", "class" : "Barrier", "opcode" : 6142, @@ -10717,6 +10800,15 @@ "version" : "None" }, { + "enumerant" : "RegisterMapInterfaceINTEL", + "value" : 6160, + "parameters" : [ + { "kind" : "LiteralInteger", "name" : "'WaitForDoneWrite'" } + ], + "capabilities" : [ "FPGAKernelAttributesv2INTEL" ], + "version" : "None" + }, + { "enumerant" : "NamedBarrierCountINTEL", "value" : 6417, "parameters" : [ @@ -11988,6 +12080,18 @@ "version" : "1.4" }, { + "enumerant" : "WeightTextureQCOM", + "value" : 4487, + "extensions" : [ "SPV_QCOM_image_processing" ], + "version" : "None" + }, + { + "enumerant" : "BlockMatchTextureQCOM", + "value" : 4488, + "extensions" : [ "SPV_QCOM_image_processing" ], + "version" : "None" + }, + { "enumerant" : "ExplicitInterpAMD", "value" : 4999, "extensions" : [ "SPV_AMD_shader_explicit_vertex_parameter" ], @@ -12517,6 +12621,98 @@ "value" : 6140, "capabilities" : [ "VectorComputeINTEL" ], "version" : "None" + }, + { + "enumerant" : "LatencyControlLabelINTEL", + "value" : 6172, + "parameters" : [ + { "kind" : "LiteralInteger", "name" : "'Latency Label'" } + ], + "capabilities" : [ "FPGALatencyControlINTEL" ], + "version" : "None" + }, + { + "enumerant" : "LatencyControlConstraintINTEL", + "value" : 6173, + "parameters" : [ + { "kind" : "LiteralInteger", "name" : "'Relative To'" }, + { "kind" : "LiteralInteger", "name" : "'Control Type'" }, + { "kind" : "LiteralInteger", "name" : "'Relative Cycle'" } + ], + "capabilities" : [ "FPGALatencyControlINTEL" ], + "version" : "None" + }, + { + "enumerant" : "ConduitKernelArgumentINTEL", + "value" : 6175, + "capabilities" : [ "FPGAArgumentInterfacesINTEL" ], + "version" : "None" + }, + { + "enumerant" : "RegisterMapKernelArgumentINTEL", + "value" : 6176, + "capabilities" : [ "FPGAArgumentInterfacesINTEL" ], + "version" : "None" + }, + { + "enumerant" : "MMHostInterfaceAddressWidthINTEL", + "value" : 6177, + "capabilities" : [ "FPGAArgumentInterfacesINTEL" ], + "parameters" : [ + { "kind" : "LiteralInteger", "name" : "'AddressWidth'" } + ], + "version" : "None" + }, + { + "enumerant" : "MMHostInterfaceDataWidthINTEL", + "value" : 6178, + "capabilities" : [ "FPGAArgumentInterfacesINTEL" ], + "parameters" : [ + { "kind" : "LiteralInteger", "name" : "'DataWidth'" } + ], + "version" : "None" + }, + { + "enumerant" : "MMHostInterfaceLatencyINTEL", + "value" : 6179, + "capabilities" : [ "FPGAArgumentInterfacesINTEL" ], + "parameters" : [ + { "kind" : "LiteralInteger", "name" : "'Latency'" } + ], + "version" : "None" + }, + { + "enumerant" : "MMHostInterfaceReadWriteModeINTEL", + "value" : 6180, + "capabilities" : [ "FPGAArgumentInterfacesINTEL" ], + "parameters" : [ + { "kind" : "AccessQualifier", "name" : "'ReadWriteMode'" } + ], + "version" : "None" + }, + { + "enumerant" : "MMHostInterfaceMaxBurstINTEL", + "value" : 6181, + "capabilities" : [ "FPGAArgumentInterfacesINTEL" ], + "parameters" : [ + { "kind" : "LiteralInteger", "name" : "'MaxBurstCount'" } + ], + "version" : "None" + }, + { + "enumerant" : "MMHostInterfaceWaitRequestINTEL", + "value" : 6182, + "capabilities" : [ "FPGAArgumentInterfacesINTEL" ], + "parameters" : [ + { "kind" : "LiteralInteger", "name" : "'Waitrequest'" } + ], + "version" : "None" + }, + { + "enumerant" : "StableKernelArgumentINTEL", + "value" : 6183, + "capabilities" : [ "FPGAArgumentInterfacesINTEL" ], + "version" : "None" } ] }, @@ -14012,6 +14208,24 @@ "version" : "None" }, { + "enumerant" : "TextureSampleWeightedQCOM", + "value" : 4484, + "extensions" : [ "SPV_QCOM_image_processing" ], + "version" : "None" + }, + { + "enumerant" : "TextureBoxFilterQCOM", + "value" : 4485, + "extensions" : [ "SPV_QCOM_image_processing" ], + "version" : "None" + }, + { + "enumerant" : "TextureBlockMatchQCOM", + "value" : 4486, + "extensions" : [ "SPV_QCOM_image_processing" ], + "version" : "None" + }, + { "enumerant" : "Float16ImageAMD", "value" : 5008, "capabilities" : [ "Shader" ], @@ -14056,7 +14270,6 @@ { "enumerant" : "ShaderClockKHR", "value" : 5055, - "capabilities" : [ "Shader" ], "extensions" : [ "SPV_KHR_shader_clock" ], "version" : "None" }, @@ -14818,12 +15031,37 @@ "version" : "None" }, { + "enumerant" : "BFloat16ConversionINTEL", + "value" : 6115, + "extensions" : [ "SPV_INTEL_bfloat16_conversion" ], + "version" : "None" + }, + { "enumerant" : "SplitBarrierINTEL", "value" : 6141, "extensions" : [ "SPV_INTEL_split_barrier" ], "version" : "None" }, { + "enumerant" : "FPGAKernelAttributesv2INTEL", + "value" : 6161, + "capabilities" : [ "FPGAKernelAttributesINTEL" ], + "extensions" : [ "SPV_INTEL_kernel_attributes" ], + "version" : "None" + }, + { + "enumerant" : "FPGALatencyControlINTEL", + "value" : 6171, + "extensions" : [ "SPV_INTEL_fpga_latency_control" ], + "version" : "None" + }, + { + "enumerant" : "FPGAArgumentInterfacesINTEL", + "value" : 6174, + "extensions" : [ "SPV_INTEL_fpga_argument_interfaces" ], + "version" : "None" + }, + { "enumerant" : "GroupUniformArithmeticKHR", "value" : 6400, "extensions" : [ "SPV_KHR_uniform_group_instructions"], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.cs new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.cs --- old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.cs 2023-01-04 16:17:40.000000000 +0100 +++ new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.cs 2023-03-08 18:22:35.000000000 +0100 @@ -192,6 +192,7 @@ NumSIMDWorkitemsINTEL = 5896, SchedulerTargetFmaxMhzINTEL = 5903, StreamingInterfaceINTEL = 6154, + RegisterMapInterfaceINTEL = 6160, NamedBarrierCountINTEL = 6417, } @@ -506,6 +507,8 @@ MaxByteOffsetId = 47, NoSignedWrap = 4469, NoUnsignedWrap = 4470, + WeightTextureQCOM = 4487, + BlockMatchTextureQCOM = 4488, ExplicitInterpAMD = 4999, OverrideCoverageNV = 5248, PassthroughNV = 5250, @@ -574,6 +577,17 @@ SingleElementVectorINTEL = 6085, VectorComputeCallableFunctionINTEL = 6087, MediaBlockIOINTEL = 6140, + LatencyControlLabelINTEL = 6172, + LatencyControlConstraintINTEL = 6173, + ConduitKernelArgumentINTEL = 6175, + RegisterMapKernelArgumentINTEL = 6176, + MMHostInterfaceAddressWidthINTEL = 6177, + MMHostInterfaceDataWidthINTEL = 6178, + MMHostInterfaceLatencyINTEL = 6179, + MMHostInterfaceReadWriteModeINTEL = 6180, + MMHostInterfaceMaxBurstINTEL = 6181, + MMHostInterfaceWaitRequestINTEL = 6182, + StableKernelArgumentINTEL = 6183, } public enum BuiltIn @@ -1009,6 +1023,9 @@ RayQueryKHR = 4472, RayTraversalPrimitiveCullingKHR = 4478, RayTracingKHR = 4479, + TextureSampleWeightedQCOM = 4484, + TextureBoxFilterQCOM = 4485, + TextureBlockMatchQCOM = 4486, Float16ImageAMD = 5008, ImageGatherBiasLodAMD = 5009, FragmentMaskAMD = 5010, @@ -1136,7 +1153,11 @@ OptNoneINTEL = 6094, AtomicFloat16AddEXT = 6095, DebugInfoModuleINTEL = 6114, + BFloat16ConversionINTEL = 6115, SplitBarrierINTEL = 6141, + FPGAKernelAttributesv2INTEL = 6161, + FPGALatencyControlINTEL = 6171, + FPGAArgumentInterfacesINTEL = 6174, GroupUniformArithmeticKHR = 6400, } @@ -1623,6 +1644,10 @@ OpRayQueryConfirmIntersectionKHR = 4476, OpRayQueryProceedKHR = 4477, OpRayQueryGetIntersectionTypeKHR = 4479, + OpImageSampleWeightedQCOM = 4480, + OpImageBoxFilterQCOM = 4481, + OpImageBlockMatchSSDQCOM = 4482, + OpImageBlockMatchSADQCOM = 4483, OpGroupIAddNonUniformAMD = 5000, OpGroupFAddNonUniformAMD = 5001, OpGroupFMinNonUniformAMD = 5002, @@ -1940,6 +1965,8 @@ OpTypeStructContinuedINTEL = 6090, OpConstantCompositeContinuedINTEL = 6091, OpSpecConstantCompositeContinuedINTEL = 6092, + OpConvertFToBF16INTEL = 6116, + OpConvertBF16ToFINTEL = 6117, OpControlBarrierArriveINTEL = 6142, OpControlBarrierWaitINTEL = 6143, OpGroupIMulKHR = 6401, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.h new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.h --- old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.h 2023-01-04 16:17:40.000000000 +0100 +++ new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.h 2023-03-08 18:22:35.000000000 +0100 @@ -200,6 +200,7 @@ SpvExecutionModeNumSIMDWorkitemsINTEL = 5896, SpvExecutionModeSchedulerTargetFmaxMhzINTEL = 5903, SpvExecutionModeStreamingInterfaceINTEL = 6154, + SpvExecutionModeRegisterMapInterfaceINTEL = 6160, SpvExecutionModeNamedBarrierCountINTEL = 6417, SpvExecutionModeMax = 0x7fffffff, } SpvExecutionMode; @@ -512,6 +513,8 @@ SpvDecorationMaxByteOffsetId = 47, SpvDecorationNoSignedWrap = 4469, SpvDecorationNoUnsignedWrap = 4470, + SpvDecorationWeightTextureQCOM = 4487, + SpvDecorationBlockMatchTextureQCOM = 4488, SpvDecorationExplicitInterpAMD = 4999, SpvDecorationOverrideCoverageNV = 5248, SpvDecorationPassthroughNV = 5250, @@ -580,6 +583,17 @@ SpvDecorationSingleElementVectorINTEL = 6085, SpvDecorationVectorComputeCallableFunctionINTEL = 6087, SpvDecorationMediaBlockIOINTEL = 6140, + SpvDecorationLatencyControlLabelINTEL = 6172, + SpvDecorationLatencyControlConstraintINTEL = 6173, + SpvDecorationConduitKernelArgumentINTEL = 6175, + SpvDecorationRegisterMapKernelArgumentINTEL = 6176, + SpvDecorationMMHostInterfaceAddressWidthINTEL = 6177, + SpvDecorationMMHostInterfaceDataWidthINTEL = 6178, + SpvDecorationMMHostInterfaceLatencyINTEL = 6179, + SpvDecorationMMHostInterfaceReadWriteModeINTEL = 6180, + SpvDecorationMMHostInterfaceMaxBurstINTEL = 6181, + SpvDecorationMMHostInterfaceWaitRequestINTEL = 6182, + SpvDecorationStableKernelArgumentINTEL = 6183, SpvDecorationMax = 0x7fffffff, } SpvDecoration; @@ -1009,6 +1023,9 @@ SpvCapabilityRayQueryKHR = 4472, SpvCapabilityRayTraversalPrimitiveCullingKHR = 4478, SpvCapabilityRayTracingKHR = 4479, + SpvCapabilityTextureSampleWeightedQCOM = 4484, + SpvCapabilityTextureBoxFilterQCOM = 4485, + SpvCapabilityTextureBlockMatchQCOM = 4486, SpvCapabilityFloat16ImageAMD = 5008, SpvCapabilityImageGatherBiasLodAMD = 5009, SpvCapabilityFragmentMaskAMD = 5010, @@ -1136,7 +1153,11 @@ SpvCapabilityOptNoneINTEL = 6094, SpvCapabilityAtomicFloat16AddEXT = 6095, SpvCapabilityDebugInfoModuleINTEL = 6114, + SpvCapabilityBFloat16ConversionINTEL = 6115, SpvCapabilitySplitBarrierINTEL = 6141, + SpvCapabilityFPGAKernelAttributesv2INTEL = 6161, + SpvCapabilityFPGALatencyControlINTEL = 6171, + SpvCapabilityFPGAArgumentInterfacesINTEL = 6174, SpvCapabilityGroupUniformArithmeticKHR = 6400, SpvCapabilityMax = 0x7fffffff, } SpvCapability; @@ -1621,6 +1642,10 @@ SpvOpRayQueryConfirmIntersectionKHR = 4476, SpvOpRayQueryProceedKHR = 4477, SpvOpRayQueryGetIntersectionTypeKHR = 4479, + SpvOpImageSampleWeightedQCOM = 4480, + SpvOpImageBoxFilterQCOM = 4481, + SpvOpImageBlockMatchSSDQCOM = 4482, + SpvOpImageBlockMatchSADQCOM = 4483, SpvOpGroupIAddNonUniformAMD = 5000, SpvOpGroupFAddNonUniformAMD = 5001, SpvOpGroupFMinNonUniformAMD = 5002, @@ -1938,6 +1963,8 @@ SpvOpTypeStructContinuedINTEL = 6090, SpvOpConstantCompositeContinuedINTEL = 6091, SpvOpSpecConstantCompositeContinuedINTEL = 6092, + SpvOpConvertFToBF16INTEL = 6116, + SpvOpConvertBF16ToFINTEL = 6117, SpvOpControlBarrierArriveINTEL = 6142, SpvOpControlBarrierWaitINTEL = 6143, SpvOpGroupIMulKHR = 6401, @@ -2329,6 +2356,10 @@ case SpvOpRayQueryConfirmIntersectionKHR: *hasResult = false; *hasResultType = false; break; case SpvOpRayQueryProceedKHR: *hasResult = true; *hasResultType = true; break; case SpvOpRayQueryGetIntersectionTypeKHR: *hasResult = true; *hasResultType = true; break; + case SpvOpImageSampleWeightedQCOM: *hasResult = true; *hasResultType = true; break; + case SpvOpImageBoxFilterQCOM: *hasResult = true; *hasResultType = true; break; + case SpvOpImageBlockMatchSSDQCOM: *hasResult = true; *hasResultType = true; break; + case SpvOpImageBlockMatchSADQCOM: *hasResult = true; *hasResultType = true; break; case SpvOpGroupIAddNonUniformAMD: *hasResult = true; *hasResultType = true; break; case SpvOpGroupFAddNonUniformAMD: *hasResult = true; *hasResultType = true; break; case SpvOpGroupFMinNonUniformAMD: *hasResult = true; *hasResultType = true; break; @@ -2641,6 +2672,8 @@ case SpvOpTypeStructContinuedINTEL: *hasResult = false; *hasResultType = false; break; case SpvOpConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break; case SpvOpSpecConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break; + case SpvOpConvertFToBF16INTEL: *hasResult = true; *hasResultType = true; break; + case SpvOpConvertBF16ToFINTEL: *hasResult = true; *hasResultType = true; break; case SpvOpControlBarrierArriveINTEL: *hasResult = false; *hasResultType = false; break; case SpvOpControlBarrierWaitINTEL: *hasResult = false; *hasResultType = false; break; case SpvOpGroupIMulKHR: *hasResult = true; *hasResultType = true; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.hpp new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.hpp --- old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.hpp 2023-01-04 16:17:40.000000000 +0100 +++ new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.hpp 2023-03-08 18:22:35.000000000 +0100 @@ -196,6 +196,7 @@ ExecutionModeNumSIMDWorkitemsINTEL = 5896, ExecutionModeSchedulerTargetFmaxMhzINTEL = 5903, ExecutionModeStreamingInterfaceINTEL = 6154, + ExecutionModeRegisterMapInterfaceINTEL = 6160, ExecutionModeNamedBarrierCountINTEL = 6417, ExecutionModeMax = 0x7fffffff, }; @@ -508,6 +509,8 @@ DecorationMaxByteOffsetId = 47, DecorationNoSignedWrap = 4469, DecorationNoUnsignedWrap = 4470, + DecorationWeightTextureQCOM = 4487, + DecorationBlockMatchTextureQCOM = 4488, DecorationExplicitInterpAMD = 4999, DecorationOverrideCoverageNV = 5248, DecorationPassthroughNV = 5250, @@ -576,6 +579,17 @@ DecorationSingleElementVectorINTEL = 6085, DecorationVectorComputeCallableFunctionINTEL = 6087, DecorationMediaBlockIOINTEL = 6140, + DecorationLatencyControlLabelINTEL = 6172, + DecorationLatencyControlConstraintINTEL = 6173, + DecorationConduitKernelArgumentINTEL = 6175, + DecorationRegisterMapKernelArgumentINTEL = 6176, + DecorationMMHostInterfaceAddressWidthINTEL = 6177, + DecorationMMHostInterfaceDataWidthINTEL = 6178, + DecorationMMHostInterfaceLatencyINTEL = 6179, + DecorationMMHostInterfaceReadWriteModeINTEL = 6180, + DecorationMMHostInterfaceMaxBurstINTEL = 6181, + DecorationMMHostInterfaceWaitRequestINTEL = 6182, + DecorationStableKernelArgumentINTEL = 6183, DecorationMax = 0x7fffffff, }; @@ -1005,6 +1019,9 @@ CapabilityRayQueryKHR = 4472, CapabilityRayTraversalPrimitiveCullingKHR = 4478, CapabilityRayTracingKHR = 4479, + CapabilityTextureSampleWeightedQCOM = 4484, + CapabilityTextureBoxFilterQCOM = 4485, + CapabilityTextureBlockMatchQCOM = 4486, CapabilityFloat16ImageAMD = 5008, CapabilityImageGatherBiasLodAMD = 5009, CapabilityFragmentMaskAMD = 5010, @@ -1132,7 +1149,11 @@ CapabilityOptNoneINTEL = 6094, CapabilityAtomicFloat16AddEXT = 6095, CapabilityDebugInfoModuleINTEL = 6114, + CapabilityBFloat16ConversionINTEL = 6115, CapabilitySplitBarrierINTEL = 6141, + CapabilityFPGAKernelAttributesv2INTEL = 6161, + CapabilityFPGALatencyControlINTEL = 6171, + CapabilityFPGAArgumentInterfacesINTEL = 6174, CapabilityGroupUniformArithmeticKHR = 6400, CapabilityMax = 0x7fffffff, }; @@ -1617,6 +1638,10 @@ OpRayQueryConfirmIntersectionKHR = 4476, OpRayQueryProceedKHR = 4477, OpRayQueryGetIntersectionTypeKHR = 4479, + OpImageSampleWeightedQCOM = 4480, + OpImageBoxFilterQCOM = 4481, + OpImageBlockMatchSSDQCOM = 4482, + OpImageBlockMatchSADQCOM = 4483, OpGroupIAddNonUniformAMD = 5000, OpGroupFAddNonUniformAMD = 5001, OpGroupFMinNonUniformAMD = 5002, @@ -1934,6 +1959,8 @@ OpTypeStructContinuedINTEL = 6090, OpConstantCompositeContinuedINTEL = 6091, OpSpecConstantCompositeContinuedINTEL = 6092, + OpConvertFToBF16INTEL = 6116, + OpConvertBF16ToFINTEL = 6117, OpControlBarrierArriveINTEL = 6142, OpControlBarrierWaitINTEL = 6143, OpGroupIMulKHR = 6401, @@ -2325,6 +2352,10 @@ case OpRayQueryConfirmIntersectionKHR: *hasResult = false; *hasResultType = false; break; case OpRayQueryProceedKHR: *hasResult = true; *hasResultType = true; break; case OpRayQueryGetIntersectionTypeKHR: *hasResult = true; *hasResultType = true; break; + case OpImageSampleWeightedQCOM: *hasResult = true; *hasResultType = true; break; + case OpImageBoxFilterQCOM: *hasResult = true; *hasResultType = true; break; + case OpImageBlockMatchSSDQCOM: *hasResult = true; *hasResultType = true; break; + case OpImageBlockMatchSADQCOM: *hasResult = true; *hasResultType = true; break; case OpGroupIAddNonUniformAMD: *hasResult = true; *hasResultType = true; break; case OpGroupFAddNonUniformAMD: *hasResult = true; *hasResultType = true; break; case OpGroupFMinNonUniformAMD: *hasResult = true; *hasResultType = true; break; @@ -2637,6 +2668,8 @@ case OpTypeStructContinuedINTEL: *hasResult = false; *hasResultType = false; break; case OpConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break; case OpSpecConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break; + case OpConvertFToBF16INTEL: *hasResult = true; *hasResultType = true; break; + case OpConvertBF16ToFINTEL: *hasResult = true; *hasResultType = true; break; case OpControlBarrierArriveINTEL: *hasResult = false; *hasResultType = false; break; case OpControlBarrierWaitINTEL: *hasResult = false; *hasResultType = false; break; case OpGroupIMulKHR: *hasResult = true; *hasResultType = true; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.hpp11 new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.hpp11 --- old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.hpp11 2023-01-04 16:17:40.000000000 +0100 +++ new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.hpp11 2023-03-08 18:22:35.000000000 +0100 @@ -196,6 +196,7 @@ NumSIMDWorkitemsINTEL = 5896, SchedulerTargetFmaxMhzINTEL = 5903, StreamingInterfaceINTEL = 6154, + RegisterMapInterfaceINTEL = 6160, NamedBarrierCountINTEL = 6417, Max = 0x7fffffff, }; @@ -508,6 +509,8 @@ MaxByteOffsetId = 47, NoSignedWrap = 4469, NoUnsignedWrap = 4470, + WeightTextureQCOM = 4487, + BlockMatchTextureQCOM = 4488, ExplicitInterpAMD = 4999, OverrideCoverageNV = 5248, PassthroughNV = 5250, @@ -576,6 +579,17 @@ SingleElementVectorINTEL = 6085, VectorComputeCallableFunctionINTEL = 6087, MediaBlockIOINTEL = 6140, + LatencyControlLabelINTEL = 6172, + LatencyControlConstraintINTEL = 6173, + ConduitKernelArgumentINTEL = 6175, + RegisterMapKernelArgumentINTEL = 6176, + MMHostInterfaceAddressWidthINTEL = 6177, + MMHostInterfaceDataWidthINTEL = 6178, + MMHostInterfaceLatencyINTEL = 6179, + MMHostInterfaceReadWriteModeINTEL = 6180, + MMHostInterfaceMaxBurstINTEL = 6181, + MMHostInterfaceWaitRequestINTEL = 6182, + StableKernelArgumentINTEL = 6183, Max = 0x7fffffff, }; @@ -1005,6 +1019,9 @@ RayQueryKHR = 4472, RayTraversalPrimitiveCullingKHR = 4478, RayTracingKHR = 4479, + TextureSampleWeightedQCOM = 4484, + TextureBoxFilterQCOM = 4485, + TextureBlockMatchQCOM = 4486, Float16ImageAMD = 5008, ImageGatherBiasLodAMD = 5009, FragmentMaskAMD = 5010, @@ -1132,7 +1149,11 @@ OptNoneINTEL = 6094, AtomicFloat16AddEXT = 6095, DebugInfoModuleINTEL = 6114, + BFloat16ConversionINTEL = 6115, SplitBarrierINTEL = 6141, + FPGAKernelAttributesv2INTEL = 6161, + FPGALatencyControlINTEL = 6171, + FPGAArgumentInterfacesINTEL = 6174, GroupUniformArithmeticKHR = 6400, Max = 0x7fffffff, }; @@ -1617,6 +1638,10 @@ OpRayQueryConfirmIntersectionKHR = 4476, OpRayQueryProceedKHR = 4477, OpRayQueryGetIntersectionTypeKHR = 4479, + OpImageSampleWeightedQCOM = 4480, + OpImageBoxFilterQCOM = 4481, + OpImageBlockMatchSSDQCOM = 4482, + OpImageBlockMatchSADQCOM = 4483, OpGroupIAddNonUniformAMD = 5000, OpGroupFAddNonUniformAMD = 5001, OpGroupFMinNonUniformAMD = 5002, @@ -1934,6 +1959,8 @@ OpTypeStructContinuedINTEL = 6090, OpConstantCompositeContinuedINTEL = 6091, OpSpecConstantCompositeContinuedINTEL = 6092, + OpConvertFToBF16INTEL = 6116, + OpConvertBF16ToFINTEL = 6117, OpControlBarrierArriveINTEL = 6142, OpControlBarrierWaitINTEL = 6143, OpGroupIMulKHR = 6401, @@ -2325,6 +2352,10 @@ case Op::OpRayQueryConfirmIntersectionKHR: *hasResult = false; *hasResultType = false; break; case Op::OpRayQueryProceedKHR: *hasResult = true; *hasResultType = true; break; case Op::OpRayQueryGetIntersectionTypeKHR: *hasResult = true; *hasResultType = true; break; + case Op::OpImageSampleWeightedQCOM: *hasResult = true; *hasResultType = true; break; + case Op::OpImageBoxFilterQCOM: *hasResult = true; *hasResultType = true; break; + case Op::OpImageBlockMatchSSDQCOM: *hasResult = true; *hasResultType = true; break; + case Op::OpImageBlockMatchSADQCOM: *hasResult = true; *hasResultType = true; break; case Op::OpGroupIAddNonUniformAMD: *hasResult = true; *hasResultType = true; break; case Op::OpGroupFAddNonUniformAMD: *hasResult = true; *hasResultType = true; break; case Op::OpGroupFMinNonUniformAMD: *hasResult = true; *hasResultType = true; break; @@ -2637,6 +2668,8 @@ case Op::OpTypeStructContinuedINTEL: *hasResult = false; *hasResultType = false; break; case Op::OpConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break; case Op::OpSpecConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break; + case Op::OpConvertFToBF16INTEL: *hasResult = true; *hasResultType = true; break; + case Op::OpConvertBF16ToFINTEL: *hasResult = true; *hasResultType = true; break; case Op::OpControlBarrierArriveINTEL: *hasResult = false; *hasResultType = false; break; case Op::OpControlBarrierWaitINTEL: *hasResult = false; *hasResultType = false; break; case Op::OpGroupIMulKHR: *hasResult = true; *hasResultType = true; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.json new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.json --- old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.json 2023-01-04 16:17:40.000000000 +0100 +++ new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.json 2023-03-08 18:22:35.000000000 +0100 @@ -215,6 +215,7 @@ "NumSIMDWorkitemsINTEL": 5896, "SchedulerTargetFmaxMhzINTEL": 5903, "StreamingInterfaceINTEL": 6154, + "RegisterMapInterfaceINTEL": 6160, "NamedBarrierCountINTEL": 6417 } }, @@ -534,6 +535,8 @@ "MaxByteOffsetId": 47, "NoSignedWrap": 4469, "NoUnsignedWrap": 4470, + "WeightTextureQCOM": 4487, + "BlockMatchTextureQCOM": 4488, "ExplicitInterpAMD": 4999, "OverrideCoverageNV": 5248, "PassthroughNV": 5250, @@ -601,7 +604,18 @@ "FunctionFloatingPointModeINTEL": 6080, "SingleElementVectorINTEL": 6085, "VectorComputeCallableFunctionINTEL": 6087, - "MediaBlockIOINTEL": 6140 + "MediaBlockIOINTEL": 6140, + "LatencyControlLabelINTEL": 6172, + "LatencyControlConstraintINTEL": 6173, + "ConduitKernelArgumentINTEL": 6175, + "RegisterMapKernelArgumentINTEL": 6176, + "MMHostInterfaceAddressWidthINTEL": 6177, + "MMHostInterfaceDataWidthINTEL": 6178, + "MMHostInterfaceLatencyINTEL": 6179, + "MMHostInterfaceReadWriteModeINTEL": 6180, + "MMHostInterfaceMaxBurstINTEL": 6181, + "MMHostInterfaceWaitRequestINTEL": 6182, + "StableKernelArgumentINTEL": 6183 } }, { @@ -985,6 +999,9 @@ "RayQueryKHR": 4472, "RayTraversalPrimitiveCullingKHR": 4478, "RayTracingKHR": 4479, + "TextureSampleWeightedQCOM": 4484, + "TextureBoxFilterQCOM": 4485, + "TextureBlockMatchQCOM": 4486, "Float16ImageAMD": 5008, "ImageGatherBiasLodAMD": 5009, "FragmentMaskAMD": 5010, @@ -1112,7 +1129,11 @@ "OptNoneINTEL": 6094, "AtomicFloat16AddEXT": 6095, "DebugInfoModuleINTEL": 6114, + "BFloat16ConversionINTEL": 6115, "SplitBarrierINTEL": 6141, + "FPGAKernelAttributesv2INTEL": 6161, + "FPGALatencyControlINTEL": 6171, + "FPGAArgumentInterfacesINTEL": 6174, "GroupUniformArithmeticKHR": 6400 } }, @@ -1607,6 +1628,10 @@ "OpRayQueryConfirmIntersectionKHR": 4476, "OpRayQueryProceedKHR": 4477, "OpRayQueryGetIntersectionTypeKHR": 4479, + "OpImageSampleWeightedQCOM": 4480, + "OpImageBoxFilterQCOM": 4481, + "OpImageBlockMatchSSDQCOM": 4482, + "OpImageBlockMatchSADQCOM": 4483, "OpGroupIAddNonUniformAMD": 5000, "OpGroupFAddNonUniformAMD": 5001, "OpGroupFMinNonUniformAMD": 5002, @@ -1924,6 +1949,8 @@ "OpTypeStructContinuedINTEL": 6090, "OpConstantCompositeContinuedINTEL": 6091, "OpSpecConstantCompositeContinuedINTEL": 6092, + "OpConvertFToBF16INTEL": 6116, + "OpConvertBF16ToFINTEL": 6117, "OpControlBarrierArriveINTEL": 6142, "OpControlBarrierWaitINTEL": 6143, "OpGroupIMulKHR": 6401, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.lua new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.lua --- old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.lua 2023-01-04 16:17:40.000000000 +0100 +++ new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.lua 2023-03-08 18:22:35.000000000 +0100 @@ -183,6 +183,7 @@ NumSIMDWorkitemsINTEL = 5896, SchedulerTargetFmaxMhzINTEL = 5903, StreamingInterfaceINTEL = 6154, + RegisterMapInterfaceINTEL = 6160, NamedBarrierCountINTEL = 6417, }, @@ -481,6 +482,8 @@ MaxByteOffsetId = 47, NoSignedWrap = 4469, NoUnsignedWrap = 4470, + WeightTextureQCOM = 4487, + BlockMatchTextureQCOM = 4488, ExplicitInterpAMD = 4999, OverrideCoverageNV = 5248, PassthroughNV = 5250, @@ -549,6 +552,17 @@ SingleElementVectorINTEL = 6085, VectorComputeCallableFunctionINTEL = 6087, MediaBlockIOINTEL = 6140, + LatencyControlLabelINTEL = 6172, + LatencyControlConstraintINTEL = 6173, + ConduitKernelArgumentINTEL = 6175, + RegisterMapKernelArgumentINTEL = 6176, + MMHostInterfaceAddressWidthINTEL = 6177, + MMHostInterfaceDataWidthINTEL = 6178, + MMHostInterfaceLatencyINTEL = 6179, + MMHostInterfaceReadWriteModeINTEL = 6180, + MMHostInterfaceMaxBurstINTEL = 6181, + MMHostInterfaceWaitRequestINTEL = 6182, + StableKernelArgumentINTEL = 6183, }, BuiltIn = { @@ -967,6 +981,9 @@ RayQueryKHR = 4472, RayTraversalPrimitiveCullingKHR = 4478, RayTracingKHR = 4479, + TextureSampleWeightedQCOM = 4484, + TextureBoxFilterQCOM = 4485, + TextureBlockMatchQCOM = 4486, Float16ImageAMD = 5008, ImageGatherBiasLodAMD = 5009, FragmentMaskAMD = 5010, @@ -1094,7 +1111,11 @@ OptNoneINTEL = 6094, AtomicFloat16AddEXT = 6095, DebugInfoModuleINTEL = 6114, + BFloat16ConversionINTEL = 6115, SplitBarrierINTEL = 6141, + FPGAKernelAttributesv2INTEL = 6161, + FPGALatencyControlINTEL = 6171, + FPGAArgumentInterfacesINTEL = 6174, GroupUniformArithmeticKHR = 6400, }, @@ -1568,6 +1589,10 @@ OpRayQueryConfirmIntersectionKHR = 4476, OpRayQueryProceedKHR = 4477, OpRayQueryGetIntersectionTypeKHR = 4479, + OpImageSampleWeightedQCOM = 4480, + OpImageBoxFilterQCOM = 4481, + OpImageBlockMatchSSDQCOM = 4482, + OpImageBlockMatchSADQCOM = 4483, OpGroupIAddNonUniformAMD = 5000, OpGroupFAddNonUniformAMD = 5001, OpGroupFMinNonUniformAMD = 5002, @@ -1885,6 +1910,8 @@ OpTypeStructContinuedINTEL = 6090, OpConstantCompositeContinuedINTEL = 6091, OpSpecConstantCompositeContinuedINTEL = 6092, + OpConvertFToBF16INTEL = 6116, + OpConvertBF16ToFINTEL = 6117, OpControlBarrierArriveINTEL = 6142, OpControlBarrierWaitINTEL = 6143, OpGroupIMulKHR = 6401, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.py new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.py --- old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spirv.py 2023-01-04 16:17:40.000000000 +0100 +++ new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spirv.py 2023-03-08 18:22:35.000000000 +0100 @@ -183,6 +183,7 @@ 'NumSIMDWorkitemsINTEL' : 5896, 'SchedulerTargetFmaxMhzINTEL' : 5903, 'StreamingInterfaceINTEL' : 6154, + 'RegisterMapInterfaceINTEL' : 6160, 'NamedBarrierCountINTEL' : 6417, }, @@ -481,6 +482,8 @@ 'MaxByteOffsetId' : 47, 'NoSignedWrap' : 4469, 'NoUnsignedWrap' : 4470, + 'WeightTextureQCOM' : 4487, + 'BlockMatchTextureQCOM' : 4488, 'ExplicitInterpAMD' : 4999, 'OverrideCoverageNV' : 5248, 'PassthroughNV' : 5250, @@ -549,6 +552,17 @@ 'SingleElementVectorINTEL' : 6085, 'VectorComputeCallableFunctionINTEL' : 6087, 'MediaBlockIOINTEL' : 6140, + 'LatencyControlLabelINTEL' : 6172, + 'LatencyControlConstraintINTEL' : 6173, + 'ConduitKernelArgumentINTEL' : 6175, + 'RegisterMapKernelArgumentINTEL' : 6176, + 'MMHostInterfaceAddressWidthINTEL' : 6177, + 'MMHostInterfaceDataWidthINTEL' : 6178, + 'MMHostInterfaceLatencyINTEL' : 6179, + 'MMHostInterfaceReadWriteModeINTEL' : 6180, + 'MMHostInterfaceMaxBurstINTEL' : 6181, + 'MMHostInterfaceWaitRequestINTEL' : 6182, + 'StableKernelArgumentINTEL' : 6183, }, 'BuiltIn' : { @@ -967,6 +981,9 @@ 'RayQueryKHR' : 4472, 'RayTraversalPrimitiveCullingKHR' : 4478, 'RayTracingKHR' : 4479, + 'TextureSampleWeightedQCOM' : 4484, + 'TextureBoxFilterQCOM' : 4485, + 'TextureBlockMatchQCOM' : 4486, 'Float16ImageAMD' : 5008, 'ImageGatherBiasLodAMD' : 5009, 'FragmentMaskAMD' : 5010, @@ -1094,7 +1111,11 @@ 'OptNoneINTEL' : 6094, 'AtomicFloat16AddEXT' : 6095, 'DebugInfoModuleINTEL' : 6114, + 'BFloat16ConversionINTEL' : 6115, 'SplitBarrierINTEL' : 6141, + 'FPGAKernelAttributesv2INTEL' : 6161, + 'FPGALatencyControlINTEL' : 6171, + 'FPGAArgumentInterfacesINTEL' : 6174, 'GroupUniformArithmeticKHR' : 6400, }, @@ -1568,6 +1589,10 @@ 'OpRayQueryConfirmIntersectionKHR' : 4476, 'OpRayQueryProceedKHR' : 4477, 'OpRayQueryGetIntersectionTypeKHR' : 4479, + 'OpImageSampleWeightedQCOM' : 4480, + 'OpImageBoxFilterQCOM' : 4481, + 'OpImageBlockMatchSSDQCOM' : 4482, + 'OpImageBlockMatchSADQCOM' : 4483, 'OpGroupIAddNonUniformAMD' : 5000, 'OpGroupFAddNonUniformAMD' : 5001, 'OpGroupFMinNonUniformAMD' : 5002, @@ -1885,6 +1910,8 @@ 'OpTypeStructContinuedINTEL' : 6090, 'OpConstantCompositeContinuedINTEL' : 6091, 'OpSpecConstantCompositeContinuedINTEL' : 6092, + 'OpConvertFToBF16INTEL' : 6116, + 'OpConvertBF16ToFINTEL' : 6117, 'OpControlBarrierArriveINTEL' : 6142, 'OpControlBarrierWaitINTEL' : 6143, 'OpGroupIMulKHR' : 6401, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spv.d new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spv.d --- old/SPIRV-Headers-sdk-1.3.239.0/include/spirv/unified1/spv.d 2023-01-04 16:17:40.000000000 +0100 +++ new/SPIRV-Headers-sdk-1.3.243.0/include/spirv/unified1/spv.d 2023-03-08 18:22:35.000000000 +0100 @@ -195,6 +195,7 @@ NumSIMDWorkitemsINTEL = 5896, SchedulerTargetFmaxMhzINTEL = 5903, StreamingInterfaceINTEL = 6154, + RegisterMapInterfaceINTEL = 6160, NamedBarrierCountINTEL = 6417, } @@ -509,6 +510,8 @@ MaxByteOffsetId = 47, NoSignedWrap = 4469, NoUnsignedWrap = 4470, + WeightTextureQCOM = 4487, + BlockMatchTextureQCOM = 4488, ExplicitInterpAMD = 4999, OverrideCoverageNV = 5248, PassthroughNV = 5250, @@ -577,6 +580,17 @@ SingleElementVectorINTEL = 6085, VectorComputeCallableFunctionINTEL = 6087, MediaBlockIOINTEL = 6140, + LatencyControlLabelINTEL = 6172, + LatencyControlConstraintINTEL = 6173, + ConduitKernelArgumentINTEL = 6175, + RegisterMapKernelArgumentINTEL = 6176, + MMHostInterfaceAddressWidthINTEL = 6177, + MMHostInterfaceDataWidthINTEL = 6178, + MMHostInterfaceLatencyINTEL = 6179, + MMHostInterfaceReadWriteModeINTEL = 6180, + MMHostInterfaceMaxBurstINTEL = 6181, + MMHostInterfaceWaitRequestINTEL = 6182, + StableKernelArgumentINTEL = 6183, } enum BuiltIn : uint @@ -1012,6 +1026,9 @@ RayQueryKHR = 4472, RayTraversalPrimitiveCullingKHR = 4478, RayTracingKHR = 4479, + TextureSampleWeightedQCOM = 4484, + TextureBoxFilterQCOM = 4485, + TextureBlockMatchQCOM = 4486, Float16ImageAMD = 5008, ImageGatherBiasLodAMD = 5009, FragmentMaskAMD = 5010, @@ -1139,7 +1156,11 @@ OptNoneINTEL = 6094, AtomicFloat16AddEXT = 6095, DebugInfoModuleINTEL = 6114, + BFloat16ConversionINTEL = 6115, SplitBarrierINTEL = 6141, + FPGAKernelAttributesv2INTEL = 6161, + FPGALatencyControlINTEL = 6171, + FPGAArgumentInterfacesINTEL = 6174, GroupUniformArithmeticKHR = 6400, } @@ -1626,6 +1647,10 @@ OpRayQueryConfirmIntersectionKHR = 4476, OpRayQueryProceedKHR = 4477, OpRayQueryGetIntersectionTypeKHR = 4479, + OpImageSampleWeightedQCOM = 4480, + OpImageBoxFilterQCOM = 4481, + OpImageBlockMatchSSDQCOM = 4482, + OpImageBlockMatchSADQCOM = 4483, OpGroupIAddNonUniformAMD = 5000, OpGroupFAddNonUniformAMD = 5001, OpGroupFMinNonUniformAMD = 5002, @@ -1943,6 +1968,8 @@ OpTypeStructContinuedINTEL = 6090, OpConstantCompositeContinuedINTEL = 6091, OpSpecConstantCompositeContinuedINTEL = 6092, + OpConvertFToBF16INTEL = 6116, + OpConvertBF16ToFINTEL = 6117, OpControlBarrierArriveINTEL = 6142, OpControlBarrierWaitINTEL = 6143, OpGroupIMulKHR = 6401, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SPIRV-Headers-sdk-1.3.239.0/tools/buildHeaders/bin/makeExtinstHeaders.py new/SPIRV-Headers-sdk-1.3.243.0/tools/buildHeaders/bin/makeExtinstHeaders.py --- old/SPIRV-Headers-sdk-1.3.239.0/tools/buildHeaders/bin/makeExtinstHeaders.py 2023-01-04 16:17:40.000000000 +0100 +++ new/SPIRV-Headers-sdk-1.3.243.0/tools/buildHeaders/bin/makeExtinstHeaders.py 2023-03-08 18:22:35.000000000 +0100 @@ -26,3 +26,4 @@ mk_extinst('AMD_shader_trinary_minmax', 'extinst.spv-amd-shader-trinary-minmax.grammar.json') mk_extinst('NonSemanticDebugPrintf', 'extinst.nonsemantic.debugprintf.grammar.json') mk_extinst('NonSemanticClspvReflection', 'extinst.nonsemantic.clspvreflection.grammar.json') +mk_extinst('NonSemanticDebugBreak', 'extinst.nonsemantic.debugbreak.grammar.json')

1 0

commit vulkan-tools for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vulkan-tools for openSUSE:Factory checked in at 2023-03-31 21:13:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vulkan-tools (Old) and /work/SRC/openSUSE:Factory/.vulkan-tools.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vulkan-tools" Fri Mar 31 21:13:57 2023 rev:42 rq:1075343 version:1.3.243.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vulkan-tools/vulkan-tools.changes 2023-02-14 20:08:01.164265247 +0100 +++ /work/SRC/openSUSE:Factory/.vulkan-tools.new.31432/vulkan-tools.changes 2023-03-31 21:13:59.454044043 +0200 @@ -1,0 +2,8 @@ +Wed Mar 29 14:06:41 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release SDK-1.3.243.0 + * mockicd: Add Support for testing Ray Tracing + * mockicd: Add Support for testing Video decoding + * vulkaninfo: Dont enable Direct Driver Loading Ext + +------------------------------------------------------------------- @@ -4 +12 @@ -- Add baselibs.conf. This is useful as 64- and 32-bit vulkan environments +- Add baselibs.conf. This is useful as 64- and 32-bit Vulkan environments Old: ---- sdk-1.3.239.0.tar.gz New: ---- sdk-1.3.243.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan-tools.spec ++++++ --- /var/tmp/diff_new_pack.lp325E/_old 2023-03-31 21:14:00.018046055 +0200 +++ /var/tmp/diff_new_pack.lp325E/_new 2023-03-31 21:14:00.022046069 +0200 @@ -17,7 +17,7 @@ Name: vulkan-tools -Version: 1.3.239.0 +Version: 1.3.243.0 Release: 0 Summary: Diagnostic utilities for Vulkan License: Apache-2.0 @@ -25,12 +25,12 @@ URL: https://github.com/KhronosGroup/Vulkan-Tools Source0: https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/sdk-%version… Source1: baselibs.conf -BuildRequires: cmake >= 3.4 +BuildRequires: cmake >= 3.17 BuildRequires: gcc-c++ >= 4.8 -BuildRequires: glslang-devel >= 8.13.3743 +BuildRequires: glslang-devel BuildRequires: pkg-config BuildRequires: python3-base -BuildRequires: pkgconfig(vulkan) >= 1.3.239 +BuildRequires: pkgconfig(vulkan) >= 1.3.243 BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) ++++++ sdk-1.3.239.0.tar.gz -> sdk-1.3.243.0.tar.gz ++++++ ++++ 2248 lines of diff (skipped)

1 0

commit vulkan-loader for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vulkan-loader for openSUSE:Factory checked in at 2023-03-31 21:13:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vulkan-loader (Old) and /work/SRC/openSUSE:Factory/.vulkan-loader.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vulkan-loader" Fri Mar 31 21:13:56 2023 rev:46 rq:1075342 version:1.3.243.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vulkan-loader/vulkan-loader.changes 2023-02-01 16:40:15.998072139 +0100 +++ /work/SRC/openSUSE:Factory/.vulkan-loader.new.31432/vulkan-loader.changes 2023-03-31 21:13:58.126039308 +0200 @@ -1,0 +2,7 @@ +Wed Mar 29 14:05:29 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release SDK-1.3.243.0 + * Log when VK_LAYER_PATH is ignored + * Implement VK_LUNARG_direct_driver_loading + +------------------------------------------------------------------- Old: ---- sdk-1.3.239.0.tar.gz New: ---- sdk-1.3.243.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan-loader.spec ++++++ --- /var/tmp/diff_new_pack.a4EBXv/_old 2023-03-31 21:13:58.734041475 +0200 +++ /var/tmp/diff_new_pack.a4EBXv/_new 2023-03-31 21:13:58.738041490 +0200 @@ -19,7 +19,7 @@ # Prefer to go with just /^sdk-.*/ tags %define lname libvulkan1 Name: vulkan-loader -Version: 1.3.239.0 +Version: 1.3.243.0 Release: 0 Summary: Reference ICD loader for Vulkan License: Apache-2.0 @@ -73,7 +73,9 @@ %cmake \ -DVulkanHeaders_INCLUDE_DIR:PATH="%_includedir" \ -DVulkanRegistry_DIR:PATH="%_datadir/vulkan/registry" \ - -DLIB_SUFFIX:STRING="" + -DLIB_SUFFIX:STRING="" \ + -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="%optflags -U_FORTIFY_SOURCE -O0 -ggdb3" \ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="%optflags -U_FORTIFY_SOURCE -O0 -ggdb3" %cmake_build ++++++ sdk-1.3.239.0.tar.gz -> sdk-1.3.243.0.tar.gz ++++++ ++++ 7899 lines of diff (skipped)

1 0