Merge pull request #404 from ros-infrastructure/travis_python2

add Python 2 coverage on Travis
ros-infrastructure · Mar 16, 2017 · 0c3b81f · 0c3b81f
2 parents a06204a + ff15aba
commit 0c3b81f
Show file tree

Hide file tree

Showing 6 changed files with 119 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -90,6 +90,85 @@ matrix:
         - build_release_status_page.py $CONFIG_URL $ROS_DISTRO_NAME default
         - build_repos_status_page.py $ROS_DISTRO_NAME http://packages.ros.org/ros-shadow-fixed/ubuntu http://packages.ros.org/ros/ubuntu --os-code-name-and-arch-tuples xenial:source xenial:amd64 xenial:arm64 xenial:armhf xenial:i386 --cache-dir ./debian_repo_cache --output-name kinetic_xenial
         - ls -al
+    - language: python
+      python: "2.7"
+      sudo: required
+      services:
+        - docker
+      env: JOB_TYPE=devel REPOSITORY_NAME=roscpp_core
+      before_script:
+        # install catkin for test results
+        - sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros.list'
+        - sudo apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116
+        - sudo apt-get update -qq
+        - sudo apt-get install ros-indigo-catkin -y
+        - python setup.py install
+        - mkdir job && cd job
+      script:
+        - generate_devel_script.py $CONFIG_URL $ROS_DISTRO_NAME default $REPOSITORY_NAME $OS_NAME $OS_CODE_NAME $ARCH > job.sh
+        - . /opt/ros/indigo/setup.sh
+        - . job.sh -y
+        - (exit $catkin_test_results_RC)
+    - language: python
+      python: "2.7"
+      sudo: required
+      services:
+        - docker
+      env: JOB_TYPE=doc REPOSITORY_NAME=roscpp_core
+      before_script:
+        - python setup.py install
+        - mkdir job && cd job
+      script:
+        - generate_doc_script.py $CONFIG_URL $ROS_DISTRO_NAME default $REPOSITORY_NAME $OS_NAME $OS_CODE_NAME $ARCH > job.sh
+        - sh job.sh
+        - ls -alR generated_documentation/api_rosdoc
+    - language: python
+      python: "2.7"
+      sudo: required
+      services:
+        - docker
+      env: JOB_TYPE=release PACKAGE_NAME=rostime
+      before_script:
+        - python setup.py install
+        - mkdir job && cd job
+      script:
+        - generate_release_script.py $CONFIG_URL $ROS_DISTRO_NAME default $PACKAGE_NAME $OS_NAME $OS_CODE_NAME $ARCH > job.sh
+        - sh job.sh
+    - language: python
+      python: "2.7"
+      sudo: required
+      services:
+        - docker
+      env: JOB_TYPE=prerelease UNDERLAY_REPOSITORY_NAMES="roscpp_core" OVERLAY_PACKAGE_NAMES=roscpp
+      before_script:
+        - pip3 install EmPy
+        # install catkin for test results
+        - sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros.list'
+        - sudo apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116
+        - sudo apt-get update -qq
+        - sudo apt-get install ros-indigo-catkin -y
+        - python setup.py install
+        - mkdir job && cd job
+      script:
+        - generate_prerelease_script.py $CONFIG_URL $ROS_DISTRO_NAME default $OS_NAME $OS_CODE_NAME $ARCH $UNDERLAY_REPOSITORY_NAMES --level 0 --pkg $OVERLAY_PACKAGE_NAMES --output-dir .
+        - . /opt/ros/indigo/setup.sh
+        - . prerelease.sh -y
+        - (exit $catkin_test_results_RC_underlay) && (exit $catkin_test_results_RC_overlay)
+    - language: python
+      python: "2.7"
+      sudo: required
+      services:
+        - docker
+      env: JOB_TYPE=status_pages
+      before_script:
+        - python setup.py install
+        - mkdir status_pages && cd status_pages
+      script:
+        - build_blocked_releases_page.py $CONFIG_URL $ROS_DISTRO_NAME
+        - build_release_compare_page.py $CONFIG_URL lunar kinetic
+        - build_release_status_page.py $CONFIG_URL $ROS_DISTRO_NAME default
+        - build_repos_status_page.py $ROS_DISTRO_NAME http://packages.ros.org/ros-shadow-fixed/ubuntu http://packages.ros.org/ros/ubuntu --os-code-name-and-arch-tuples xenial:source xenial:amd64 xenial:arm64 xenial:armhf xenial:i386 --cache-dir ./debian_repo_cache --output-name kinetic_xenial
+        - ls -al
 install:
   - pip install catkin-pkg EmPy PyYAML rosdistro
   - pip install coverage flake8 flake8-docstrings flake8-import-order nose pep8 pyflakes

