Merge pull request #1652 from hahahannes/patch-1505-check_python_3_co…

…mpatibility Testing: Check python3 compatibility; Fix #1505
rucio · Oct 16, 2018 · 6d17a9d · 6d17a9d
2 parents ce069f1 + 80c168c
commit 6d17a9d
Show file tree

Hide file tree

Showing 133 changed files with 308 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,7 @@
 # - Thomas Beermann <thomas.beermann@cern.ch>, 2017-2018
 # - Vincent Garonne <vgaronne@gmail.com>, 2017-2018
 # - Mario Lassnig <mario.lassnig@cern.ch>, 2018
+# - Hannes Hansen <hannes.jakob.hansen@cern.ch>, 2018
 
 sudo: required
 
@@ -45,6 +46,7 @@ before_script:
 
 script:
   - if [[ $SUITE == "syntax" ]]; then ./tools/travis/check_syntax.sh  ; fi
+  - if [[ $SUITE == "python3" ]]; then ./tools/travis/check_python_3.sh  ; fi
   - if [[ $SUITE == "client"  && "$TRAVIS_PYTHON_VERSION" !=  "3.6"  ]]; then nosetests -v lib/rucio/tests/test_clients.py; fi
   - if [[ $SUITE == "client"  && "$TRAVIS_PYTHON_VERSION" ==  "3.6"  ]]; then nosetests -v lib/rucio/tests/test_clients.py; nosetests -v lib/rucio/tests/test_bin_rucio.py ; fi
   - if [[ $SUITE == "all" ]]; then docker exec -it rucio /bin/sh -c "/opt/rucio/tools/run_tests_docker.sh -1q" ; fi
@@ -56,10 +58,13 @@ env:
     - SUITE=all RDBMS=sqlite
     - SUITE=client RDBMS=sqlite RUCIO_HOME=`pwd`
     - SUITE=syntax
+    - SUITE=python3
 
 matrix:
   fast_finish: true
   exclude:
+  - python: 2.6
+    env: SUITE=python3
   - python: 2.6
     env: SUITE=all RDBMS=oracle
   - python: 2.6
@@ -70,6 +75,8 @@ matrix:
     env: SUITE=all RDBMS=sqlite
   - python: 2.6
     env: SUITE=syntax
+  - python: 2.7
+    env: SUITE=python3
   - python: 3.4
     env:  SUITE=all RDBMS=oracle
   - python: 3.4
@@ -90,8 +97,6 @@ matrix:
     env:  SUITE=all RDBMS=postgres
   - python: 3.5
     env:  SUITE=all RDBMS=sqlite
-  - python: 3.6
-    env: SUITE=all
   - python: 3.5
     env:  SUITE=all RDBMS=oracle
   - python: 3.5
@@ -100,6 +105,10 @@ matrix:
     env:  SUITE=all RDBMS=postgres
   - python: 3.5
     env:  SUITE=all RDBMS=sqlite
+  - python: 3.6
+    env: SUITE=python3
+  - python: 3.6
+    env: SUITE=all
   - python: 3.6
     env:  SUITE=all RDBMS=oracle
   - python: 3.6

diff --git a/bin/rucio b/bin/rucio
@@ -32,6 +32,8 @@
 # - Frank Berghaus, <frank.berghaus@cern.ch>, 2018
 # - Hannes Hansen <hannes.jakob.hansen@cern.ch>, 2018
 # - Dimitrios Christidis <dimitrios.christidis@cern.ch>, 2018
+#
+# PY3K COMPATIBLE
 
 from __future__ import print_function
 

diff --git a/bin/rucio-abacus-account b/bin/rucio-abacus-account
@@ -16,6 +16,8 @@
 # Authors:
 # - Martin Barisits, <martin.barisits@cern.ch>, 2014
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 Abacus account is a daemon to update account counters.

diff --git a/bin/rucio-abacus-rse b/bin/rucio-abacus-rse
@@ -16,6 +16,8 @@
 # Authors:
 # - Martin Barisits, <martin.barisits@cern.ch>, 2014
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 Abacus rse is a daemon to update rse counters.

