Skip to content

Commit

Permalink
Be explicit about using Python 2.x
Browse files Browse the repository at this point in the history
We'd like to migrate to Python 3.x for our tests and scripts. But
that's a lot of work.

But distributions would like us to be explicit about the version
of python that our tests and scripts use. See:

https://taskotron.fedoraproject.org/artifacts/all/ec52504e-9e9f-11e7-86b2-525400817a8f/task_output/output.log

and

https://fedoraproject.org/wiki/Packaging:Python#Dependencies

Closes #7725
  • Loading branch information
stefwalter authored and martinpitt committed Sep 26, 2017
1 parent a2489c0 commit fbd8265
Show file tree
Hide file tree
Showing 128 changed files with 130 additions and 130 deletions.
2 changes: 1 addition & 1 deletion bots/example-task
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/github-info
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/image-create
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# This file is part of Cockpit.
#
# Copyright (C) 2015 Red Hat, Inc.
Expand Down
2 changes: 1 addition & 1 deletion bots/image-customize
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# This file is part of Cockpit.
#
# Copyright (C) 2015 Red Hat, Inc.
Expand Down
2 changes: 1 addition & 1 deletion bots/image-download
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/image-naughty
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/image-prepare
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# This file is part of Cockpit.
#
# Copyright (C) 2015 Red Hat, Inc.
Expand Down
2 changes: 1 addition & 1 deletion bots/image-prune
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/image-refresh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/image-trigger
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/image-upload
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2

# The default settings here should match one of the default
# download stores. These are usually cockpit/images instances
Expand Down
2 changes: 1 addition & 1 deletion bots/images/scripts/lib/atomic.install
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/issue-scan
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/koji-build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/naughty-prune
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/naughty-trigger
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/npm-repo-test-invoke
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# This file is part of Cockpit.
#
# Copyright (C) 2017 Red Hat, Inc.
Expand Down
2 changes: 1 addition & 1 deletion bots/npm-trigger
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/npm-update
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/po-refresh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/po-trigger
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/task/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/task/cache.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/task/github.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/task/sink.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/task/test-cache
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/task/test-checklist
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/task/test-github
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/task/test-task
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/tests-data
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/tests-invoke
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/tests-scan
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion bots/tests-trigger
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2

import argparse
import sys
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker/cockpit-atomic-storage
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/python2

# This utility fills in the gaps between the Atomic image storage API
# and the Cockpit UI. Specifically, it replicates some bits of
Expand Down
2 changes: 1 addition & 1 deletion test/avocado/checkexample-foo.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/avocado/checklogin-basic.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/avocado/checklogin-raw.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/avocado/checkrealms-basic.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/avocado/run-tests
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/avocado/scheduler.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2

from nrun import *

Expand Down
2 changes: 1 addition & 1 deletion test/avocado/selenium-base.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2

# we need to be able to find and import seleniumlib, so add this directory
import os
Expand Down
2 changes: 1 addition & 1 deletion test/avocado/selenium-docker.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2

# we need to be able to find and import seleniumlib, so add this directory
import os
Expand Down
2 changes: 1 addition & 1 deletion test/avocado/selenium-navigate.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2

# we need to be able to find and import seleniumlib, so add this directory
import os
Expand Down
2 changes: 1 addition & 1 deletion test/avocado/selenium-sosreport.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2

# we need to be able to find and import seleniumlib, so add this directory
import os
Expand Down
2 changes: 1 addition & 1 deletion test/avocado/selenium-storage.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2

# we need to be able to find and import seleniumlib, so add this directory
import os
Expand Down
2 changes: 1 addition & 1 deletion test/avocado/seleniumlib.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
""" SETUP tasks
# workaround for RHEL7
Expand Down
2 changes: 1 addition & 1 deletion test/avocado/timeoutlib.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/containers/check-kubernetes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/containers/check-kubernetes-openshift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/containers/run-tests
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# This file is part of Cockpit.
#
# Copyright (C) 2016 Red Hat, Inc.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-accounts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-active-pages
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-connection
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-dashboard
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-docker-storage
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-embed
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-example
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-journal
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-kdump
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-keys
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-kubernetes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-login
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-loopback
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-machines
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
2 changes: 1 addition & 1 deletion test/verify/check-menu
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python2
# -*- coding: utf-8 -*-

# This file is part of Cockpit.
Expand Down
Loading

0 comments on commit fbd8265

Please sign in to comment.