[gentoo-commits] proj/portage:master commit in: repoman/, /

[gentoo-commits] proj/portage:master commit in: repoman/, /

[Zac Medico]

commit:     e59ec1924d6db957a01c828ce294a7675be5b27c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  6 18:18:02 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jul  7 00:07:27 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e59ec192

travis.yml: drop python 2.7 (bug 731114)

It should be pretty safe to drop support for python2.7 at this point.

Bug: https://bugs.gentoo.org/731114
Reviewed-by: Brian Dolbec <dolsen <AT> gentoo.org>
Reviewed-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 .travis.yml      | 1 -
 repoman/setup.py | 2 +-
 setup.py         | 2 +-
 tox.ini          | 6 ++----
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2132c8c87..d2935fdab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 dist: bionic
 language: python
 python:
-    - 2.7
     - 3.6
     - 3.7
     - 3.8

diff --git a/repoman/setup.py b/repoman/setup.py
index eae0e09fe..f2664fae4 100755
--- a/repoman/setup.py
+++ b/repoman/setup.py
@@ -492,7 +492,7 @@ setup(
 		'Intended Audience :: System Administrators',
 		'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
 		'Operating System :: POSIX',
-		'Programming Language :: Python',
+		'Programming Language :: Python :: 3',
 		'Topic :: System :: Installation/Setup'
 	]
 )

diff --git a/setup.py b/setup.py
index ae00cf736..a3a026203 100755
--- a/setup.py
+++ b/setup.py
@@ -714,7 +714,7 @@ setup(
 		'Intended Audience :: System Administrators',
 		'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
 		'Operating System :: POSIX',
-		'Programming Language :: Python',
+		'Programming Language :: Python :: 3',
 		'Topic :: System :: Installation/Setup'
 	]
 )

diff --git a/tox.ini b/tox.ini
index 79b5b45cb..050a2c455 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,12 @@
 [tox]
-envlist = py27,py36,py37,py38,py39,pypy3
+envlist = py36,py37,py38,py39,pypy3
 skipsdist = True
 
 [testenv]
 deps =
 	pygost
 	pyyaml
-	py27,py36,py37,py38,py39,pypy3: lxml!=4.2.0
-	py27: pyblake2
-	py27: pysha3
+	py36,py37,py38,py39,pypy3: lxml!=4.2.0
 setenv =
 	PYTHONPATH={toxinidir}/lib
 commands =

[gentoo-commits] proj/portage:master commit in: repoman/, /

[Zac Medico]

commit:     d4d1c3110a5bcea44e3c62e8c86d7a999325a61e
Author:     Manuel Rüger <manuel <AT> rueg <DOT> eu>
AuthorDate: Sun Mar  1 12:44:56 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Mar  1 18:41:46 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d4d1c311

Add python3.9 support

Closes: https://github.com/gentoo/portage/pull/515
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 .travis.yml      | 3 ++-
 repoman/runtests | 8 ++++----
 runtests         | 8 ++++----
 tox.ini          | 4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5123141ac..9269d4034 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,8 @@ python:
     - 2.7
     - 3.6
     - 3.7
-    - 3.8-dev
+    - 3.8
+    - 3.9-dev
     - pypy3
 
 # command to install dependencies

diff --git a/repoman/runtests b/repoman/runtests
index 1ef52f482..bbda4526f 100755
--- a/repoman/runtests
+++ b/repoman/runtests
@@ -24,14 +24,14 @@ import tempfile
 # These are the versions we fully support and require to pass tests.
 PYTHON_SUPPORTED_VERSIONS = [
 	'2.7',
-	'3.5',
 	'3.6',
-	'3.7'
+	'3.7',
+	'3.8'
 ]
 # The rest are just "nice to have".
 PYTHON_NICE_VERSIONS = [
-	'pypy',
-	'3.8'
+	'pypy3',
+	'3.9'
 ]
 
 EPREFIX = os.environ.get('PORTAGE_OVERRIDE_EPREFIX', '/')

diff --git a/runtests b/runtests
index 50d7b8251..11c317dff 100755
--- a/runtests
+++ b/runtests
@@ -24,14 +24,14 @@ import tempfile
 # These are the versions we fully support and require to pass tests.
 PYTHON_SUPPORTED_VERSIONS = [
 	'2.7',
-	'3.5',
 	'3.6',
-	'3.7'
+	'3.7',
+	'3.8'
 ]
 # The rest are just "nice to have".
 PYTHON_NICE_VERSIONS = [
-	'pypy',
-	'3.8'
+	'pypy3',
+	'3.9'
 ]
 
 EPREFIX = os.environ.get('PORTAGE_OVERRIDE_EPREFIX', '/')