diff --git a/bin/rucio-admin b/bin/rucio-admin
@@ -27,6 +27,8 @@
 # - Brian Bockelman, <bbockelm@cse.unl.edu>, 2017-2018
 # - Nicolo Magini, <Nicolo.Magini@cern.ch>, 2018
 # - Hannes Hansen, <hannes.jakob.hansen@cern.ch>, 2018
+#
+# PY3K COMPATIBLE
 
 from __future__ import print_function
 

diff --git a/bin/rucio-atropos b/bin/rucio-atropos
@@ -16,6 +16,7 @@
 # Authors:
 # - Cedric Serfon, <cedric.serfon@cern.ch>, 2016
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+# PY3K COMPATIBLE
 
 '''
 Atropos Daemon : End the life of the rules according to the Lifetime Model

diff --git a/bin/rucio-auditor b/bin/rucio-auditor
@@ -16,6 +16,8 @@
 # Authors:
 # - Fernando Lopez, <fernando.e.lopez@gmail.com>, 2015
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 from datetime import datetime
 from functools import partial

diff --git a/bin/rucio-bb8 b/bin/rucio-bb8
@@ -16,6 +16,8 @@
 # Authors:
 # - Martin Barisits, <martin.barisits@cern.ch>, 2016
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 BB8 is a daemon to rebalance data.

diff --git a/bin/rucio-c3po b/bin/rucio-c3po
@@ -16,6 +16,8 @@
 # Authors:
 # - Thomas Beermann, <thomas.beermann@cern.ch>, 2015-2017
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 C-3PO is a dynamic data placement daemon.

diff --git a/bin/rucio-cache-consumer b/bin/rucio-cache-consumer
@@ -16,6 +16,8 @@
 # Authors:
 # - Wen Guan, <wguan.icedew@gmail.com>, 2014
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 Rucio Cache Consumer is a daemon to add/delete cache replicas to Rucio catalog.

diff --git a/bin/rucio-conveyor-finisher b/bin/rucio-conveyor-finisher
@@ -17,6 +17,8 @@
 # - Wen Guan, <wguan.icedew@gmail.com>, 2015
 # - Cedric Serfon, <cedric.serfon@cern.ch>, 2017
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 Conveyor is a daemon to manage file transfers.

diff --git a/bin/rucio-conveyor-poller b/bin/rucio-conveyor-poller
@@ -18,7 +18,8 @@
 # - Wen Guan, <wguan.icedew@gmail.com>, 2014-2015
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
 # - Cedric Serfon <cedric.serfon@cern.ch>, 2018
-
+#
+# PY3K COMPATIBLE
 
 """
 Conveyor is a daemon to manage file transfers.

diff --git a/bin/rucio-conveyor-poller-latest b/bin/rucio-conveyor-poller-latest
@@ -17,6 +17,8 @@
 # - Wen Guan, <wguan.icedew@gmail.com>, 2015
 # - Martin Barisits, <martin.barisits@cern.ch>, 2016
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 Conveyor is a daemon to manage file transfers.

diff --git a/bin/rucio-conveyor-receiver b/bin/rucio-conveyor-receiver
@@ -16,6 +16,8 @@
 # Authors:
 # - Wen Guan, <wguan.icedew@gmail.com>, 2015-2016
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 Conveyor is a daemon to manage file transfers.

diff --git a/bin/rucio-conveyor-stager b/bin/rucio-conveyor-stager
@@ -17,6 +17,8 @@
 # - Wen Guan, <wguan.icedew@gmail.com>, 2015
 # - Vincent Garonne, <vgaronne@gmail.com>, 2015-2018
 # - Cedric Serfon, <cedric.serfon@cern.ch>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 Conveyor is a daemon to manage file transfers.

diff --git a/bin/rucio-conveyor-submitter b/bin/rucio-conveyor-submitter
@@ -18,6 +18,8 @@
 # - Cedric Serfon, <cedric.serfon@cern.ch>, 2013-2018
 # - Wen Guan, <wguan.icedew@gmail.com>, 2014-2016
 # - Vincent Garonne, <vgaronne@gmail.com>, 2016-2018
+#
+# PY3K COMPATIBLE
 
 """
 Conveyor is a daemon to manage file transfers.

diff --git a/bin/rucio-conveyor-throttler b/bin/rucio-conveyor-throttler
@@ -16,6 +16,8 @@
 # Authors:
 # - Wen Guan, <wguan.icedew@gmail.com>, 2016
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 Conveyor is a daemon to manage file transfers.

diff --git a/bin/rucio-conveyor-transfer-submitter b/bin/rucio-conveyor-transfer-submitter
@@ -18,6 +18,8 @@
 # - Cedric Serfon, <cedric.serfon@cern.ch>, 2013-2018
 # - Wen Guan, <wguan.icedew@gmail.com>, 2014-2016
 # - Vincent Garonne, <vgaronne@gmail.com>, 2016-2018
+#
+# PY3K COMPATIBLE
 
 """
 Conveyor is a daemon to manage file transfers.

diff --git a/bin/rucio-hermes b/bin/rucio-hermes
@@ -16,6 +16,8 @@
 # Authors:
 # - Mario Lassnig, <mario.lassnig@cern.ch>, 2014-2017
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 Hermes is a daemon to deliver messages to an asynchronous broker.

diff --git a/bin/rucio-judge-cleaner b/bin/rucio-judge-cleaner
@@ -16,6 +16,8 @@
 # Authors:
 # - Martin Barisits, <martin.barisits@cern.ch>, 2013-2015
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 Judge-Cleaner is a daemon to clean expired replication rules.

diff --git a/bin/rucio-judge-evaluator b/bin/rucio-judge-evaluator
@@ -16,6 +16,8 @@
 # Authors:
 # - Martin Barisits, <martin.barisits@cern.ch>, 2013-2015
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 Judge-Evaluator is a daemon to re-evaluate replication rules.

diff --git a/bin/rucio-judge-injector b/bin/rucio-judge-injector
@@ -16,6 +16,8 @@
 # Authors:
 # - Martin Barisits, <martin.barisits@cern.ch>, 2015-2016
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 Judge-Injector is a daemon to asynchronously inject replication rules.

diff --git a/bin/rucio-judge-repairer b/bin/rucio-judge-repairer
@@ -16,6 +16,8 @@
 # Authors:
 # - Martin Barisits, <martin.barisits@cern.ch>, 2013-2015
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 Judge-Repairer is a daemon to repair stuck replication rules.

diff --git a/bin/rucio-kronos b/bin/rucio-kronos
@@ -17,6 +17,8 @@
 # - Thomas Beermann, <thomas.beermann@cern.ch>, 2014
 # - Mario Lassnig, <mario.lassnig@cern.ch>, 2015
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 """
 Kronos is a daemon the consumer tracer messages and update the replica atime accordingly.

diff --git a/bin/rucio-necromancer b/bin/rucio-necromancer
@@ -17,6 +17,8 @@
 # - Cedric Serfon, <cedric.serfon@cern.ch>, 2014
 # - Mario Lassnig, <mario.lassnig@cern.ch>, 2015
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 '''
 Necromancer Daemon : Bring the dead files back to life

