From 43c7071b70a5a495af400e27281ae853e5775e67 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Thu, 31 Oct 2019 18:11:22 +0000 Subject: [PATCH] [update to 2.6] Ensure that a late version of pip is installed without special versions of tox-venv. Jason R. Coombs (12): 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. Enable coverage reporting on project 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 Update changelog for 2.6 --- .gitignore | 5 +++++ Makefile | 2 +- buildreq_cache | 2 ++ options.conf | 9 ++++++--- portend.spec | 20 +++++++++++--------- release | 2 +- upstream | 2 +- versions | 1 + whatrequires | 1 + 9 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 buildreq_cache create mode 100644 versions diff --git a/.gitignore b/.gitignore index edbcfda..0039371 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ .*~ *~ +*.info +*.mod *.swp .repo-index *.log @@ -8,6 +10,9 @@ build.log.round* *.tgz !*.tar.*.* *.zip +*.jar +*.pom +*.xml commitmsg results/ rpms/ diff --git a/Makefile b/Makefile index b648445..8939445 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := portend -URL = https://files.pythonhosted.org/packages/2c/59/948666fc2455ae471efd40cb2a9a990f5f6f2354a9a6b228e29b9fb4a307/portend-2.5.tar.gz +URL = https://files.pythonhosted.org/packages/04/98/997f8668b11292f13d3e69fc626232c497228306c764523c5a3a3b59c775/portend-2.6.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/buildreq_cache b/buildreq_cache new file mode 100644 index 0000000..45a58fa --- /dev/null +++ b/buildreq_cache @@ -0,0 +1,2 @@ +2.6 +util-linux \ No newline at end of file diff --git a/options.conf b/options.conf index dc8fcac..e946dd7 100644 --- a/options.conf +++ b/options.conf @@ -1,8 +1,9 @@ [package] name = portend -url = https://files.pythonhosted.org/packages/2c/59/948666fc2455ae471efd40cb2a9a990f5f6f2354a9a6b228e29b9fb4a307/portend-2.5.tar.gz +url = https://files.pythonhosted.org/packages/04/98/997f8668b11292f13d3e69fc626232c497228306c764523c5a3a3b59c775/portend-2.6.tar.gz archives = giturl = https://github.com/jaraco/portend.git +domain = [autospec] # build 32 bit libraries @@ -12,12 +13,12 @@ allow_test_failures = false # unset %build ld_as_needed variable asneeded = false # this package is trusted enough to automatically update (used by other tools) -autoupdate = false +autoupdate = true # extend flags with '-std=gnu++98 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/portend.spec b/portend.spec index dd4940e..14cf060 100644 --- a/portend.spec +++ b/portend.spec @@ -3,10 +3,10 @@ # Generated by: autospec.py # Name : portend -Version : 2.5 -Release : 15 -URL : https://files.pythonhosted.org/packages/2c/59/948666fc2455ae471efd40cb2a9a990f5f6f2354a9a6b228e29b9fb4a307/portend-2.5.tar.gz -Source0 : https://files.pythonhosted.org/packages/2c/59/948666fc2455ae471efd40cb2a9a990f5f6f2354a9a6b228e29b9fb4a307/portend-2.5.tar.gz +Version : 2.6 +Release : 16 +URL : https://files.pythonhosted.org/packages/04/98/997f8668b11292f13d3e69fc626232c497228306c764523c5a3a3b59c775/portend-2.6.tar.gz +Source0 : https://files.pythonhosted.org/packages/04/98/997f8668b11292f13d3e69fc626232c497228306c764523c5a3a3b59c775/portend-2.6.tar.gz Summary : TCP port monitoring and discovery Group : Development/Tools License : MIT @@ -21,6 +21,7 @@ BuildRequires : pytest BuildRequires : setuptools_scm BuildRequires : tempora BuildRequires : tox +BuildRequires : util-linux BuildRequires : virtualenv %description @@ -54,14 +55,15 @@ python3 components for the portend package. %prep -%setup -q -n portend-2.5 +%setup -q -n portend-2.6 %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=1560316413 +export LANG=C.UTF-8 +export SOURCE_DATE_EPOCH=1572545476 +# -Werror is for werrorists export GCC_IGNORE_WERROR=1 export CFLAGS="$CFLAGS -fno-lto " export FCFLAGS="$CFLAGS -fno-lto " @@ -74,7 +76,7 @@ python3 setup.py build export MAKEFLAGS=%{?_smp_mflags} rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/package-licenses/portend -cp LICENSE %{buildroot}/usr/share/package-licenses/portend/LICENSE +cp %{_builddir}/portend-2.6/LICENSE %{buildroot}/usr/share/package-licenses/portend/a1474494d96f6ddb3a9a0d767a09871ffc388faf python3 -tt setup.py build install --root=%{buildroot} echo ----[ mark ]---- cat %{buildroot}/usr/lib/python3*/site-packages/*/requires.txt || : @@ -85,7 +87,7 @@ echo ----[ mark ]---- %files license %defattr(0644,root,root,0755) -/usr/share/package-licenses/portend/LICENSE +/usr/share/package-licenses/portend/a1474494d96f6ddb3a9a0d767a09871ffc388faf %files python %defattr(-,root,root,-) diff --git a/release b/release index 60d3b2f..b6a7d89 100644 --- a/release +++ b/release @@ -1 +1 @@ -15 +16 diff --git a/upstream b/upstream index b36950d..08d7a59 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -83b322750cfe68947e5d072048d0f8c2cc009cae/portend-2.5.tar.gz +52eb4eaac256ec077be357357659a11fa04a2e60/portend-2.6.tar.gz diff --git a/versions b/versions new file mode 100644 index 0000000..5154b3f --- /dev/null +++ b/versions @@ -0,0 +1 @@ +2.6 diff --git a/whatrequires b/whatrequires index f7c8dea..4e86378 100644 --- a/whatrequires +++ b/whatrequires @@ -1,3 +1,4 @@ # This file contains recursive sources that require this package CherryPy +ceph conda