Skip to content
This repository was archived by the owner on Apr 30, 2020. It is now read-only.

Commit b07d276

Browse files
committed
Fedora 28 is dead, long live Fedora 30
1 parent abf442c commit b07d276

File tree

7 files changed

+4
-123
lines changed

7 files changed

+4
-123
lines changed

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@ services:
44
- docker
55

66
env:
7-
- FEDORA=28 TOXENV=integration
8-
- FEDORA=28 TOXENV=py3
97
- FEDORA=29 TOXENV=integration
108
- FEDORA=29 TOXENV=py3
11-
- FEDORA=29 TOXENV=style
129
- FEDORA=30 TOXENV=integration
1310
- FEDORA=30 TOXENV=py3
11+
- FEDORA=30 TOXENV=style
1412
- FEDORA=rawhide TOXENV=integration
1513
- FEDORA=rawhide TOXENV=py3
1614

1715
install:
18-
- sed -i "s/fedora-28-x86_64/fedora-${FEDORA}-x86_64/" mock.cfg
16+
- sed -i "s/fedora-30-x86_64/fedora-${FEDORA}-x86_64/" mock.cfg
1917
- sed -i "s/\$releasever/${FEDORA}/" mock.cfg # needed on rawhide
2018
- sed -i "s|FROM fedora|FROM registry.fedoraproject.org/fedora:${FEDORA}|" Dockerfile
2119
- docker build -t taskotron .

README.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ Currently the following checks are available:
1515

1616
- Whether only Python 2 version of the package contains the executables;
1717

18-
- Whether the package uses versioned shebangs in its executables;
19-
2018
- Whether the package supports Python 3 upstream but not in the package;
2119

2220
- Whether the package requires ``/usr/bin/python`` (or ``python-unversioned-command``).

mock.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include('/etc/mock/fedora-28-x86_64.cfg')
1+
include('/etc/mock/fedora-30-x86_64.cfg')
22

33
config_opts['chroot_setup_cmd'] = 'install ansible dnf'
44
config_opts['use_host_resolv'] = True

python_versions_check.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
task_unversioned_shebangs,
2525
task_py3_support,
2626
task_python_usage,
27-
task_python_usage_obsoleted,
2827
)
2928
from taskotron_python_versions.common import log, Package, PackageException
3029

@@ -82,8 +81,6 @@ def run(koji_build, workdir='.', artifactsdir='artifacts',
8281
srpm_packages + packages, koji_build, artifact))
8382
details.append(task_python_usage(
8483
srpm_packages + packages, koji_build, artifact))
85-
details.append(task_python_usage_obsoleted(
86-
logs, koji_build, artifact)) # TODO: remove with Fedora 28 EOL.
8784

8885
for detail in details:
8986
# update testcase for all subtasks (use their existing testcase as a

taskotron_python_versions/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
from .unversioned_shebangs import task_unversioned_shebangs
66
from .py3_support import task_py3_support
77
from .python_usage import task_python_usage
8-
from .python_usage_obsoleted import task_python_usage_obsoleted
98

109

1110
__all__ = (
@@ -16,5 +15,4 @@
1615
'task_unversioned_shebangs',
1716
'task_py3_support',
1817
'task_python_usage',
19-
'task_python_usage_obsoleted',
2018
)

taskotron_python_versions/python_usage_obsoleted.py

Lines changed: 0 additions & 65 deletions
This file was deleted.

test/integration/test_integration.py

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,6 @@ def results(request):
191191
_pycallgraph = fixtures_factory('python-pycallgraph-0.5.1-13.fc28')
192192
pycallgraph = fixtures_factory('_pycallgraph')
193193

194-
# TODO: remove with Fedora 28 EOL.
195-
_jsonrpc = fixtures_factory('jsonrpc-glib-3.27.4-2.fc28')
196-
jsonrpc = fixtures_factory('_jsonrpc')
197-
198194
_teeworlds = fixtures_factory('teeworlds-0.6.4-8.fc29')
199195
teeworlds = fixtures_factory('_teeworlds')
200196

@@ -211,7 +207,7 @@ def test_number_of_results(results, request):
211207
results = request.getfixturevalue(results)
212208

213209
# Each time a new check is added, this number needs to be increased
214-
assert len(results) == 9
210+
assert len(results) == 8
215211

216212

217213
@parametrize('eric', 'six', 'admesh', 'copr', 'epub', 'twine', 'pycallgraph')
@@ -487,47 +483,6 @@ def test_artifact_contains_py3_support_and_looks_as_expected(
487483
""").strip() in artifact.strip()
488484

489485

490-
# TODO: remove with Fedora 28 EOL.
491-
@parametrize('eric', 'six', 'admesh', 'tracer',
492-
'copr', 'epub', 'twine', 'docutils')
493-
def test_python_usage_obsoleted_passed(results, request):
494-
results = request.getfixturevalue(results)
495-
task_result = results['dist.python-versions.python_usage_obsoleted']
496-
assert task_result.outcome == 'PASSED'
497-
498-
499-
# TODO: remove with Fedora 28 EOL.
500-
@parametrize('jsonrpc')
501-
def test_python_usage_obsoleted_failed(results, request):
502-
results = request.getfixturevalue(results)
503-
task_result = results['dist.python-versions.python_usage_obsoleted']
504-
assert task_result.outcome == 'FAILED'
505-
506-
507-
# TODO: remove with Fedora 28 EOL.
508-
@parametrize('jsonrpc')
509-
def test_artifact_of_python_usage_obsoleted_looks_as_expected(results,
510-
request):
511-
results = request.getfixturevalue(results)
512-
result = results['dist.python-versions.python_usage_obsoleted']
513-
artifact = result.artifact.read_text()
514-
515-
print(artifact)
516-
517-
assert dedent("""
518-
You've used /usr/bin/python during build on the following arches:
519-
520-
jsonrpc-glib-3.27.4-2.fc28: x86_64
521-
522-
Use /usr/bin/python3 or /usr/bin/python2 explicitly.
523-
/usr/bin/python will be removed or switched to Python 3 in the future.
524-
525-
Grep the build.log for the following to find out where:
526-
527-
DEPRECATION WARNING: python2 invoked with /usr/bin/python
528-
""").strip() in artifact.strip()
529-
530-
531486
@parametrize('eric', 'six', 'admesh',
532487
'copr', 'epub', 'twine', 'docutils')
533488
def test_python_usage_passed(results, request):

0 commit comments

Comments
 (0)