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

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

[Brian Dolbec]

commit:     42697825e546990d80ffb38c12fecc3d9d372136
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 20:21:26 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat May 14 20:21:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=42697825

repoman/setup.py: Clean out unneeded code

 repoman/setup.py | 217 +------------------------------------------------------
 1 file changed, 1 insertion(+), 216 deletions(-)

diff --git a/repoman/setup.py b/repoman/setup.py
index 07b14dc..62c5b62 100755
--- a/repoman/setup.py
+++ b/repoman/setup.py
@@ -10,7 +10,6 @@ from distutils.command.build_scripts import build_scripts
 from distutils.command.clean import clean
 from distutils.command.install import install
 from distutils.command.install_data import install_data
-from distutils.command.install_lib import install_lib
 from distutils.command.install_scripts import install_scripts
 from distutils.command.sdist import sdist
 from distutils.dep_util import newer
@@ -19,10 +18,8 @@ from distutils.util import change_root, subst_vars
 
 import codecs
 import collections
-import glob
 import os
 import os.path
-import re
 import subprocess
 import sys
 
@@ -34,8 +31,6 @@ x_scripts = {
 	'bin': [
 		'bin/repoman',
 	],
-	'sbin': [
-	],
 }
 
 
@@ -83,113 +78,6 @@ class build_man(Command):
 					f.writelines(data)
 
 
-class docbook(Command):
-	""" Build docs using docbook. """
-
-	user_options = [
-		('doc-formats=', None, 'Documentation formats to build (all xmlto formats for docbook are allowed, comma-separated'),
-	]
-
-	def initialize_options(self):
-		self.doc_formats = 'xhtml,xhtml-nochunks'
-
-	def finalize_options(self):
-		self.doc_formats = self.doc_formats.replace(',', ' ').split()
-
-	def run(self):
-		if not os.path.isdir('doc/fragment'):
-			mkpath('doc/fragment')
-
-		with open('doc/fragment/date', 'w'):
-			pass
-		with open('doc/fragment/version', 'w') as f:
-			f.write('<releaseinfo>%s</releaseinfo>' % self.distribution.get_version())
-
-		for f in self.doc_formats:
-			print('Building docs in %s format...' % f)
-			subprocess.check_call(['xmlto', '-o', 'doc',
-				'-m', 'doc/custom.xsl', f, 'doc/portage.docbook'])
-
-
-class epydoc(Command):
-	""" Build API docs using epydoc. """
-
-	user_options = [
-	]
-
-	def initialize_options(self):
-		self.build_lib = None
-
-	def finalize_options(self):
-		self.set_undefined_options('build_py', ('build_lib', 'build_lib'))
-
-	def run(self):
-		self.run_command('build_py')
-
-		print('Building API documentation...')
-
-		process_env = os.environ.copy()
-		pythonpath = self.build_lib
-		try:
-			pythonpath += ':' + process_env['PYTHONPATH']
-		except KeyError:
-			pass
-		process_env['PYTHONPATH'] = pythonpath
-
-		subprocess.check_call(['epydoc', '-o', 'epydoc',
-			'--name', self.distribution.get_name(),
-			'--url', self.distribution.get_url(),
-			'-qq', '--no-frames', '--show-imports',
-			'--exclude', 'portage.tests',
-			'_emerge', 'portage'],
-			env = process_env)
-		os.remove('epydoc/api-objects.txt')
-
-
-class install_docbook(install_data):
-	""" install_data for docbook docs """
-
-	user_options = install_data.user_options
-
-	def initialize_options(self):
-		install_data.initialize_options(self)
-		self.htmldir = None
-
-	def finalize_options(self):
-		self.set_undefined_options('install', ('htmldir', 'htmldir'))
-		install_data.finalize_options(self)
-
-	def run(self):
-		if not os.path.exists('doc/portage.html'):
-			self.run_command('docbook')
-		self.data_files = [
-			(self.htmldir, glob.glob('doc/*.html')),
-		]
-		install_data.run(self)
-
-
-class install_epydoc(install_data):
-	""" install_data for epydoc docs """
-
-	user_options = install_data.user_options
-
-	def initialize_options(self):
-		install_data.initialize_options(self)
-		self.htmldir = None
-
-	def finalize_options(self):
-		self.set_undefined_options('install', ('htmldir', 'htmldir'))
-		install_data.finalize_options(self)
-
-	def run(self):
-		if not os.path.exists('epydoc/index.html'):
-			self.run_command('epydoc')
-		self.data_files = [
-			(os.path.join(self.htmldir, 'api'), glob.glob('epydoc/*')),
-		]
-		install_data.run(self)
-
-
 class x_build_scripts_custom(build_scripts):
 	def finalize_options(self):
 		build_scripts.finalize_options(self)
