Differential D1127

improve installation and test workflow
ClosedPublic
Actions

Authored by kparal on Feb 10 2017, 2:33 PM.

Details

Reviewers
jskladan
Group Reviewers
libtaskotron
Commits
rLTRNfcc74e37ff45: improve installation and test workflow
Summary
  • Use --ignore-installed for pip to make sure all available packages

are installed into virtualenv if available.

  • Simplify setup and test instructions in README.
  • Show test coverage by default for a test suite. Remove clashing

pytest.ini.

  • Remove extra venv repos from dodo, they are now available in PyPI.
  • Avoid silent command failures in dodo by using && instead of ;
  • Add missing deps into spec file.
  • Add testcloud to requirements, it's on PyPI now.
  • Remove deps from setup.py, it's outdated and there's no point until we

publish it to PyPI.

Test Plan

updated virtualenv and testing instructions worked for me, also package building

Diff Detail

Repository
rLTRN libtaskotron
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
kparal retitled this revision from to improve installation and test workflow.Feb 10 2017, 2:33 PM
kparal updated this object.
kparal edited the test plan for this revision. (Show Details)
kparal added a reviewer: libtaskotron.
jskladan added a subscriber: jskladan.Feb 10 2017, 10:30 PM
jskladan added inline comments.
README.rst
50

is the testcloud dependency removed for simplicity, or do we not need it at all now?

61

What's the technical and actual difference between --force-reinstall and --ignore-installed? Also, does it not go around the purpose of --system-site-packages?

182

What's the difference in pytest (used in resultsdb's readme) and py.test used here. I guess it's the same, so we might keep it consistent?

requirements.txt
13

This extra newline, and the one on line 41 are killing me :)

mkrizek added a subscriber: mkrizek.Feb 13 2017, 7:44 AM

Other than @jskladan's remarks, looks good.

README.rst
50

It's removed here and added to requirements.txt ;)

kparal added a comment.Feb 13 2017, 11:24 AM

Thanks for a detailed review!

README.rst
50

Yes, we can use the PyPI version now. It wasn't on PyPI before.

61

--force-reinstall works only with --update, otherwise does nothing. --ignore-installed works always. The main use case seems (to me) to have it used together with --system-site-packages. We want system site packages be used only when absolutely necessary (if everything can be installed from pypi, ideally without compilation, we prefer standalone virtualenv). However, if you have e.g. requests already installed in the system, they will not be installed in the virtualenv (because pip already sees it as installed). If you use --ignore-installed, packages will always be installed, regardless of existing system packages. This makes sure that your virtualenv contains as many packages as possible, and only the necessary minimum is pulled from system site packages.

As an example, let's say we have 10 packages defined in requirements.txt and 1 package (koji) which is not on pypi and thus forces us to use --system-site-packages. If you use just pip install, you'll end up having 0-10 packages in your virtualenv, depending on your system state. The system state of course changes in time, so packages might end up being removed or updated/downgraded, potentially causing issues in your project. If you do pip install --ignore-installed, you'll end up with exactly 10 packages in your virtualenv (the full set), and the only package that is pulled from your system is koji.

182

Yeah, my fault. It seems that pytest command is available only in latest pytest package, and the older (and more universal) binary name is py.test. So we either need to bump requirement.txt to pytest >= 3.0 (so that we get pytest), which I was a bit reluctant to do (since neither F24 nor F25 contains pytest >= 3.0), or we need to stay with py.test. If you want it consistent across projects, all we need to do is to change the README in resultsdb to use py.test.

requirements.txt
13

Macro devops: newlines baby

kparal updated this revision to Diff 2885.Feb 13 2017, 11:26 AM
  • requirements: stop teasing jskladan
jskladan added inline comments.Feb 13 2017, 12:17 PM
README.rst
61

So, as we discussed in person, the --ignore-installed really mostly invalidates the reason for us to have --system-site-packages - so we don't need to keep a list of required devel packages for the gcc installation.
Let's remove the --ignore-installed and creatively use the versioning in requirements.txt.

kparal updated this revision to Diff 2886.Feb 13 2017, 12:49 PM
  • remove --ignore-installed again. Relax restrictions on requirements.txt
jskladan accepted this revision.Feb 13 2017, 1:17 PM
jskladan added a reviewer: jskladan.

Macro devops: iz ok I guess...

This revision is now accepted and ready to land.Feb 13 2017, 1:17 PM
Closed by commit rLTRNfcc74e37ff45: improve installation and test workflow (authored by Kamil Páral <kparal@redhat.com>). · Explain WhyFeb 14 2017, 7:30 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
MREADME.rst (50 lines)
Mdodo.py (15 lines)
Mlibtaskotron.spec (10 lines)
Mrequirements.txt (53 lines)
Msetup.py (3 lines)
DMtesting/pytest.ini (4 lines)
Mtox.ini (2 lines)

Diff 2892

View Options

README.rst

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Line(s)35On your Fedora system, install the necessary packages::
42 libtaskotron-config \ 42​ libtaskotron-config \
43 mash \ 43​ mash \
44 python-doit \ 44​ python-doit \
45 python-hawkey \ 45​ python-hawkey \
46 python-pip \ 46​ python-pip \
47 python-rpmfluff \ 47​ python-rpmfluff \
48 python-virtualenv \ 48​ python-virtualenv \
49 rpm-build \ 49​ rpm-build \
50 rpm-python \ 50​ rpm-python
jskladanUnsubmitted
Not Done

is the testcloud dependency removed for simplicity, or do we not need it at all now?

mkrizekUnsubmitted
Not Done

It's removed here and added to requirements.txt ;)

kparalAuthorUnsubmitted
Not Done

Yes, we can use the PyPI version now. It wasn't on PyPI before.

51 testcloud ​
52 51​
53If you have not yet cloned the repository, do it now:: 52​If you have not yet cloned the repository, do it now::
54 53​
55 git clone https://pagure.io/taskotron/libtaskotron.git 54​ git clone https://pagure.io/taskotron/libtaskotron.git
56 cd libtaskotron 55​ cd libtaskotron
57 56​
58Then, set up the virtualenv:: 57​Then, set up the virtualenv::
59 58​
60 virtualenv --system-site-packages env_taskotron 59​ virtualenv --system-site-packages env_taskotron
61 source env_taskotron/bin/activate 60​ source env_taskotron/bin/activate
62 pip install -r requirements.txt 61​ pip install -r requirements.txt
jskladanUnsubmitted
Not Done

What's the technical and actual difference between --force-reinstall and --ignore-installed? Also, does it not go around the purpose of --system-site-packages?

kparalAuthorUnsubmitted
Not Done

--force-reinstall works only with --update, otherwise does nothing. --ignore-installed works always. The main use case seems (to me) to have it used together with --system-site-packages. We want system site packages be used only when absolutely necessary (if everything can be installed from pypi, ideally without compilation, we prefer standalone virtualenv). However, if you have e.g. requests already installed in the system, they will not be installed in the virtualenv (because pip already sees it as installed). If you use --ignore-installed, packages will always be installed, regardless of existing system packages. This makes sure that your virtualenv contains as many packages as possible, and only the necessary minimum is pulled from system site packages.

As an example, let's say we have 10 packages defined in requirements.txt and 1 package (koji) which is not on pypi and thus forces us to use --system-site-packages. If you use just pip install, you'll end up having 0-10 packages in your virtualenv, depending on your system state. The system state of course changes in time, so packages might end up being removed or updated/downgraded, potentially causing issues in your project. If you do pip install --ignore-installed, you'll end up with exactly 10 packages in your virtualenv (the full set), and the only package that is pulled from your system is koji.

jskladanUnsubmitted
Not Done

So, as we discussed in person, the --ignore-installed really mostly invalidates the reason for us to have --system-site-packages - so we don't need to keep a list of required devel packages for the gcc installation.
Let's remove the --ignore-installed and creatively use the versioning in requirements.txt.