diff --git a/tox.ini b/tox.ini
index 5ba192d2e..79b5b45cb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,12 @@
 [tox]
-envlist = py27,py36,py37,py38,pypy3
+envlist = py27,py36,py37,py38,py39,pypy3
 skipsdist = True
 
 [testenv]
 deps =
 	pygost
 	pyyaml
-	py27,py36,py37,py38,pypy3: lxml!=4.2.0
+	py27,py36,py37,py38,py39,pypy3: lxml!=4.2.0
 	py27: pyblake2
 	py27: pysha3
 setenv =

[gentoo-commits] proj/portage:master commit in: repoman/, /

[Zac Medico]

commit:     a81621eaa238489fc85d39f594707813496afceb
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 12:25:34 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 22:29:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=a81621ea

Enable python3.7 testing

Reflect recent python versions in test scripts

Closes: https://github.com/gentoo/portage/pull/383
Signed-off-by: Manuel Rüger <mrueg <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 .travis.yml      | 7 +++++++
 repoman/runtests | 6 +++---
 runtests         | 6 +++---
 tox.ini          | 2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 846308e08..ab0b8d304 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,13 @@ python:
     - 3.6
     - pypy
 
+# See https://github.com/travis-ci/travis-ci/issues/9815
+matrix:
+  include:
+    - python: 3.7
+      dist: xenial
+      sudo: required
+
 # command to install dependencies
 install:
     - pip install tox

diff --git a/repoman/runtests b/repoman/runtests
index 2b8cb4c5e..e208ab61d 100755
--- a/repoman/runtests
+++ b/repoman/runtests
@@ -24,14 +24,14 @@ import tempfile
 # These are the versions we fully support and require to pass tests.
 PYTHON_SUPPORTED_VERSIONS = [
 	'2.7',
-	'3.3',
 	'3.4',
+	'3.5',
+	'3.6'
 ]
 # The rest are just "nice to have".
 PYTHON_NICE_VERSIONS = [
 	'pypy',
-	'3.5',
-	'3.6',
+	'3.7'
 ]
 
 EPREFIX = os.environ.get('PORTAGE_OVERRIDE_EPREFIX', '/')

diff --git a/runtests b/runtests
index 597ccaede..7c3ebb1ca 100755
--- a/runtests
+++ b/runtests
@@ -24,14 +24,14 @@ import tempfile
 # These are the versions we fully support and require to pass tests.
 PYTHON_SUPPORTED_VERSIONS = [
 	'2.7',
-	'3.3',
 	'3.4',
+	'3.5',
+	'3.6'
 ]
 # The rest are just "nice to have".
 PYTHON_NICE_VERSIONS = [
 	'pypy',
-	'3.5',
-	'3.6',
+	'3.7'
 ]
 
 EPREFIX = os.environ.get('PORTAGE_OVERRIDE_EPREFIX', '/')

diff --git a/tox.ini b/tox.ini
index cafdb0045..2d1501971 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35,py36,pypy,pypy3
+envlist = py27,py34,py35,py36,py37,pypy,pypy3
 skipsdist = True
 
 [testenv]

[gentoo-commits] proj/portage:master commit in: repoman/, /

[Zac Medico]

commit:     5914efcecc6821c09aa1e6a62d0da8ee3fe8b56f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed May  2 02:27:12 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed May  2 02:29:13 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=5914efce

setup.py: fix sdist bztar format default for python3.6

Since python3.6 defaults to gztar format unconditionally,
override it.

 repoman/setup.py | 3 +--
 setup.py         | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/repoman/setup.py b/repoman/setup.py
index 3bb76ab8a..16ee0bc63 100755
--- a/repoman/setup.py
+++ b/repoman/setup.py
@@ -347,8 +347,7 @@ class x_sdist(sdist):
 	""" sdist defaulting to .tar.bz2 format, and archive files owned by root """
 
 	def finalize_options(self):
-		if self.formats is None:
-			self.formats = ['bztar']
+		self.formats = ['bztar']
 		if self.owner is None:
 			self.owner = 'root'
 		if self.group is None:

diff --git a/setup.py b/setup.py
index 6111a5582..86fd62470 100755
--- a/setup.py
+++ b/setup.py
@@ -535,8 +535,7 @@ class x_sdist(sdist):
 	""" sdist defaulting to .tar.bz2 format, and archive files owned by root """
 
 	def finalize_options(self):
-		if self.formats is None:
-			self.formats = ['bztar']
+		self.formats = ['bztar']
 		if self.owner is None:
 			self.owner = 'root'
 		if self.group is None: