Details

Reviewers

kparal
garretraziel

Maniphest Tasks

T102: package libtaskotron as rpm

Commits

rLTRN9eb043e95fc5: Initial pacakge for libtaskotron, updates to setup.py to grab version from…

Summary

specfile and support updates for rpm packaging

Test Plan

Run on staging and dev systems as packaged. Build available on coprs: http://copr-fe.cloud.fedoraproject.org/coprs/tflink/taskotron/

Diff Detail

Lint

Lint Skipped

Unit

Unit Tests Skipped

kparal added a reviewer: garretraziel.Apr 15 2014, 8:21 AM

Source0 gives 404.

libtaskotron.spec
13	I'm not sure if libtaskotron will be downloadable from git.fedorahosted.org/cgit/blockerbugs.git, but I doubt it. It gives 404 anyway.

I would test it using fedora-review or manually, but I don't know how to get libtaskotron tarball. Do you have any scripts for building "libtaskotron-0.0.6.tar.gz"? Or do you use setup.py for that?

initial code to support generic runner args to fix T127
bumping version to 0.0.7-1
undoing a runner change that was causing problems in tests
changing all references of bodhi-id to bodhi_id so that it plays nice in jinja2 where '-' is an illegal char for identifiers
bumping version on specfile to match code

sorry for the noise, the update was supposed to go to a new revision. I'll try to figure out how to undo

I would test it using fedora-review or manually, but I don't know how to get libtaskotron tarball. Do you have any scripts for building "libtaskotron-0.0.6.tar.gz"? Or do you use setup.py for that?

git archive --format=tar --prefix=libtaskotron-0.0.6/ <branch name> | gzip -c > libtaskotron-0.0.6.tar.gz

substituting your local branch name for <branch name>

initial code to support generic runner args to fix T127
bumping version to 0.0.7-1
undoing a runner change that was causing problems in tests
changing all references of bodhi-id to bodhi_id so that it plays nice in jinja2 where '-' is an illegal char for identifiers
bumping version on specfile to match code

the extra commits still show up in arc but the code is all correct. I'll make sure that nothing extra gets pushed when the review is done

bumping version to 0.0.7 to account for new changes in develop

forgot to fix the revision in the specfile, resetting to 0.0.7-1

The spec file itself seems OK to me, with my limited packaging experience.

setup.py
24–30	That doesn't seem like a very nice approach. In what way is it better than from . import libtaskotron setup(name='libtaskotron', version=libtaskotron.version), ... ? Of course the simplest way is to have the version hardcoded in `setup.py`, but I assume you want to use the version number also in libtaskotron itself (e.g. add `--version` option to `runtask`)?
38–39	The url should read `https://bitbucket.org/fedoraqa/libtaskotron`. Is there any reason to keep the `libtaskotron-demo` repository around instead of deleting it?

libtaskotron.spec
63	Maybe this might be a bit unsafe? Not sure.

libtaskotron.spec
63	I can split it up into more than one line, if you'd prefer
setup.py
24–30	Hrm, I've just been doing setup.py files like this. Hadn't really thought about doing a simple libtaskotron.version instead, to be honest. I don't want the version number in both places, it makes for one more thing to change when bumping version and one more thing that can get out of sync
38–39	no reason to keep libtaskotron-demo around that I'm aware of

making some small changes to url, version parsing and package files for review. adding resultsdb_api as BuildRequires for new tests.

setup.py
5	A relative import would be safer here, I think: from . import libtaskotron otherwise, depending on `sys.path`, some other libtaskotron module can get loaded. I checked python interpreter and by default the local directory is at the top of the list both in standard and virtualenv environment. But with ipython, virtualenv was at the top instead. Users can have heavily modified `sys.path`.

I think you should either use the relative import or the regexp parsing trick. Apart from that, the spec file is hopefully fine.

(Requesting changes to make Phab workflows happy.)

A relative import would be safer here, I think

Sure, but you can't do that outside the package:

Traceback (most recent call last):
  File "setup.py", line 2, in <module>
    from . import libtaskotron
ValueError: Attempted relative import in non-package

I'm tempted to put the file reading code back since you are right about the possibility of PYTHONPATH affecting the installation

Sure, but you can't do that outside the package:

Ugh, right, my mistake.

Unless you want to modify sys.path and add __file__/libtaskotron as the first directory (not clean and nice at all), the regexp approach is probably better. Sorry for confusion.

reverting setup.py back to using regex instead of import so we don't have to worry any sys.path effects

kparal accepted this revision.Apr 23 2014, 12:41 PM

Closed by commit rLTRN9eb043e95fc5 (authored by @tflink).

		Path
A	M	libtaskotron.spec (82 lines)
M		libtaskotron/__init__.py (1 line)
M		setup.py (35 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	138	ec0c61f		Apr 14 2014, 8:40 PM	★	★
Diff 2	147	ec0c61f	- initial code to support generic runner args to fix T127	Apr 15 2014, 2:13 PM	★	★
Diff 3	149	ec0c61f	- initial code to support generic runner args to fix T127	Apr 15 2014, 2:29 PM	★	★
Diff 4	154	29d1870	- bumping version to 0.0.7 to account for new changes in develop	Apr 15 2014, 3:41 PM	★	★
Diff 5	155	29d1870	- forgot to fix the revision in the specfile, resetting to 0.0.7-1	Apr 15 2014, 3:42 PM	★	★
Diff 6	159	34e3915	- making some small changes to url, version parsing and package files for review. adding resultsdb_api as BuildRequires for new tests.	Apr 16 2014, 3:22 PM	★	★
Diff 7	175	34e3915	- reverting setup.py back to using regex instead of import so we don't have to worry any sys.path effects	Apr 22 2014, 4:12 PM	★	★
Diff 8	181	34e3915	Commit rLTRN9eb043e95fc51ba299117b001ca481a85dbb5d15	Apr 23 2014, 1:43 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
f807f5a6ac1d	c01d2844f86a	9ee4e69a8f33	Tim Flink	reverting setup.py back to using regex instead of import so we don't have to… (Show More…)	Apr 22 2014, 4:11 PM
9ee4e69a8f33	f70dd6e37ebb	44ed04613c96	Tim Flink	making some small changes to url, version parsing and package files for review. (Show More…)	Apr 16 2014, 2:37 PM
44ed04613c96	3b55fb3dacef	43fc82c3215f 34e39154cccb	Tim Flink	Merge branch 'develop' into feature/T102-package-libtaskotron	Apr 16 2014, 2:32 PM
43fc82c3215f	fe9359192626	c69e6112b0d3	Tim Flink	forgot to fix the revision in the specfile, resetting to 0.0.7-1	Apr 15 2014, 3:42 PM
c69e6112b0d3	7f4d37f8ea78	d5571a92ad41	Tim Flink	bumping version to 0.0.7 to account for new changes in develop	Apr 15 2014, 3:41 PM
d5571a92ad41	2173bfb954c4	9a7c8b32479e 29d18700b39b	Tim Flink	Merge branch 'develop' into feature/T102-package-libtaskotron	Apr 15 2014, 3:36 PM
9a7c8b32479e	e832e958da3c	d2e02aaf250f 007947583f5e	Tim Flink	Merge branch 'develop' into feature/T102-package-libtaskotron	Apr 15 2014, 3:34 PM
d2e02aaf250f	4e74292bb99b	15b149e1ea92	Tim Flink	fixed source url to be more correct	Apr 15 2014, 2:28 PM
15b149e1ea92	ff305b35683c	ec0c61f90db2	Tim Flink	Initial pacakge for libtaskotron, updates to setup.py to grab version from… (Show More…)	Apr 14 2014, 3:44 PM

Diff 181

View Options

libtaskotron.spec

This file was added.

1		# sitelib for noarch packages, sitearch for others (remove the unneeded one)
2		%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
3		%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
4
5		Name: libtaskotron
6		Version: 0.0.7
7		Release: 2%{?dist}
8		Summary: Taskotron Support Library
9
10		License: GPLv2+
11		URL: https://bitbucket.org/fedoraqa/libtaskotron
12		Source0: http://qadevel.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz
13
	garretrazielUnsubmitted Not Done I'm not sure if libtaskotron will be downloadable from git.fedorahosted.org/cgit/blockerbugs.git, but I doubt it. It gives 404 anyway.
14		BuildArch: noarch
15
16		Requires: bodhi-client
17		Requires: koji
18		Requires: rpm-python
19		Requires: pyOpenSSL
20		Requires: python-pycurl
21		Requires: python-urlgrabber
22		Requires: python-jinja2
23		Requires: pytap13
24		Requires: resultsdb_api
25		Requires: python-bayeux
26		Requires: resultsdb_api
27		BuildRequires: python-devel
28		BuildRequires: python-setuptools
29		BuildRequires: pytest
30		BuildRequires: python-bunch
31		BuildRequires: python-dingus
32		BuildRequires: python-urlgrabber
33		BuildRequires: python-jinja2
34		BuildRequires: koji
35		BuildRequires: pytap13
36		BuildRequires: python-bayeux
37		BuildRequires: bodhi-client
38		BuildRequires: resultsdb_api
39
40
41		%description
42		Libtaskotron is a support library for running taskotron tasks.
43
44		%prep
45		%setup -q
46
47		%check
48		%{__python} setup.py test
49
50		%build
51		%{__python} setup.py build
52
53		%install
54		rm -rf $RPM_BUILD_ROOT
55		%{__python} setup.py install -O1 --skip-build --root %{buildroot}
56
57		# configuration files
58		mkdir -p %{buildroot}%{_sysconfdir}/taskotron/
59		install conf/taskotron.yaml %{buildroot}%{_sysconfdir}/taskotron/taskotron.yaml
60
61
62		%files
63		%doc readme.rst
	kparalUnsubmitted Not Done Maybe this might be a bit unsafe? Not sure.
	tflinkAuthorUnsubmitted Not Done I can split it up into more than one line, if you'd prefer
64		%{python_sitelib}/libtaskotron
65		%{python_sitelib}/*.egg-info
66
67		%dir %{_sysconfdir}/taskotron
68		%{_sysconfdir}/taskotron/taskotron.yaml
69
70		%attr(755,root,root) %{_bindir}/runtask
71
72
73		%changelog
74		* Wed Apr 16 2014 Tim Flink <tflink@fedoraproject.org> - 0.0.7-2
75		- Fixing some urls and other small packaging changes
76
77		* Tue Apr 15 2014 Tim Flink <tflink@fedoraproject.org> - 0.0.7-1
78		- Updating to latest upstream
79		- Change to more generic CLI arguments to match reporting and work better with buildbot
80
81		* Mon Apr 14 2014 Tim Flink <tflink@fedoraproject.org> - 0.0.6-2
82		- Initial package for libtaskotron

View Options

libtaskotron/init.py

		1		__version__ = '0.0.7'

View Options

setup.py

1	from setuptools import setup	1		from setuptools import setup, Command
		2		import codecs
		3		import re
2	import os	4		import os
3		5
			kparalUnsubmitted Not Done A relative import would be safer here, I think: from . import libtaskotron otherwise, depending on `sys.path`, some other libtaskotron module can get loaded. I checked python interpreter and by default the local directory is at the top of the list both in standard and virtualenv environment. But with ipython, virtualenv was at the top instead. Users can have heavily modified `sys.path`.
4	here = os.path.abspath(os.path.dirname(__file__))	6		here = os.path.abspath(os.path.dirname(__file__))
5		7
		8		def read(*parts):
		9		return codecs.open(os.path.join(here, *parts), 'r').read()
		10
		11
		12		def find_version(*file_paths):
		13		version_file = read(*file_paths)
		14		version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]",
		15		version_file, re.M)
		16		if version_match:
		17		return version_match.group(1)
		18		raise RuntimeError("Unable to find version string.")
		19
		20
		21		class PyTest(Command):
		22		user_options = []
		23		def initialize_options(self):
		24		pass
		25		def finalize_options(self):
		26		pass
		27		def run(self):
		28		import subprocess
		29		errno = subprocess.call(['py.test', 'testing'])
		30		raise SystemExit(errno)
			kparalUnsubmitted Not Done That doesn't seem like a very nice approach. In what way is it better than from . import libtaskotron setup(name='libtaskotron', version=libtaskotron.version), ... ? Of course the simplest way is to have the version hardcoded in `setup.py`, but I assume you want to use the version number also in libtaskotron itself (e.g. add `--version` option to `runtask`)?
			tflinkAuthorUnsubmitted Not Done Hrm, I've just been doing setup.py files like this. Hadn't really thought about doing a simple libtaskotron.version instead, to be honest. I don't want the version number in both places, it makes for one more thing to change when bumping version and one more thing that can get out of sync
		31
6		32
7	setup(name='libtaskotron',	33		setup(name='libtaskotron',
8	version='0.0.3',	34		version=find_version('libtaskotron', '__init__.py'),
9	description='base lib for taskotron jobs',	35		description='base lib for taskotron jobs',
10	author='Tim Flink',	36		author='Tim Flink',
11	author_email='tflink@fedoraproject.org',	37		author_email='tflink@fedoraproject.org',
12	license='GPLv2+',	38		license='GPLv2+',
13	url='https://bitbucket.org/fedoraqa/libtaskotron-demo',	39		url='https://bitbucket.org/fedoraqa/libtaskotron',
			kparalUnsubmitted Not Done The url should read `https://bitbucket.org/fedoraqa/libtaskotron`. Is there any reason to keep the `libtaskotron-demo` repository around instead of deleting it?
			tflinkAuthorUnsubmitted Not Done no reason to keep libtaskotron-demo around that I'm aware of
14	packages=['libtaskotron'],	40		packages=['libtaskotron', 'libtaskotron.directives'],
15	package_dir={'libtaskotron':'libtaskotron'},	41		package_dir={'libtaskotron':'libtaskotron'},
16	include_package_data=True,	42		include_package_data=True,
		43		cmdclass={'test': PyTest},
17	entry_points=dict(console_scripts=['runtask=libtaskotron.runner:main']),	44		entry_points=dict(console_scripts=['runtask=libtaskotron.runner:main']),
18	install_requires = [	45		install_requires = [
19	'PyYAML',	46		'PyYAML',
20	]	47		]
21	)	48		)

Initial pacakge for libtaskotron, updates to setup.py to grab version from libtaskotron/init.py. Fixes T102
ClosedPublic
Actions

Details

Diff Detail

Revision Contents

Diff 181

libtaskotron.spec

libtaskotron/init.py

setup.py

Initial pacakge for libtaskotron, updates to setup.py to grab version from libtaskotron/__init__.py. Fixes T102ClosedPublicActions

Details

Diff Detail

Revision Contents

Diff 181

libtaskotron.spec

libtaskotron/__init__.py

setup.py

Initial pacakge for libtaskotron, updates to setup.py to grab version from libtaskotron/init.py. Fixes T102
ClosedPublic
Actions

libtaskotron/init.py