63 62​
64Finally, you should install libtaskotron, so that you don't need to specify the 63​If you encounter any installation issues, it's possible that you don't have
65full path for the taskotron runner every time you want to run it. You can either 64​``gcc`` and necessary C development headers installed to compile C extensions
66use a standard installation, if you want to just use this project:: 65​from PyPI. Either install those based on the error messages, or install
67 66​the necessary packages directly to your system. See ``requirements.txt`` to
68 pip install . 67​learn how.
69 68​
70Or, if you intend to work on this project, you can install it in the editable 69​Finally, you should install libtaskotron in editable mode. This way you don't
71mode. This way you don't need to reinstall the project every time you make some 70​need to reinstall the project every time you make some changes to it, the code
72changes to it, the code changes are reflected immediately:: 71​changes are reflected immediately::
73 72​
74 pip install -e . 73​ pip install -e .
75 74​
76Before running any task, you also need to manually create a few required 75​Before running any task, you also need to manually create a few required
77directories. First, create a ``taskotron`` group if you don't have it already, 76​directories. First, create a ``taskotron`` group if you don't have it already,
78and add your user to it (you'll need to re-login afterwards):: 77​and add your user to it (you'll need to re-login afterwards)::
79 78​
80 getent group taskotron || sudo groupadd taskotron 79​ getent group taskotron || sudo groupadd taskotron
Show All 29 Lines
110============== 109​==============
111 110​
112A relatively simple example task is `rpmlint <https://bitbucket.org/fedoraqa/task-rpmlint>`_. 111​A relatively simple example task is `rpmlint <https://bitbucket.org/fedoraqa/task-rpmlint>`_.
113 112​
114The task requires the rpmlint tool to be installed, so be sure to run:: 113​The task requires the rpmlint tool to be installed, so be sure to run::
115 114​
116 sudo dnf install rpmlint 115​ sudo dnf install rpmlint
117 116​
118To run that task against a koji build with NVR ``<nvr>`` for some arch 117​To run that task against a koji build with NVR ``<nvr>``, do the following::
119``<arch>``, do the following:: ​
120 118​
121 git clone https://bitbucket.org/fedoraqa/task-rpmlint.git 119​ git clone https://bitbucket.org/fedoraqa/task-rpmlint.git
122 runtask -i <nvr> -t koji_build -a <arch> task-rpmlint/runtask.yml 120​ runtask -i <nvr> -t koji_build task-rpmlint/runtask.yml
123 121​
124This will download the ``<nvr>`` from koji into a temp directory under 122​This will download the ``<nvr>`` from koji into a temp directory under
125``/var/tmp/taskotron/``, run rpmlint on the downloaded rpms and print output in 123​``/var/tmp/taskotron/``, run rpmlint on the downloaded rpms and print output in
126YAML format to stdout. 124​YAML format to stdout.
127 125​
128Example:: 126​Example::
129 127​
130 runtask -i htop-2.0.2-1.fc24 -t koji_build -a x86_64 task-rpmlint/runtask.yml 128​ runtask -i htop-2.0.2-1.fc24 -t koji_build task-rpmlint/runtask.yml
131 129​
132 130​
133Using Disposable Clients for Task Execution 131​Using Disposable Clients for Task Execution
134=========================================== 132​===========================================
135 133​
136When executing the task on the local machine is not desirable, you can use the 134​When executing the task on the local machine is not desirable, you can use the
137disposable client feature - a new virtual machine is spawned from a base image 135​disposable client feature - a new virtual machine is spawned from a base image
138and the task is executed in the VM. 136​and the task is executed in the VM.
139 137​
140Note: you need to setup Testcloud first refer to `Setting up Testcloud`_ 138​Note: you need to setup Testcloud first refer to `Setting up Testcloud`_
141 139​
142To use the feature, just add ``--libvirt`` parameter to the runtask command:: 140​To use the feature, just add ``--libvirt`` parameter to the runtask command::
143 141​
144 runtask --libvirt -i htop-2.0.2-1.fc24 -t koji_build -a x86_64 task-rpmlint/runtask.yml 142​ runtask --libvirt -i htop-2.0.2-1.fc24 -t koji_build task-rpmlint/runtask.yml
145 143​
146By default, a base image defined by the ``imageurl`` option in ``taskotron.yaml`` 144​By default, a base image defined by the ``imageurl`` option in ``taskotron.yaml``
147config file is used. You can provide your own base image by changing the 145​config file is used. You can provide your own base image by changing the
148``imageurl`` value (use ``file://`` URL to point to a local file). 146​``imageurl`` value (use ``file://`` URL to point to a local file).
149 147​
150We also provide updated base images at https://tflink.fedorapeople.org/taskotron/taskotron-cloud/images/ 148​We also provide updated base images at https://tflink.fedorapeople.org/taskotron/taskotron-cloud/images/
151(note that the image needs to be uncompressed before use). 149​(note that the image needs to be uncompressed before use).
152 150​
Show All 20 Lines168 - name: root
173 ssh-authorized-keys: 171​ ssh-authorized-keys:
174 - $SSH PUBKEY HERE$ 172​ - $SSH PUBKEY HERE$
175 """ 173​ """
176 174​
177 175​
178Running the Test Suite 176​Running the Test Suite
179====================== 177​======================
180 178​
181You can run the included test suite of unit and functional tests. 179​You can run the included test suite of unit and functional tests. Have the
182From the root checkout directory, execute:: 180​virtualenv active and from the root checkout directory execute::
183 181​
184 py.test testing/ 182​ py.test
jskladanUnsubmitted
Not Done

What's the difference in pytest (used in resultsdb's readme) and py.test used here. I guess it's the same, so we might keep it consistent?

kparalAuthorUnsubmitted
Not Done

Yeah, my fault. It seems that pytest command is available only in latest pytest package, and the older (and more universal) binary name is py.test. So we either need to bump requirement.txt to pytest >= 3.0 (so that we get pytest), which I was a bit reluctant to do (since neither F24 nor F25 contains pytest >= 3.0), or we need to stay with py.test. If you want it consistent across projects, all we need to do is to change the README in resultsdb to use py.test.

185 183​
186to run unit tests, or:: 184​A nice HTML-based representation is available if you add ``--cov-report=html``
187 185​command line parameter.
188 py.test --functional testing/ ​
189 ​
190to run both unit and functional tests (recommended). Make sure to use the ​
191virtualenv-provided version of py.test, not the system one, otherwise you'll ​
192encounter import errors. ​
193 ​
194You can also see a test coverage of the code, just run:: ​
195 ​
196 py.test --functional --cov-report=term-missing --cov=libtaskotron testing/ ​
197 ​
198A nice HTML-based representation is available if you use ``--cov-report=html`` ​
199parameter instead. ​
200 186​
201If you write new tests, be sure to run this to see whether the code is 187​If you write new tests, be sure to run this to see whether the code is
202sufficiently covered by your tests. 188​sufficiently covered by your tests.
203 189​
204 190​
205Building Documentation 191​Building Documentation
206====================== 192​======================
207 193​
Show All 36 Lines
View Options

dodo.py