@@ -225,14 +113,6 @@ class x_build_scripts_bin(x_build_scripts_custom):
 	dir_name = 'bin'
 
 
-class x_build_scripts_sbin(x_build_scripts_custom):
-	dir_name = 'sbin'
-
-
-class x_build_scripts_portagebin(x_build_scripts_custom):
-	dir_name = 'portage'
-
-
 class x_build_scripts(build_scripts):
 	def initialize_option(self):
 		build_scripts.initialize_options(self)
@@ -242,37 +122,11 @@ class x_build_scripts(build_scripts):
 
 	def run(self):
 		self.run_command('build_scripts_bin')
-		self.run_command('build_scripts_portagebin')
-		self.run_command('build_scripts_sbin')
 
 
 class x_clean(clean):
 	""" clean extended for doc & post-test cleaning """
 
-	@staticmethod
-	def clean_docs():
-		def get_doc_outfiles():
-			for dirpath, _dirnames, filenames in os.walk('doc'):
-				for f in filenames:
-					if f.endswith('.docbook') or f == 'custom.xsl':
-						pass
-					else:
-						yield os.path.join(dirpath, f)
-
-				# do not recurse
-				break
-
-
-		for f in get_doc_outfiles():
-			print('removing %s' % repr(f))
-			os.remove(f)
-
-		if os.path.isdir('doc/fragment'):
-			remove_tree('doc/fragment')
-
-		if os.path.isdir('epydoc'):
-			remove_tree('epydoc')
-
 	def clean_tests(self):
 		# do not remove incorrect dirs accidentally
 		top_dir = os.path.normpath(os.path.join(self.build_lib, '..'))
@@ -410,54 +264,6 @@ class x_install_data(install_data):
 		self.data_files = old_data_files
 
 
-class x_install_lib(install_lib):
-	""" install_lib command with Portage path substitution """
-
-	user_options = install_lib.user_options
-
-	def initialize_options(self):
-		install_lib.initialize_options(self)
-		self.portage_base = None
-		self.portage_bindir = None
-		self.portage_confdir = None
-
-	def finalize_options(self):
-		install_lib.finalize_options(self)
-		self.set_undefined_options('install',
-			('portage_base', 'portage_base'),
-			('portage_bindir', 'portage_bindir'),
-			('portage_confdir', 'portage_confdir'))
-
-	def install(self):
-		ret = install_lib.install(self)
-
-		def rewrite_file(path, val_dict):
-			path = os.path.join(self.install_dir, path)
-			print('Rewriting %s' % path)
-			with codecs.open(path, 'r', 'utf-8') as f:
-				data = f.read()
-
-			for varname, val in val_dict.items():
-				regexp = r'(?m)^(%s\s*=).*$' % varname
-				repl = r'\1 %s' % repr(val)
-
-				data = re.sub(regexp, repl, data)
-
-			with codecs.open(path, 'w', 'utf-8') as f:
-				f.write(data)
-
-		rewrite_file('portage/__init__.py', {
-			'VERSION': self.distribution.get_version(),
-		})
-		rewrite_file('portage/const.py', {
-			'PORTAGE_BASE_PATH': self.portage_base,
-			'PORTAGE_BIN_PATH': self.portage_bindir,
-			'PORTAGE_CONFIG_PATH': self.portage_confdir,
-		})
-
-		return ret
-
-
 class x_install_scripts_custom(install_scripts):
 	def initialize_options(self):
 		install_scripts.initialize_options(self)