diff --git a/ros_buildfarm/debian_repo.py b/ros_buildfarm/debian_repo.py
@@ -19,9 +19,14 @@
 import os
 import socket
 import time
-from urllib.error import HTTPError
-from urllib.error import URLError
-from urllib.request import urlopen
+try:
+    from urllib.error import HTTPError
+    from urllib.error import URLError
+    from urllib.request import urlopen
+except ImportError:
+    from urllib2 import HTTPError
+    from urllib2 import URLError
+    from urllib2 import urlopen
 
 
 def get_debian_repo_data(debian_repository_baseurl, targets, cache_dir):

diff --git a/ros_buildfarm/rosdoc_lite.py b/ros_buildfarm/rosdoc_lite.py
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import sys
 
 import yaml

diff --git a/ros_buildfarm/status_page.py b/ros_buildfarm/status_page.py
@@ -588,9 +588,12 @@ def _filter_tag_wrap(label):
 
 
 def _name_query_wrap(name):
-    import urllib
+    try:
+        from urllib.parse import quote
+    except ImportError:
+        from urllib import quote
     query = 'id="{0}"'.format(name)
-    return '<a href="?q={0}">{1}</a>'.format(urllib.parse.quote(query), name)
+    return '<a href="?q={0}">{1}</a>'.format(quote(query), name)
 
 
 def _format_repo_table_row(name, data):

diff --git a/scripts/status/build_release_compare_page.py b/scripts/status/build_release_compare_page.py
@@ -17,11 +17,18 @@
 import argparse
 import sys
 
-from ros_buildfarm.argument import add_argument_config_url
-from ros_buildfarm.argument import add_argument_older_rosdistro_names
-from ros_buildfarm.argument import add_argument_output_dir
-from ros_buildfarm.argument import add_argument_rosdistro_name
-from ros_buildfarm.status_page import build_release_compare_page
+try:
+    # while this is not supposed to be done I don't see a different way atm
+    reload(sys)
+    sys.setdefaultencoding('utf-8')
+except NameError:
+    pass
+
+from ros_buildfarm.argument import add_argument_config_url  # noqa
+from ros_buildfarm.argument import add_argument_older_rosdistro_names  # noqa
+from ros_buildfarm.argument import add_argument_output_dir  # noqa
+from ros_buildfarm.argument import add_argument_rosdistro_name  # noqa
+from ros_buildfarm.status_page import build_release_compare_page  # noqa
 
 
 def main(argv=sys.argv[1:]):

diff --git a/scripts/status/build_release_status_page.py b/scripts/status/build_release_status_page.py
@@ -17,12 +17,19 @@
 import argparse
 import sys
 
-from ros_buildfarm.argument import add_argument_build_name
-from ros_buildfarm.argument import add_argument_cache_dir
-from ros_buildfarm.argument import add_argument_config_url
-from ros_buildfarm.argument import add_argument_output_dir
-from ros_buildfarm.argument import add_argument_rosdistro_name
-from ros_buildfarm.status_page import build_release_status_page
+try:
+    # while this is not supposed to be done I don't see a different way atm
+    reload(sys)
+    sys.setdefaultencoding('utf-8')
+except NameError:
+    pass
+
+from ros_buildfarm.argument import add_argument_build_name  # noqa
+from ros_buildfarm.argument import add_argument_cache_dir  # noqa
+from ros_buildfarm.argument import add_argument_config_url  # noqa
+from ros_buildfarm.argument import add_argument_output_dir  # noqa
+from ros_buildfarm.argument import add_argument_rosdistro_name  # noqa
+from ros_buildfarm.status_page import build_release_status_page  # noqa
 
 
 def main(argv=sys.argv[1:]):