diff mbox series

[ovs-dev] python: Fixup python shebangs to python3

Message ID 1598041807-28340-1-git-send-email-gvrose8192@gmail.com
State Accepted
Delegated to: Ilya Maximets
Headers show
Series [ovs-dev] python: Fixup python shebangs to python3 | expand

Commit Message

Gregory Rose Aug. 21, 2020, 8:30 p.m. UTC 
Builds on RHEL 8.2 systems are failing due to this issue.

See [1] as to why this is necessary.

I used the following command to identify files that need this fix:
find . -type f -executable | /usr/lib/rpm/redhat/brp-mangle-shebangs

I also updated the copyright notices as needed.

1. https://fedoraproject.org/wiki/Changes/Make_ambiguous_python_shebangs_error

Signed-off-by: Greg Rose <gvrose8192@gmail.com>
---
V2 - restrict changes to python files and do not replace @PYTHON3@
     for .in files.
---
 ofproto/ipfix-gen-entities                            |  4 ++--
 ovsdb/dot2pic                                         |  4 ++--
 ovsdb/ovsdb-doc                                       |  4 ++--
 python/build/soutil.py                                |  4 ++--
 tests/ovsdb-monitor-sort.py                           | 15 ++++++++++++++-
 tests/sendpkt.py                                      |  4 ++--
 tests/test-l7.py                                      |  4 ++--
 tests/uuidfilt.py                                     | 18 +++++++++++++++++-
 utilities/ovs-dev.py                                  |  4 ++--
 utilities/ovs-pipegen.py                              |  4 ++--
 xenserver/etc_xapi.d_plugins_openvswitch-cfg-update   |  4 ++--
 xenserver/opt_xensource_libexec_interface-reconfigure |  2 +-
 xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync |  4 ++--
 13 files changed, 52 insertions(+), 23 deletions(-)

Comments

Aaron Conole Aug. 25, 2020, 2:53 p.m. UTC | #1 
Greg Rose <gvrose8192@gmail.com> writes:

> Builds on RHEL 8.2 systems are failing due to this issue.
>
> See [1] as to why this is necessary.
>
> I used the following command to identify files that need this fix:
> find . -type f -executable | /usr/lib/rpm/redhat/brp-mangle-shebangs
>
> I also updated the copyright notices as needed.
>
> 1. https://fedoraproject.org/wiki/Changes/Make_ambiguous_python_shebangs_error
>
> Signed-off-by: Greg Rose <gvrose8192@gmail.com>
> ---
> V2 - restrict changes to python files and do not replace @PYTHON3@
>      for .in files.
> ---

Acked-by: Aaron Conole <aconole@redhat.com>

I think a few of these are not part of the flake8 checks, and they
currently fail on my system if I manually run flake8 against them:

  ovsdb/dot2pic
  ovsdb/ovsdb-doc
  xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
  xenserver/opt_xensource_libexec_interface-reconfigure

It's probably a good beginner project to go back through and address at
least the ovsdb ones.  Just commenting so that we don't forget about it.
Ilya Maximets Aug. 26, 2020, 7:50 p.m. UTC | #2 
On 8/25/20 4:53 PM, Aaron Conole wrote:
> Greg Rose <gvrose8192@gmail.com> writes:
> 
>> Builds on RHEL 8.2 systems are failing due to this issue.
>>
>> See [1] as to why this is necessary.
>>
>> I used the following command to identify files that need this fix:
>> find . -type f -executable | /usr/lib/rpm/redhat/brp-mangle-shebangs
>>
>> I also updated the copyright notices as needed.
>>
>> 1. https://fedoraproject.org/wiki/Changes/Make_ambiguous_python_shebangs_error
>>
>> Signed-off-by: Greg Rose <gvrose8192@gmail.com>
>> ---
>> V2 - restrict changes to python files and do not replace @PYTHON3@
>>      for .in files.
>> ---
> 
> Acked-by: Aaron Conole <aconole@redhat.com>

Thanks!  Applied to master and backported down to 2.13.

> 
> I think a few of these are not part of the flake8 checks, and they
> currently fail on my system if I manually run flake8 against them:
> 
>   ovsdb/dot2pic
>   ovsdb/ovsdb-doc
>   xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
>   xenserver/opt_xensource_libexec_interface-reconfigure
> 
> It's probably a good beginner project to go back through and address at
> least the ovsdb ones.  Just commenting so that we don't forget about it.

That is a good point.  Thanks.

Best regards, Ilya Maximets.
diff mbox series

Patch

diff --git a/ofproto/ipfix-gen-entities b/ofproto/ipfix-gen-entities
index 0be7199..d5abe9c 100755
--- a/ofproto/ipfix-gen-entities
+++ b/ofproto/ipfix-gen-entities
@@ -1,6 +1,6 @@ 
-#! /usr/bin/env python
+#!/usr/bin/env python3
 #
