From 0366d9252313f2e877eada92d3771207bdd4e931 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Mon, 23 Dec 2019 21:58:47 +0000 Subject: [PATCH] jaraco.functools: Autospec creation for update from version 2.0 to version 3.0.0 Jason R. Coombs (40): Add black config, pre-commit including black, check code with black. Suppress E117 as workaround for PyCQA/pycodestyle#836 Amend skeleton documentation to expand on the value of the approach. Remove sudo declaration in Travis config. Enable tox-pip-extensions ext_venv_update if available. Fixes jaraco/skeleton#6 Prefer types.MethodType to functools.partial for binding a method to its instance. Also use MethodType in _special_method_cache Rewrite docstring on Python 3.7.3 to allow the test to pass. Fixes #12. Rely on tox 3.2 and pip 10 or later for all builds It adds no value to add a pip requirement for the tox install Pin to pip 19.0 for now for pypa/pip#6434. Revert "Pin to pip 19.0 for now for pypa/pip#6434." Only install and invoke pytest-black on Python 3 Use pytest-black-multipy to enable simple support for pytest-black where available. Ref pytest-dev/pytest#5272. Update skeleton documentation to reflect black adoption. Rely on twine 1.13 or later Upgrade tox and virtualenv to ensure that environments get recent pips Define passenv in tox release section. Rely on __token__ for default username. Update docs to reflect changes to deployment. Python 3 only Enable coverage reporting on project Fade to black Report the lines missing coverage Ensure that a late version of pip is installed without special versions of tox-venv. Disable tox-pip-version as it interacts badly with tox-venv causing tox to use the wrong Python version to install packages and run tests. Ref pglass/tox-pip-version#20 and tox-dev/tox-venv#40. Bring back tox-pip-version now that pglass/tox-pip-version#20 is fixed. Test/release on Python 3.8 Apply black to docs/conf.py Update black version and links Expect flake8 3.6 or later and remove suppression of warnings from Flake8 prior to 3.6. Rely on pytest-checkdocs 1.2.3, eliminating workaround for docutils warning. Remove workaround for gitlab.com/pycqa/flake8/issues/275, apparently no longer necessary. Normalize indentation Include keyring support from twine Rename 'build-docs' to simply 'docs' (matching more popular convention). Prefer 'path' to 'path.py' Cover Python 3.8 in Windows tests Update changelog Remove legacy code Mark test code as nocover as it's xfailed. --- .gitignore | 6 ++++++ Makefile | 2 +- jaraco.functools.spec | 28 +++++++++++++++++++--------- options.conf | 7 +++++-- release | 2 +- upstream | 2 +- versions | 1 + whatrequires | 2 ++ 8 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 versions diff --git a/.gitignore b/.gitignore index fd14cc3..0039371 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ .*~ *~ +*.info +*.mod *.swp .repo-index *.log @@ -8,6 +10,10 @@ build.log.round* *.tgz !*.tar.*.* *.zip +*.jar +*.pom +*.xml commitmsg results/ rpms/ +for-review.txt diff --git a/Makefile b/Makefile index f750c67..2051c98 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := jaraco.functools -URL = https://files.pythonhosted.org/packages/a9/1e/44f6a5cffef147a3ffd37a748b8f4c2ded9b07ca20a15f17cd9874158f24/jaraco.functools-2.0.tar.gz +URL = https://files.pythonhosted.org/packages/40/63/d5911a9b3c80cf2f80b0ab143f54e3a72c98e20741acaf63b78a1410c561/jaraco.functools-3.0.0.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/jaraco.functools.spec b/jaraco.functools.spec index 7d3f7e9..978024f 100644 --- a/jaraco.functools.spec +++ b/jaraco.functools.spec @@ -3,17 +3,19 @@ # Generated by: autospec.py # Name : jaraco.functools -Version : 2.0 -Release : 9 -URL : https://files.pythonhosted.org/packages/a9/1e/44f6a5cffef147a3ffd37a748b8f4c2ded9b07ca20a15f17cd9874158f24/jaraco.functools-2.0.tar.gz -Source0 : https://files.pythonhosted.org/packages/a9/1e/44f6a5cffef147a3ffd37a748b8f4c2ded9b07ca20a15f17cd9874158f24/jaraco.functools-2.0.tar.gz +Version : 3.0.0 +Release : 10 +URL : https://files.pythonhosted.org/packages/40/63/d5911a9b3c80cf2f80b0ab143f54e3a72c98e20741acaf63b78a1410c561/jaraco.functools-3.0.0.tar.gz +Source0 : https://files.pythonhosted.org/packages/40/63/d5911a9b3c80cf2f80b0ab143f54e3a72c98e20741acaf63b78a1410c561/jaraco.functools-3.0.0.tar.gz Summary : Functools like those found in stdlib Group : Development/Tools License : MIT Requires: jaraco.functools-license = %{version}-%{release} Requires: jaraco.functools-python = %{version}-%{release} Requires: jaraco.functools-python3 = %{version}-%{release} +Requires: more-itertools BuildRequires : buildreq-distutils3 +BuildRequires : more-itertools BuildRequires : pluggy BuildRequires : py-python BuildRequires : pytest @@ -52,21 +54,29 @@ python3 components for the jaraco.functools package. %prep -%setup -q -n jaraco.functools-2.0 +%setup -q -n jaraco.functools-3.0.0 +cd %{_builddir}/jaraco.functools-3.0.0 %build export http_proxy=http://127.0.0.1:9/ export https_proxy=http://127.0.0.1:9/ export no_proxy=localhost,127.0.0.1,0.0.0.0 -export LANG=C -export SOURCE_DATE_EPOCH=1546358699 +export LANG=C.UTF-8 +export SOURCE_DATE_EPOCH=1577138322 +# -Werror is for werrorists +export GCC_IGNORE_WERROR=1 +export CFLAGS="$CFLAGS -fno-lto " +export FCFLAGS="$CFLAGS -fno-lto " +export FFLAGS="$CFLAGS -fno-lto " +export CXXFLAGS="$CXXFLAGS -fno-lto " export MAKEFLAGS=%{?_smp_mflags} python3 setup.py build %install +export MAKEFLAGS=%{?_smp_mflags} rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/package-licenses/jaraco.functools -cp LICENSE %{buildroot}/usr/share/package-licenses/jaraco.functools/LICENSE +cp %{_builddir}/jaraco.functools-3.0.0/LICENSE %{buildroot}/usr/share/package-licenses/jaraco.functools/a1474494d96f6ddb3a9a0d767a09871ffc388faf python3 -tt setup.py build install --root=%{buildroot} echo ----[ mark ]---- cat %{buildroot}/usr/lib/python3*/site-packages/*/requires.txt || : @@ -77,7 +87,7 @@ echo ----[ mark ]---- %files license %defattr(0644,root,root,0755) -/usr/share/package-licenses/jaraco.functools/LICENSE +/usr/share/package-licenses/jaraco.functools/a1474494d96f6ddb3a9a0d767a09871ffc388faf %files python %defattr(-,root,root,-) diff --git a/options.conf b/options.conf index d6c428e..7ceaf2e 100644 --- a/options.conf +++ b/options.conf @@ -1,8 +1,9 @@ [package] name = jaraco.functools -url = https://files.pythonhosted.org/packages/a9/1e/44f6a5cffef147a3ffd37a748b8f4c2ded9b07ca20a15f17cd9874158f24/jaraco.functools-2.0.tar.gz +url = https://files.pythonhosted.org/packages/40/63/d5911a9b3c80cf2f80b0ab143f54e3a72c98e20741acaf63b78a1410c561/jaraco.functools-3.0.0.tar.gz archives = giturl = https://github.com/jaraco/jaraco.functools.git +domain = [autospec] # build 32 bit libraries @@ -17,7 +18,7 @@ autoupdate = true broken_c++ = false # disable parallelization during build broken_parallel_build = false -# this package is a library compatability package and only ships versioned library files +# this package is a library compatibility package and only ships versioned library files compat = false # set conservative build flags conservative_flags = false @@ -33,6 +34,8 @@ insecure_build = false keepstatic = false # do not require autostart subpackage no_autostart = false +# do not generate debuginfo for this package +nodebug = false # disable stripping binaries nostrip = false # optimize build for size over speed diff --git a/release b/release index ec63514..f599e28 100644 --- a/release +++ b/release @@ -1 +1 @@ -9 +10 diff --git a/upstream b/upstream index 7bd5343..da1f9c9 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -1feb4481eabbb307b047f3b5a870c17ce34e9ab1/jaraco.functools-2.0.tar.gz +6f72bbcb8c483f79d682b981387848bdc72d1504/jaraco.functools-3.0.0.tar.gz diff --git a/versions b/versions new file mode 100644 index 0000000..4a36342 --- /dev/null +++ b/versions @@ -0,0 +1 @@ +3.0.0 diff --git a/whatrequires b/whatrequires index bb0018c..3576404 100644 --- a/whatrequires +++ b/whatrequires @@ -1,2 +1,4 @@ # This file contains recursive sources that require this package +cheroot +conda tempora