@@ -480,16 +286,6 @@ class x_install_scripts_bin(x_install_scripts_custom):
 	var_name = 'bindir'
 
 
-class x_install_scripts_sbin(x_install_scripts_custom):
-	dir_name = 'sbin'
-	var_name = 'sbindir'
-
-
-class x_install_scripts_portagebin(x_install_scripts_custom):
-	dir_name = 'portage'
-	var_name = 'portage_bindir'
-
-
 class x_install_scripts(install_scripts):
 	def initialize_option(self):
 		pass
@@ -499,8 +295,6 @@ class x_install_scripts(install_scripts):
 
 	def run(self):
 		self.run_command('install_scripts_bin')
-		self.run_command('install_scripts_portagebin')
-		self.run_command('install_scripts_sbin')
 
 
 class x_sdist(sdist):
@@ -576,7 +370,7 @@ class test(Command):
 		self.run_command('build_tests')
 		subprocess.check_call([
 			sys.executable, '-bWd',
-			os.path.join(self.build_lib, 'portage/tests/runTests.py')
+			os.path.join(self.build_lib, 'repoman/tests/runTests.py')
 		])
 
 
@@ -631,21 +425,12 @@ setup(
 		'build_man': build_man,
 		'build_scripts': x_build_scripts,
 		'build_scripts_bin': x_build_scripts_bin,
-		'build_scripts_portagebin': x_build_scripts_portagebin,
-		'build_scripts_sbin': x_build_scripts_sbin,
 		'build_tests': build_tests,
 		'clean': x_clean,
-		'docbook': docbook,
-		'epydoc': epydoc,
 		'install': x_install,
 		'install_data': x_install_data,
-		'install_docbook': install_docbook,
-		'install_epydoc': install_epydoc,
-		'install_lib': x_install_lib,
 		'install_scripts': x_install_scripts,
 		'install_scripts_bin': x_install_scripts_bin,
-		'install_scripts_portagebin': x_install_scripts_portagebin,
-		'install_scripts_sbin': x_install_scripts_sbin,
 		'sdist': x_sdist,
 		'test': test,
 	},

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

[Brian Dolbec]

commit:     28e4ea8c512c03fe95f83b6bafde6218f8a0c88b
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 20:22:01 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat May 14 20:22:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=28e4ea8c

repoman: Initial NEWS, RELEASE-NOTES files

 repoman/NEWS          | 5 +++++
 repoman/RELEASE-NOTES | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/repoman/NEWS b/repoman/NEWS
new file mode 100644
index 0000000..2b1325c
--- /dev/null
+++ b/repoman/NEWS
@@ -0,0 +1,5 @@
+News (mainly features/major bug fixes)
+
+repoman 2.3.0_rc1
+=====================
+- First test release

diff --git a/repoman/RELEASE-NOTES b/repoman/RELEASE-NOTES
new file mode 100644
index 0000000..5daf588
--- /dev/null
+++ b/repoman/RELEASE-NOTES
@@ -0,0 +1,7 @@
+Release Notes; upgrade information mainly.
+Features/major bugfixes are listed in NEWS
+
+repoman-2.3.0_rc1
+==================================
+* initial release
+* Bug Fixes:

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

[Brian Dolbec]

commit:     98c6189981760df1b7077cdf1c74de9d427a8af9
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 00:21:33 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun May 15 00:21:33 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=98c61899

repoman: Fix the repoman/runtests script to run from it's current location

This allows it to be called from the base portage directory or anywhere else.

 repoman/runtests | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/repoman/runtests b/repoman/runtests
index bad83dc..599edda 100755
--- a/repoman/runtests
+++ b/repoman/runtests
@@ -121,6 +121,8 @@ def main(argv):
 			else:
 				pyversions.extend(ver.split())
 
