From patchwork Mon Jan 24 16:16:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4981 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4JjFbD0GZpz3wsf for ; Mon, 24 Jan 2022 16:20:56 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4JjFbC3Js3zgP; Mon, 24 Jan 2022 16:20:55 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4JjFbC2phfz2yDs; Mon, 24 Jan 2022 16:20:55 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4JjFb95Xxrz2xFK for ; Mon, 24 Jan 2022 16:20:53 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4JjFb91txWz28g; Mon, 24 Jan 2022 16:20:53 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643041253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=khwh7WwPVA3+SS6NjSpE1qNAAZJMMqbgsX/am6jQxM0=; b=ZV7FMofS1ShC44Wv6bJz3Dq342oYO3pGCjuflpZT7M5ztggGhLg33iQaCA/f+uUswS2w5G ZSyH/K3pEKfowsDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643041253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=khwh7WwPVA3+SS6NjSpE1qNAAZJMMqbgsX/am6jQxM0=; b=e8kWioNqynbjiY5spXZdoNWbhgzGXtIgQ+fXixLaoL7fPi8cFdePCqMx+OG5yFEcEZ6q/T ehagjaRhHLW+7Eim+o3BiNYxORe51qUtJWevvQxVq2Jn3ZlaqRpViM0+rDQGh4AuFOmgiY ttWJ2cxOI5EK4+DjJdhJijqbkX3kyIZVvvHw8+OV4SY0v59UrINBV5pvFnC/XymKZ2vRXT qtdl3MCKS0xlJ/LGqzEXvO1Xw28hOYCyBkGF8Npkz3SOp2gigJZV/2AG/gnYIEuFd1qhog Jh1L5AcP9fAiCkiMLynHXIynu4UlQAoa4o1gM2UJx5gLwlKF3aYJFqasR5UFQQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 02/35] python3-setuptools-scm: Update to version 6.3.2 Date: Mon, 24 Jan 2022 17:16:22 +0100 Message-Id: <20220124161656.71960-2-adolf.belka@ipfire.org> In-Reply-To: <20220124161656.71960-1-adolf.belka@ipfire.org> References: <20220124161656.71960-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from 3.2.0 (Jan 2019) to 6.3.2 (Sep 2021) - Update of rootfile - Changelog 6.3.2 * fix #629: correctly convert Version data in tags_to_version parser to avoid errors 6.3.1 * fix #625: restore tomli in install_requires after the regression changes in took it out and some users never added it even tho they have pyproject.toml files 6.3.0 .. warning:: This release explicitly warns on unsupported setuptools. This unfortunately has to happen as the legacy ``setup_requires`` mechanism incorrectly configures the setuptools working-set when a more recent setuptools version than available is required. As all releases of setuptools are affected as the historic mechanism for ensuring a working setuptools setup was shipping a ``ez_setup`` file next to ``setup.py``, which would install the required version of setuptools. This mechanism has long since been deprecated and removed as most people haven't been using it * fix #612: depend on packaging to ensure version parsing parts * fix #611: correct the typo that hid away the toml extra and add it in ``setup.py`` as well * fix #615: restore support for the git_archive plugin which doesn't pass over the config * restore the ability to run on old setuptools while to avoid breaking pipelines v6.2.0 * fix #608: resolve tomli dependency issue by making it a hard dependency as all intended/supported install options use pip/wheel this is only a feature release * ensure python 3.10 works v6.1.1 * fix #605: completely disallow bdist_egg - modern enough setuptools>=45 uses pip * fix #606: re-integrate and harden toml parsing * fix #597: harden and expand support for figuring the current distribution name from `pyproject.toml` (`project.name` or `tool.setuptools_scm.dist_name`) section or `setup.cfg` (`metadata.name`) v6.1.0 * fix #587: don't fail file finders when distribution is not given * fix #524: new parameters ``normalize`` and ``version_cls`` to customize the version normalization class. * fix #585: switch from toml to tomli for toml 1.0 support * fix #591: allow to opt in for searching parent directories in the api * fix #589: handle yaml encoding using the expected defaults * fix #575: recommend storing the version_module inside of ``mypkg/_version.py`` * fix #571: accept branches starting with ``v`` as release branches * fix #557: Use ``packaging.version`` for ``version_tuple`` * fix #544: enhance errors on unsupported python/setuptools versions v6.0.1 * fix #537: drop node_date on old git to avoid errors on missing %cI v6.0.0 * fix #517: drop dead python support >3.6 required * drop dead setuptools support > 45 required (can install wheels) * drop egg building (use wheels) * add git node_date metadata to get the commit time-stamp of HEAD * allow version schemes to be priority ordered lists of version schemes * support for calendar versioning (calver) by date v5.0.2 * fix #415: use git for matching prefixes to support the windows situation v5.0.1 * fix #509: support ``SETUPTOOLS_SCM_PRETEND_VERSION_FOR_${DISTRIBUTION_NAME}`` for ``pyproject.toml`` v5.0.0 Breaking changes: * fix #339: strict errors on missing scms when parsing a scm dir to avoid false version lookups v5.0.2 * fix #415: use git for matching prefixes to support the windows situation v5.0.1 * fix #509: support ``SETUPTOOLS_SCM_PRETEND_VERSION_FOR_${DISTRIBUTION_NAME}`` for ``pyproject.toml`` v5.0.0 Breaking changes: * fix #339: strict errors on missing scms when parsing a scm dir to avoid false version lookups * fix #337: if relative_to is a directory instead of a file, consider it as direct target instead of the containing folder and print a warning Bugfixes: * fix #352: add support for generally ignoring specific vcs roots * fix #471: better error for version bump failing on complex but accepted tag * fix #479: raise indicative error when tags carry non-parsable information * Add `no-guess-dev` which does no next version guessing, just adds `.post1.devN` in case there are new commits after the tag * add python3.9 * enhance documentation * consider SOURCE_DATE_EPOCH for versioning * add a version_tuple to write_to templates * fix #321: add support for the ``SETUPTOOLS_SCM_PRETEND_VERSION_FOR_${DISTRIBUTION_NAME}`` env var to target the pretend key * fix #142: clearly list supported scm * fix #213: better error message for non-zero dev numbers in tags * fix #356: add git branch to version on describe failure v4.1.2 * disallow git tags without dots by default again - #449 v4.1.1 * drop jaraco.windows from pyproject.toml, allows for wheel builds on python2 v4.1.0 * include python 3.9 via the deadsnakes action * return release_branch_semver scheme (it got dropped in a bad rebase) * undo the devendoring of the samefile backport for python2.7 on windows * re-enable the building of universal wheels * fix handling of missing git/hg on python2.7 (python 3 exceptions where used) * correct the tox flake8 invocation * trigger builds on tags again v4.0.0 * Add ``parentdir_prefix_version`` to support installs from GitHub release tarballs. * use Coordinated Universal Time (UTC) * switch to github actions for ci * fix documentation for ``tag_regex`` and add support for single digit versions * document handling of enterprise distros with unsupported setuptools versions #312 * switch to declarative metadata * drop the internal copy of samefile and use a dependency on jaraco.windows on legacy systems * select git tags based on the presence of numbers instead of dots * enable getting a version form a parent folder prefix * add release-branch-semver version scheme * make global configuration available to version metadata * drop official support for python 3.4 v3.5.0 * add ``no-local-version`` local scheme and improve documentation for schemes v3.4.4 * fix #403: also sort out resource warnings when dealing with git file finding v3.4.3 * fix #399: ensure the git file finder terminates subprocess after reading archive v3.4.2 * fix #395: correctly transfer tag regex in the Configuration constructor * rollback --first-parent for git describe as it turns out to be a regression for some users v3.4.1 * pull in #377 to fix #374: correctly set up the default version scheme for pyproject usage. this bugfix got missed when ruushing the release. v3.4.0 * fix #181 - add support for projects built under setuptools declarative config by way of the setuptools.finalize_distribution_options hook in Setuptools 42. * fix #305 - ensure the git file finder closes filedescriptors even when errors happen * fix #381 - clean out env vars from the git hook system to ensure correct function from within * modernize docs wrt importlib.metadata *edited* * use --first-parent for git describe v3.3.3 * add eggs for python3.7 and 3.8 to the deploy v3.3.2 * fix #335 - fix python3.8 support and add builds for up to python3.8 v3.3.1 * fix #333 (regression from #198) - use a specific fallback root when calling fallbacks. Remove old hack that resets the root when fallback entrypoints are present. v3.3.0 this bugfix got missed when ruushing the release. v3.4.0 * fix #181 - add support for projects built under setuptools declarative config by way of the setuptools.finalize_distribution_options hook in Setuptools 42. * fix #305 - ensure the git file finder closes filedescriptors even when errors happen * fix #381 - clean out env vars from the git hook system to ensure correct function from within * modernize docs wrt importlib.metadata *edited* * use --first-parent for git describe v3.3.3 * add eggs for python3.7 and 3.8 to the deploy v3.3.2 * fix #335 - fix python3.8 support and add builds for up to python3.8 v3.3.1 * fix #333 (regression from #198) - use a specific fallback root when calling fallbacks. Remove old hack that resets the root when fallback entrypoints are present. v3.3.0 * fix #198 by adding the ``fallback_version`` option, which sets the version to be used when everything else fails. Signed-off-by: Adolf Belka Reviewed-by: Peter Müller --- .../rootfiles/common/python3-setuptools-scm | 47 ++++++++++--------- lfs/python3-setuptools-scm | 6 +-- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/config/rootfiles/common/python3-setuptools-scm b/config/rootfiles/common/python3-setuptools-scm index 5c0462e49..8f16d3e91 100644 --- a/config/rootfiles/common/python3-setuptools-scm +++ b/config/rootfiles/common/python3-setuptools-scm @@ -1,22 +1,25 @@ -#usr/lib/python3.8/site-packages/setuptools_scm -#usr/lib/python3.8/site-packages/setuptools_scm-3.2.0-py3.8.egg-info -#usr/lib/python3.8/site-packages/setuptools_scm-3.2.0-py3.8.egg-info/PKG-INFO -#usr/lib/python3.8/site-packages/setuptools_scm-3.2.0-py3.8.egg-info/SOURCES.txt -#usr/lib/python3.8/site-packages/setuptools_scm-3.2.0-py3.8.egg-info/dependency_links.txt -#usr/lib/python3.8/site-packages/setuptools_scm-3.2.0-py3.8.egg-info/entry_points.txt -#usr/lib/python3.8/site-packages/setuptools_scm-3.2.0-py3.8.egg-info/top_level.txt -#usr/lib/python3.8/site-packages/setuptools_scm-3.2.0-py3.8.egg-info/zip-safe -#usr/lib/python3.8/site-packages/setuptools_scm/__init__.py -#usr/lib/python3.8/site-packages/setuptools_scm/__main__.py -#usr/lib/python3.8/site-packages/setuptools_scm/config.py -#usr/lib/python3.8/site-packages/setuptools_scm/discover.py -#usr/lib/python3.8/site-packages/setuptools_scm/file_finder.py -#usr/lib/python3.8/site-packages/setuptools_scm/file_finder_git.py -#usr/lib/python3.8/site-packages/setuptools_scm/file_finder_hg.py -#usr/lib/python3.8/site-packages/setuptools_scm/git.py -#usr/lib/python3.8/site-packages/setuptools_scm/hacks.py -#usr/lib/python3.8/site-packages/setuptools_scm/hg.py -#usr/lib/python3.8/site-packages/setuptools_scm/integration.py -#usr/lib/python3.8/site-packages/setuptools_scm/utils.py -#usr/lib/python3.8/site-packages/setuptools_scm/version.py -#usr/lib/python3.8/site-packages/setuptools_scm/win_py31_compat.py +#usr/lib/python3.10/site-packages/setuptools_scm +#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info +#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/PKG-INFO +#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/SOURCES.txt +#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/dependency_links.txt +#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/entry_points.txt +#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/requires.txt +#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/top_level.txt +#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/zip-safe +#usr/lib/python3.10/site-packages/setuptools_scm/__init__.py +#usr/lib/python3.10/site-packages/setuptools_scm/__main__.py +#usr/lib/python3.10/site-packages/setuptools_scm/_version_cls.py +#usr/lib/python3.10/site-packages/setuptools_scm/config.py +#usr/lib/python3.10/site-packages/setuptools_scm/discover.py +#usr/lib/python3.10/site-packages/setuptools_scm/file_finder.py +#usr/lib/python3.10/site-packages/setuptools_scm/file_finder_git.py +#usr/lib/python3.10/site-packages/setuptools_scm/file_finder_hg.py +#usr/lib/python3.10/site-packages/setuptools_scm/git.py +#usr/lib/python3.10/site-packages/setuptools_scm/hacks.py +#usr/lib/python3.10/site-packages/setuptools_scm/hg.py +#usr/lib/python3.10/site-packages/setuptools_scm/hg_git.py +#usr/lib/python3.10/site-packages/setuptools_scm/integration.py +#usr/lib/python3.10/site-packages/setuptools_scm/scm_workdir.py +#usr/lib/python3.10/site-packages/setuptools_scm/utils.py +#usr/lib/python3.10/site-packages/setuptools_scm/version.py diff --git a/lfs/python3-setuptools-scm b/lfs/python3-setuptools-scm index 048d92895..eae5bfc4f 100644 --- a/lfs/python3-setuptools-scm +++ b/lfs/python3-setuptools-scm @@ -24,7 +24,7 @@ include Config -VER = 3.2.0 +VER = 6.3.2 THISAPP = setuptools_scm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-setuptools-scm -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 178e4e7b14c163e0e77ae7ec6684cc0f +$(DL_FILE)_MD5 = 32918d8ac566360c21411e0b3556c695 install : $(TARGET)