Skip to content
This repository has been archived by the owner on Oct 27, 2022. It is now read-only.

Commit

Permalink
[update to 2.6] Ensure that a late version of pip is installed withou…
Browse files Browse the repository at this point in the history
…t 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
  • Loading branch information
fenrus75 committed Oct 31, 2019
1 parent 61a435e commit 43c7071
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 15 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.*~
*~
*.info
*.mod
*.swp
.repo-index
*.log
Expand All @@ -8,6 +10,9 @@ build.log.round*
*.tgz
!*.tar.*.*
*.zip
*.jar
*.pom
*.xml
commitmsg
results/
rpms/
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions buildreq_cache
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
2.6
util-linux
9 changes: 6 additions & 3 deletions options.conf
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
20 changes: 11 additions & 9 deletions portend.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -21,6 +21,7 @@ BuildRequires : pytest
BuildRequires : setuptools_scm
BuildRequires : tempora
BuildRequires : tox
BuildRequires : util-linux
BuildRequires : virtualenv

%description
Expand Down Expand Up @@ -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 "
Expand All @@ -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 || :
Expand All @@ -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,-)
Expand Down
2 changes: 1 addition & 1 deletion release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15
16
2 changes: 1 addition & 1 deletion upstream
Original file line number Diff line number Diff line change
@@ -1 +1 @@
83b322750cfe68947e5d072048d0f8c2cc009cae/portend-2.5.tar.gz
52eb4eaac256ec077be357357659a11fa04a2e60/portend-2.6.tar.gz
1 change: 1 addition & 0 deletions versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6
1 change: 1 addition & 0 deletions whatrequires
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# This file contains recursive sources that require this package
CherryPy
ceph
conda

0 comments on commit 43c7071

Please sign in to comment.