Show All 20 Lines
21MOCKENV = 'fedora-24-x86_64' 21​MOCKENV = 'fedora-24-x86_64'
22TARGETDIST = 'fc24' 22​TARGETDIST = 'fc24'
23BUILDARCH = 'noarch' 23​BUILDARCH = 'noarch'
24COPRREPOS = ['https://copr-be.cloud.fedoraproject.org/results/tflink/taskotron/fedora-24-x86_64/'] 24​COPRREPOS = ['https://copr-be.cloud.fedoraproject.org/results/tflink/taskotron/fedora-24-x86_64/']
25# virtualenv name to use for operations which require it 25​# virtualenv name to use for operations which require it
26VENVNAME = 'env_testing' 26​VENVNAME = 'env_testing'
27 27​
28# These are deps needed in a virtualenv which are not on pypi 28​# These are deps needed in a virtualenv which are not on pypi
29VENV_GIT_REPOS = ['https://pagure.io/taskotron/resultsdb_api.git', 29​VENV_GIT_REPOS = []
30 'https://github.com/Rorosha/testcloud.git'] ​
31 30​
32################################################################################ 31​################################################################################
33# UTILITY FUNCTIONS 32​# UTILITY FUNCTIONS
34# Functions used to generate some of the needed metadata 33​# Functions used to generate some of the needed metadata
35################################################################################ 34​################################################################################
36 35​
37def get_version(): 36​def get_version():
38 """ Assume that the version is stored as __version__ in $APPNAME/__init__.py 37​ """ Assume that the version is stored as __version__ in $APPNAME/__init__.py
▲ Show 20 Lines • Show All 45 Lines • ▼ Show 20 Line(s)80def maybe_use_virtualenv(commands):
84 making assumptions about what's installed as packages and you may need 83​ making assumptions about what's installed as packages and you may need
85 to install a few more things in the virtualenv (testcloud, sphinx etc.)""" 84​ to install a few more things in the virtualenv (testcloud, sphinx etc.)"""
86 85​
87 if ENVTYPE != 'ci': 86​ if ENVTYPE != 'ci':
88 return commands 87​ return commands
89 88​
90 real_commands = [] 89​ real_commands = []
91 for command in commands: 90​ for command in commands:
92 real_commands.append('source {}/bin/activate; {}'.format(VENVNAME, command)) 91​ real_commands.append('source {}/bin/activate && {}'.format(VENVNAME, command))
93 92​
94 return real_commands 93​ return real_commands
95 94​
96################################################################################ 95​################################################################################
97# GENERAL VARIABLES 96​# GENERAL VARIABLES
98# These variables are computed based on project definitions and current state 97​# These variables are computed based on project definitions and current state
99# as a convenience for later functions 98​# as a convenience for later functions
100################################################################################ 99​################################################################################
▲ Show 20 Lines • Show All 94 Lines • ▼ Show 20 Line(s)188def task__checksum():
195 return {'actions': [sha_command], 194​ return {'actions': [sha_command],
196 'task_dep': ['snapshot'], 195​ 'task_dep': ['snapshot'],
197 'targets': ['{}.tar.gz.{}'.format(TARGETNAME, SHATYPE)] 196​ 'targets': ['{}.tar.gz.{}'.format(TARGETNAME, SHATYPE)]
198 } 197​ }
199 198​
200 199​
201def task_builddocs(): 200​def task_builddocs():
202 """Generate sphinx html docs""" 201​ """Generate sphinx html docs"""
203 return {'actions': maybe_use_virtualenv(['pushd docs;make html']), 202​ return {'actions': maybe_use_virtualenv(['pushd docs && make html']),
204 'task_dep': ['_checkvirtualenv'], 203​ 'task_dep': ['_checkvirtualenv'],
205 'targets': ['docs/build/html'] 204​ 'targets': ['docs/build/html']
206 } 205​ }
207 206​
208 207​
209def task_cleandocs(): 208​def task_cleandocs():
210 """Clean generated sphinx html docs""" 209​ """Clean generated sphinx html docs"""
211 return {'actions': ['pushd docs;make clean'], 210​ return {'actions': ['pushd docs && make clean'],
212 } 211​ }
213 212​
214 213​
215def task_releasedocs(): 214​def task_releasedocs():
216 """Put generated docs in the release output""" 215​ """Put generated docs in the release output"""
217 return {'actions': ['mkdir -p {}'.format(DOCS_OUTDIR), 216​ return {'actions': ['mkdir -p {}'.format(DOCS_OUTDIR),
218 'cp -r docs/build/html/* {}'.format(DOCS_OUTDIR)], 217​ 'cp -r docs/build/html/* {}'.format(DOCS_OUTDIR)],
219 'task_dep': ['builddocs'], 218​ 'task_dep': ['builddocs'],
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Line(s)246def task_updatelatest():
268 return {'actions': [updatelatest], 267​ return {'actions': [updatelatest],
269 'targets': [], 268​ 'targets': [],
270 'task_dep': ['releasedocs'], 269​ 'task_dep': ['releasedocs'],
271 } 270​ }
272 271​
273 272​
274def task_test(): 273​def task_test():
275 """Run the unit and functional tests""" 274​ """Run the unit and functional tests"""
276 return {'actions': maybe_use_virtualenv(['py.test -F testing/']), 275​ return {'actions': maybe_use_virtualenv(['py.test']),
277 'task_dep': ['_checkvirtualenv'] 276​ 'task_dep': ['_checkvirtualenv']
278 } 277​ }
279 278​
280 279​
281def task__checkvirtualenv(): 280​def task__checkvirtualenv():
282 """Check for properly named virtualenv, if it doesn't exist, create it""" 281​ """Check for properly named virtualenv, if it doesn't exist, create it"""
283 282​
284 def get_venv_commands(): 283​ def get_venv_commands():
285 if ENVTYPE != 'ci': 284​ if ENVTYPE != 'ci':
286 return [] 285​ return []
287 else: 286​ else:
288 activate = '{}/bin/activate'.format(VENVNAME) 287​ activate = '{}/bin/activate'.format(VENVNAME)
289 commands = ['virtualenv --system-site-packages {}'.format(VENVNAME)] 288​ commands = ['virtualenv --system-site-packages {}'.format(VENVNAME)]
290 289​
291 for repo in VENV_GIT_REPOS: 290​ for repo in VENV_GIT_REPOS:
292 commands.append('. {}; pip install git+{}'.format(activate, repo)) 291​ commands.append('. {} && pip install git+{}'.format(activate, repo))
293 292​
294 commands.append('. {}; pip install --force-reinstall -r ' 293​ commands.append('. {} && pip install -r '
295 'requirements.txt'.format(activate)) 294​ 'requirements.txt'.format(activate))
296 295​
297 return commands 296​ return commands
298 297​
299 return {'actions': get_venv_commands(), 298​ return {'actions': get_venv_commands(),
300 'targets': [VENVNAME], 299​ 'targets': [VENVNAME],
301 } 300​ }
302 301​
Show All 9 Lines
View Options

libtaskotron.spec

1Name: libtaskotron 1​Name: libtaskotron
2# NOTE: if you update version, *make sure* to also update `libtaskotron/__init__.py` 2​# NOTE: if you update version, *make sure* to also update `libtaskotron/__init__.py`
3Version: 0.4.18 3​Version: 0.4.18
4Release: 2%{?dist} 4​Release: 3%{?dist}
5Summary: Taskotron Support Library 5​Summary: Taskotron Support Library
6 6​
7License: GPLv3 7​License: GPLv3
8URL: https://pagure.io/taskotron/libtaskotron 8​URL: https://pagure.io/taskotron/libtaskotron
9Source0: https://qa.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz 9​Source0: https://qa.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz
10 10​
11BuildArch: noarch 11​BuildArch: noarch
12 12​
Show All 16 Lines
29Requires: python-progressbar >= 2.3 29​Requires: python-progressbar >= 2.3
30Requires: python-resultsdb_api >= 2.0.0 30​Requires: python-resultsdb_api >= 2.0.0
31Requires: python-requests >= 2.7.0 31​Requires: python-requests >= 2.7.0
32Requires: python-setuptools 32​Requires: python-setuptools
33Requires: python-xunitparser >= 1.3.3 33​Requires: python-xunitparser >= 1.3.3
34Requires: PyYAML >= 3.11 34​Requires: PyYAML >= 3.11
35Requires: sudo 35​Requires: sudo
36Requires: tar >= 1.28-6 36​Requires: tar >= 1.28-6
37BuildRequires: pytest >= 2.7.3 ​
38BuildRequires: python2-devel 37​BuildRequires: python2-devel
39BuildRequires: python-configparser >= 3.5.0b2 38​BuildRequires: python-configparser >= 3.5.0b2
40BuildRequires: python-dingus >= 0.3.4 39​BuildRequires: python-dingus >= 0.3.4
41BuildRequires: python-mock >= 2.0.0 40​BuildRequires: python-mock >= 2.0.0
42BuildRequires: python-progressbar >= 2.3 41​BuildRequires: python-progressbar >= 2.3
42​BuildRequires: python2-pytest >= 2.7.3
43​BuildRequires: python-pytest-cov >= 2.2.1
43BuildRequires: python-resultsdb_api >= 2.0.0 44​BuildRequires: python-resultsdb_api >= 2.0.0
44BuildRequires: python-requests >= 2.7.0 45​BuildRequires: python-requests >= 2.7.0
45BuildRequires: python-setuptools 46​BuildRequires: python-setuptools
46BuildRequires: python-xunitparser >= 1.3.3 47​BuildRequires: python-xunitparser >= 1.3.3
47BuildRequires: PyYAML >= 3.11 48​BuildRequires: PyYAML >= 3.11
48 49​
49%description -n libtaskotron-core 50​%description -n libtaskotron-core
50The minimal, core parts of libtaskotron that are needed to run tasks 51​The minimal, core parts of libtaskotron that are needed to run tasks
Show All 16 Lines
67Requires: python-fedora >= 0.8.0 68​Requires: python-fedora >= 0.8.0
68Requires: python-hawkey >= 0.4.13-1 69​Requires: python-hawkey >= 0.4.13-1
69Requires: python-munch >= 2.0.2 70​Requires: python-munch >= 2.0.2
70Requires: rpm-python 71​Requires: rpm-python
71BuildRequires: koji 72​BuildRequires: koji
72BuildRequires: mash 73​BuildRequires: mash
73BuildRequires: python-fedora >= 0.8.0 74​BuildRequires: python-fedora >= 0.8.0
74BuildRequires: python-hawkey >= 0.4.13-1 75​BuildRequires: python-hawkey >= 0.4.13-1
76​BuildRequires: python-rpmfluff >= 0.5.1
75BuildRequires: python-munch >= 2.0.2 77​BuildRequires: python-munch >= 2.0.2
76 78​
77%description -n libtaskotron-fedora 79​%description -n libtaskotron-fedora
78Module for libtaskotron which contains all functionality which is fedora-only 80​Module for libtaskotron which contains all functionality which is fedora-only
79 81​
80%package -n libtaskotron-disposable 82​%package -n libtaskotron-disposable
81Summary: disposable client module for libtaskotron 83​Summary: disposable client module for libtaskotron
82 84​
▲ Show 20 Lines • Show All 80 Lines • ▼ Show 20 Line(s)
163%dir %{python2_sitelib}/libtaskotron/ext/fedora 165​%dir %{python2_sitelib}/libtaskotron/ext/fedora
164%{python2_sitelib}/libtaskotron/ext/fedora/* 166​%{python2_sitelib}/libtaskotron/ext/fedora/*
165 167​
166%files -n libtaskotron-disposable 168​%files -n libtaskotron-disposable
167%dir %{python2_sitelib}/libtaskotron/ext/disposable 169​%dir %{python2_sitelib}/libtaskotron/ext/disposable
168%{python2_sitelib}/libtaskotron/ext/disposable/* 170​%{python2_sitelib}/libtaskotron/ext/disposable/*
169 171​
170%changelog 172​%changelog
173​* Fri Feb 10 2017 Kamil Páral <kparal@redhat.com> - 0.4.18-3
174​- add python-pytest-cov builddep because the test suite now needs it,
175​ and python-rpmfluff because we're missing it
176​
171* Thu Feb 09 2017 Kamil Páral <kparal@redhat.com> - 0.4.18-2 177​* Thu Feb 09 2017 Kamil Páral <kparal@redhat.com> - 0.4.18-2
172- require python-resultsdb_api >= 2.0.0 178​- require python-resultsdb_api >= 2.0.0
173 179​
174* Wed Jan 11 2017 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.18-1 180​* Wed Jan 11 2017 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.18-1
175- distgit directive improvements (D1055, D1069) 181​- distgit directive improvements (D1055, D1069)
176- yumrepoinfo.conf updates (D1057, D1074) 182​- yumrepoinfo.conf updates (D1057, D1074)
177- koji_utils: use supported arches when downloading build logs (D1076) 183​- koji_utils: use supported arches when downloading build logs (D1076)
178 184​
▲ Show 20 Lines • Show All 240 Lines • Show Last 20 Lines
View Options

requirements.txt

1# This is a list of pypi packages to be installed into virtualenv. Alternatively, 1​# This is a list of pypi packages to be installed into virtualenv. Alternatively,
2# you can install these as RPMs instead of pypi packages. Use 2​# you can install these as RPMs instead of pypi packages. See the dependecies
3# `rpmspec -q --requires libtaskotron.spec` and 3​# with:
4# `rpmspec -q --buildrequires libtaskotron.spec` to get a list of RPM dependencies. 4​# $ rpmspec -q --requires libtaskotron.spec
5​# $ rpmspec -q --buildrequires libtaskotron.spec
5# 6​#
6# A note for maintainers: Please keep this list in sync with libtaskotron.spec. 7​# A note for maintainers: Please keep this list in sync with libtaskotron.spec.
7# You should require exact versions here (in order to define an exact working 8​# This list is in the same order as the requirements in the specfile.
8# environment), and require a minimal version in the spec file (in order to allow ​
9# the libraries to have some minor version bumps during the Fedora release ​
10# lifecycle). If the Fedora libraries span multiple versions across releases, ​
11# you can define a dependency range here instead of an exact version. ​
12 9​
13configparser == 3.5.0b2 10​# libtaskotron-core
14dingus == 0.3.4 11​configparser >= 3.5.0b2
15Jinja2 == 2.8 12​Jinja2 >= 2.8
16munch == 2.0.2 13​progressbar >= 2.3
jskladanUnsubmitted
Not Done

This extra newline, and the one on line 41 are killing me :)

kparalAuthorUnsubmitted
Not Done

Macro devops: newlines baby

17mock == 2.0.0 14​resultsdb_api >= 2.0.0
18paramiko == 1.15.1 15​requests >= 2.7.0
19pytest == 2.7.3 16​xunitparser >= 1.3.3
20pytest-cov == 2.2.1 17​PyYAML >= 3.11
21python-fedora == 0.8.0 18​
22progressbar == 2.3 19​# libtaskotron-fedora
23requests == 2.7.0 20​python-fedora >= 0.8.0
24PyYAML == 3.11 21​munch >= 2.0.2
25resultsdb_api == 2.0.0 22​
26Sphinx == 1.2.3 23​# libtaskotron-disposable
27xunitparser == 1.3.3 24​paramiko >= 1.15.1
25​testcloud >= 0.1.10
26​
27​# Test suite requirements
28​dingus >= 0.3.4
29​mock >= 2.0.0
30​pytest >= 2.7.3
31​pytest-cov >= 2.2.1
32​
33​# Documentation requirements
34​Sphinx >= 1.2.3
View Options

setup.py

Show All 20 Lines
21class PyTest(Command): 21​class PyTest(Command):
22 user_options = [] 22​ user_options = []
23 def initialize_options(self): 23​ def initialize_options(self):
24 pass 24​ pass
25 def finalize_options(self): 25​ def finalize_options(self):
26 pass 26​ pass
27 def run(self): 27​ def run(self):
28 import subprocess 28​ import subprocess
29 errno = subprocess.call(['py.test', 'testing']) 29​ errno = subprocess.call(['py.test'])
30 raise SystemExit(errno) 30​ raise SystemExit(errno)
31 31​
32 32​
33setup(name='libtaskotron', 33​setup(name='libtaskotron',
34 version=find_version('libtaskotron', '__init__.py'), 34​ version=find_version('libtaskotron', '__init__.py'),
35 description='base lib for taskotron jobs', 35​ description='base lib for taskotron jobs',
36 author='Tim Flink', 36​ author='Tim Flink',
37 author_email='tflink@fedoraproject.org', 37​ author_email='tflink@fedoraproject.org',
38 license='GPLv2+', 38​ license='GPLv2+',
39 url='https://pagure.io/taskotron/libtaskotron', 39​ url='https://pagure.io/taskotron/libtaskotron',
40 packages=['libtaskotron', 'libtaskotron.directives', 'libtaskotron.ext', 40​ packages=['libtaskotron', 'libtaskotron.directives', 'libtaskotron.ext',
41 'libtaskotron.ext.fedora', 'libtaskotron.ext.disposable'], 41​ 'libtaskotron.ext.fedora', 'libtaskotron.ext.disposable'],
42 package_data={'libtaskotron': ['report_templates/*.j2']}, 42​ package_data={'libtaskotron': ['report_templates/*.j2']},
43 package_dir={'libtaskotron':'libtaskotron'}, 43​ package_dir={'libtaskotron':'libtaskotron'},
44 include_package_data=True, 44​ include_package_data=True,
45 cmdclass={'test': PyTest}, 45​ cmdclass={'test': PyTest},
46 entry_points=dict(console_scripts=['runtask=libtaskotron.main:main', 46​ entry_points=dict(console_scripts=['runtask=libtaskotron.main:main',
47 'taskotron_result=libtaskotron.taskotron_result:main']), 47​ 'taskotron_result=libtaskotron.taskotron_result:main']),
48 install_requires = [ 48​ install_requires = [
49 'PyYAML', ​
50 ] 49​ ]
51) 50​)
View Options

testing/pytest.ini

  • This file was deleted.
This file was completely deleted. Show File Contents
View Options

tox.ini

1# This is a common file where different test suites/linters can be configured. 1​# This is a common file where different test suites/linters can be configured.
2# Phabricator uses this file when running `arc unit` or `arc lint`. 2​# Phabricator uses this file when running `arc unit` or `arc lint`.
3 3​
4[flake8] 4​[flake8]
5max-line-length=99 5​max-line-length=99
6 6​
7[pep8] 7​[pep8]
8max-line-length=99 8​max-line-length=99
9 9​
10[pytest] 10​[pytest]
11minversion=2.0 11​minversion=2.0
12python_functions=test should 12​python_functions=test should
13python_files=test_* functest_* 13​python_files=test_* functest_*
14addopts=--functional testing/ 14​addopts=--functional testing/ --cov-report=term-missing --cov libtaskotron