+	here = os.path.dirname(__file__)
+	run_path = os.path.join(here, 'pym/repoman/tests/runTests.py')
 	tempdir = None
 	try:
 		# Set up a single tempdir for all the tests to use.
@@ -132,7 +134,7 @@ def main(argv):
 		statuses = []
 		for ver in pyversions:
 			prog = get_python_executable(ver)
-			cmd = [prog, '-b', '-Wd', 'pym/repoman/tests/runTests.py'] + args
+			cmd = [prog, '-b', '-Wd', run_path] + args
 			if os.access(prog, os.X_OK):
 				print('%sTesting with Python %s...%s' %
 					(colors.GOOD, ver, colors.NORMAL))

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

[Brian Dolbec]

commit:     e0b347b755a0c59c61fad76821fde804581b0f20
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 04:40:50 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun May 15 04:40:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e0b347b7

repoman: add a .portage_not_installed file for the travis test

 repoman/.portage_not_installed | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/repoman/.portage_not_installed b/repoman/.portage_not_installed
new file mode 100644
index 0000000..e69de29

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

[Brian Dolbec]

commit:     bc0d74d2933ab1716abbd85d0c9eae811e62b1c3
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 00:21:33 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun May 15 18:17:03 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=bc0d74d2

repoman: Fix the repoman/runtests script to run from it's current location

This allows it to be called from the base portage directory or anywhere else.

 repoman/runtests | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/repoman/runtests b/repoman/runtests
index bad83dc..599edda 100755
--- a/repoman/runtests
+++ b/repoman/runtests
@@ -121,6 +121,8 @@ def main(argv):
 			else:
 				pyversions.extend(ver.split())
 
+	here = os.path.dirname(__file__)
+	run_path = os.path.join(here, 'pym/repoman/tests/runTests.py')
 	tempdir = None
 	try:
 		# Set up a single tempdir for all the tests to use.
@@ -132,7 +134,7 @@ def main(argv):
 		statuses = []
 		for ver in pyversions:
 			prog = get_python_executable(ver)
-			cmd = [prog, '-b', '-Wd', 'pym/repoman/tests/runTests.py'] + args
+			cmd = [prog, '-b', '-Wd', run_path] + args
 			if os.access(prog, os.X_OK):
 				print('%sTesting with Python %s...%s' %
 					(colors.GOOD, ver, colors.NORMAL))

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

[Brian Dolbec]

commit:     bc0d74d2933ab1716abbd85d0c9eae811e62b1c3
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 00:21:33 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun May 15 18:17:03 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=bc0d74d2

repoman: Fix the repoman/runtests script to run from it's current location

This allows it to be called from the base portage directory or anywhere else.

 repoman/runtests | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/repoman/runtests b/repoman/runtests
index bad83dc..599edda 100755
--- a/repoman/runtests
+++ b/repoman/runtests
@@ -121,6 +121,8 @@ def main(argv):
 			else:
 				pyversions.extend(ver.split())
 
+	here = os.path.dirname(__file__)
+	run_path = os.path.join(here, 'pym/repoman/tests/runTests.py')
 	tempdir = None
 	try:
 		# Set up a single tempdir for all the tests to use.
@@ -132,7 +134,7 @@ def main(argv):
 		statuses = []
 		for ver in pyversions:
 			prog = get_python_executable(ver)
-			cmd = [prog, '-b', '-Wd', 'pym/repoman/tests/runTests.py'] + args
+			cmd = [prog, '-b', '-Wd', run_path] + args
 			if os.access(prog, os.X_OK):
 				print('%sTesting with Python %s...%s' %
 					(colors.GOOD, ver, colors.NORMAL))

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

[Brian Dolbec]

commit:     768c2d545d53c945e86796cd683c5d033d08d7a7
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 18:22:33 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Dec  5 18:28:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=768c2d54

srepoman setup.py: Add the new cnf/qa_data cnf/linechecks items

 repoman/setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/repoman/setup.py b/repoman/setup.py