-# Copyright (C) 2012 Nicira, Inc.
+# Copyright (C) 2012, 2020 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/ovsdb/dot2pic b/ovsdb/dot2pic
index de67261..2f858e1 100755
--- a/ovsdb/dot2pic
+++ b/ovsdb/dot2pic
@@ -1,6 +1,6 @@ 
-#! /usr/bin/env python
+#!/usr/bin/env python3
 
-# Copyright (c) 2009, 2010, 2011, 2013, 2017 Nicira, Inc.
+# Copyright (c) 2009, 2010, 2011, 2013, 2017, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc
index 406c293..10d0c0c 100755
--- a/ovsdb/ovsdb-doc
+++ b/ovsdb/ovsdb-doc
@@ -1,6 +1,6 @@ 
-#! /usr/bin/python
+#!/usr/bin/python3
 
-# Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+# Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/python/build/soutil.py b/python/build/soutil.py
index b8027af..a658823 100755
--- a/python/build/soutil.py
+++ b/python/build/soutil.py
@@ -1,6 +1,6 @@ 
-#! /usr/bin/env python
+#!/usr/bin/env python3
 
-# Copyright (c) 2008, 2017 Nicira, Inc.
+# Copyright (c) 2008, 2017, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/ovsdb-monitor-sort.py b/tests/ovsdb-monitor-sort.py
index 7d368a7..8a7976b 100755
--- a/tests/ovsdb-monitor-sort.py
+++ b/tests/ovsdb-monitor-sort.py
@@ -1,4 +1,17 @@ 
-#! /usr/bin/env python
+#!/usr/bin/env python3
+# Copyright (c) 2020 VMware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 # Breaks lines read from stdin into groups using blank lines as
 # group separators, then sorts lines within the groups for
diff --git a/tests/sendpkt.py b/tests/sendpkt.py
index 328ae2b..49ac452 100755
--- a/tests/sendpkt.py
+++ b/tests/sendpkt.py
@@ -1,6 +1,6 @@ 
-#! /usr/bin/env python
+#!/usr/bin/env python3
 
-# Copyright (c) 2018 VMware, Inc.
+# Copyright (c) 2018, 2020 VMware, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/test-l7.py b/tests/test-l7.py
index d7854a1..32a7739 100755
--- a/tests/test-l7.py
+++ b/tests/test-l7.py
@@ -1,5 +1,5 @@ 
-#!/usr/bin/env python
-# Copyright (c) 2015, 2016 Nicira, Inc.
+#!/usr/bin/env python3
+# Copyright (c) 2015, 2016, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/uuidfilt.py b/tests/uuidfilt.py
index bc49aa4..39679dd 100755
--- a/tests/uuidfilt.py
+++ b/tests/uuidfilt.py
@@ -1,4 +1,20 @@ 
-#!/usr/bin/env python
+#!/usr/bin/env python3
+# Copyright (c) 2020 VMware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Breaks lines read from stdin into groups using blank lines as
+# group separators, then sorts lines within the groups for
+# reproducibility.
 
 import re
 import sys
diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py
index 248d22a..c45788a 100755
--- a/utilities/ovs-dev.py
+++ b/utilities/ovs-dev.py
@@ -1,5 +1,5 @@ 
-#!/usr/bin/env python
-# Copyright (c) 2013, 2014, 2015, 2016 Nicira, Inc.
+#!/usr/bin/env python3
+# Copyright (c) 2013, 2014, 2015, 2016, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-pipegen.py b/utilities/ovs-pipegen.py
index ee57972..a3b6a66 100755
--- a/utilities/ovs-pipegen.py
+++ b/utilities/ovs-pipegen.py
@@ -1,5 +1,5 @@ 
-#! /usr/bin/env python
-# Copyright (c) 2013, 2014, 2015 Nicira, Inc.
+#! /usr/bin/env python3
+# Copyright (c) 2013, 2014, 2015, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
index e7404e3..b8db881 100755
--- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
+++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
@@ -1,10 +1,10 @@ 
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # xapi plugin script to update the cache of configuration items in the
 # ovs-vswitchd configuration that are managed in the xapi database when
 # integrated with Citrix management tools.
 
-# Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure
index a82043f..9c20725 100755
--- a/xenserver/opt_xensource_libexec_interface-reconfigure
+++ b/xenserver/opt_xensource_libexec_interface-reconfigure
@@ -1,4 +1,4 @@ 
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2008,2009 Citrix Systems, Inc.
 #
diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
index cf89600..bff8546 100755
--- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
+++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
@@ -1,5 +1,5 @@ 
-#! /usr/bin/env python
-# Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+#!/usr/bin/env python3
+# Copyright (c) 2009, 2010, 2011, 2012, 2013, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.