diff --git a/bin/rucio-sonar b/bin/rucio-sonar
@@ -16,6 +16,8 @@
 # Authors:
 # - Vitjan Zavrtanik, <vitjan.zavrtanik@cern.ch>, 2017
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 '''
 Sonar is a daemon that tests inactive links.

diff --git a/bin/rucio-sonar-distribution b/bin/rucio-sonar-distribution
@@ -16,6 +16,8 @@
 # Authors:
 # - Vitjan Zavrtanik, <vitjan.zavrtanik@cern.ch>, 2017
 # - Vincent Garonne, <vgaronne@gmail.com>, 2018
+#
+# PY3K COMPATIBLE
 
 '''
 Sonar distribution daemon makes sure the datasets

diff --git a/bin/rucio-transmogrifier b/bin/rucio-transmogrifier
@@ -17,6 +17,8 @@
 # - Vincent Garonne, <vgaronne@gmail.com>, 2012-2018
 # - Cedric Serfon, <cedric.serfon@cern.ch>, 2013-2014
 # - Mario Lassnig, <mario.lassnig@cern.ch>, 2015
+#
+# PY3K COMPATIBLE
 
 '''
 Transmogrifier (Replication Rule Resolver) Daemon

diff --git a/bin/rucio-undertaker b/bin/rucio-undertaker
@@ -15,6 +15,8 @@
 #
 # Authors:
 # - Vincent Garonne, <vgaronne@gmail.com>, 2013-2018
+#
+# PY3K COMPATIBLE
 
 """
 Undertaker is a daemon to manage expired did.

diff --git a/lib/rucio/api/account.py b/lib/rucio/api/account.py
@@ -12,7 +12,8 @@
 # - Martin Barisits, <martin.barisits@cern.ch>, 2014
 # - Joaquin Bogado, <joaquin.bogado@cern.ch>, 2015
 # - Cedric Serfon, <cedric.serfon@cern.ch>, 2015
-
+#
+# PY3K COMPATIBLE
 
 import rucio.api.permission
 import rucio.common.exception

diff --git a/lib/rucio/api/account_limit.py b/lib/rucio/api/account_limit.py
@@ -7,6 +7,8 @@
 # Authors:
 # - Martin Barisits, <martin.barisits@cern.ch>, 2014
 # - Cedric Serfon, <cedric.serfon@cern.ch>, 2015
+#
+# PY3K COMPATIBLE
 
 import rucio.api.permission
 import rucio.common.exception

diff --git a/lib/rucio/api/authentication.py b/lib/rucio/api/authentication.py
@@ -16,6 +16,8 @@
 # - Mario Lassnig <mario@lassnig.net>, 2012-2018
 # - Vincent Garonne <vgaronne@gmail.com>, 2012-2015
 # - Martin Barisits <martin.barisits@cern.ch>, 2017
+#
+# PY3K COMPATIBLE
 
 from rucio.api import permission
 from rucio.common import exception

diff --git a/lib/rucio/api/config.py b/lib/rucio/api/config.py
@@ -7,6 +7,8 @@
 #
 # Authors:
 # - Mario Lassnig, <mario.lassnig@cern.ch>, 2014
+#
+# PY3K COMPATIBLE
 
 from rucio.api import permission
 from rucio.common import exception

diff --git a/lib/rucio/api/credential.py b/lib/rucio/api/credential.py
@@ -14,6 +14,8 @@
 #
 # Authors:
 # - Mario Lassnig <mario@lassnig.net>, 2018
+#
+# PY3K COMPATIBLE
 
 from rucio.api import permission
 from rucio.common import exception

diff --git a/lib/rucio/api/heartbeat.py b/lib/rucio/api/heartbeat.py
@@ -7,6 +7,8 @@
 #
 # Authors:
 # - Mario Lassnig, <mario.lassnig@cern.ch>, 2015
+#
+# PY3K COMPATIBLE
 
 from rucio.api import permission
 from rucio.common import exception

diff --git a/lib/rucio/api/identity.py b/lib/rucio/api/identity.py
@@ -9,6 +9,8 @@
 # - Mario Lassnig, <mario.lassnig@cern.ch>, 2012, 2017
 # - Tomas Kouba, <tomas.kouba@cern.ch>, 2014
 # - Thomas Beermann, <thomas.beermann@cern.ch>, 2014
+#
+# PY3K COMPATIBLE
 
 """
 Interface for identity abstraction layer

diff --git a/lib/rucio/api/lifetime_exception.py b/lib/rucio/api/lifetime_exception.py
@@ -8,6 +8,8 @@
 
   Authors:
   - Cedric Serfon, <cedric.serfon@cern.ch>, 2016-2017
+
+  PY3K COMPATIBLE
 '''
 
 from rucio.api import permission

diff --git a/lib/rucio/api/lock.py b/lib/rucio/api/lock.py
@@ -6,6 +6,8 @@
 #
 # Authors:
 # - Martin Barisits, <martin.barisits@cern.ch>, 2014
+#
+# PY3K COMPATIBLE
 
 from rucio.core import lock
 from rucio.core.rse import get_rse_id