index c22a5c305..d2539f38c 100755
--- a/repoman/setup.py
+++ b/repoman/setup.py
@@ -479,6 +479,8 @@ setup(
 
 	data_files = list(get_manpages()) + [
 		['$docdir', ['NEWS', 'RELEASE-NOTES']],
+		['share/repoman/qa_data', ['cnf/qa_data/qa_data.yaml']],
+		['share/repoman/linechecks', ['cnf/linechecks.yaml']],
 	],
 
 	cmdclass = {

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

[Brian Dolbec]

commit:     3c0b08d8a42038bba777d831057e6936a27ba76e
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 18:22:33 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Dec  6 00:13:28 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=3c0b08d8

repoman setup.py: Add the new cnf/qa_data cnf/linechecks items

 repoman/setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/repoman/setup.py b/repoman/setup.py
index c22a5c305..a667b8a6b 100755
--- a/repoman/setup.py
+++ b/repoman/setup.py
@@ -479,6 +479,8 @@ setup(
 
 	data_files = list(get_manpages()) + [
 		['$docdir', ['NEWS', 'RELEASE-NOTES']],
+		['share/repoman/qa_data', ['cnf/qa_data/qa_data.yaml']],
+		['share/repoman/linechecks', ['cnf/linechecks/linechecks.yaml']],
 	],
 
 	cmdclass = {

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

[Brian Dolbec]

commit:     dfc53030e25513a68a8c6b17f85719da9f1ac65c
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 18:22:33 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 21:26:13 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=dfc53030

repoman setup.py: Add the new cnf/qa_data cnf/linechecks items

 repoman/setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/repoman/setup.py b/repoman/setup.py
index aaf10cdb5..9ac58ef35 100755
--- a/repoman/setup.py
+++ b/repoman/setup.py
@@ -479,6 +479,8 @@ setup(
 
 	data_files = list(get_manpages()) + [
 		['$docdir', ['NEWS', 'RELEASE-NOTES']],
+		['share/repoman/qa_data', ['cnf/qa_data/qa_data.yaml']],
+		['share/repoman/linechecks', ['cnf/linechecks/linechecks.yaml']],
 	],
 
 	cmdclass = {

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

[Brian Dolbec]

commit:     31e90868cd7f2b78d6f4c0ca400314048c2b4868
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 18:22:33 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 00:43:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=31e90868

repoman setup.py: Add the new cnf/qa_data cnf/linechecks items

 repoman/setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/repoman/setup.py b/repoman/setup.py
index aaf10cdb5..9ac58ef35 100755
--- a/repoman/setup.py
+++ b/repoman/setup.py
@@ -479,6 +479,8 @@ setup(
 
 	data_files = list(get_manpages()) + [
 		['$docdir', ['NEWS', 'RELEASE-NOTES']],
+		['share/repoman/qa_data', ['cnf/qa_data/qa_data.yaml']],
+		['share/repoman/linechecks', ['cnf/linechecks/linechecks.yaml']],
 	],
 
 	cmdclass = {

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

[Zac Medico]

commit:     8ef665c37ec1b76a2884903f9c29e5a2fffc3b97
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 18:22:33 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 03:51:22 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=8ef665c3

repoman setup.py: Add the new cnf/qa_data cnf/linechecks items

Closes: https://github.com/gentoo/portage/pull/202

 repoman/setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/repoman/setup.py b/repoman/setup.py
index aaf10cdb5..9ac58ef35 100755
--- a/repoman/setup.py
+++ b/repoman/setup.py
@@ -479,6 +479,8 @@ setup(
 
 	data_files = list(get_manpages()) + [
 		['$docdir', ['NEWS', 'RELEASE-NOTES']],
+		['share/repoman/qa_data', ['cnf/qa_data/qa_data.yaml']],
+		['share/repoman/linechecks', ['cnf/linechecks/linechecks.yaml']],
 	],
 
 	cmdclass = {