Merge pull request #9 from Intermodalics/merge/upstream/0.8.2

Merge upstream version 0.8.2

.github/ISSUE_TEMPLATE.md

@@ -13,10 +13,10 @@
 ### Build / Run Issue
 
 [//]: # (If you are migrating from catkin_make, please follow the migration guide:)
-[//]: # (http://catkin-tools.readthedocs.org/en/latest/migration.html)
+[//]: # (https://catkin-tools.readthedocs.org/en/latest/migration.html)
 
 [//]: # (Please also check for solved issues here:)
-[//]: # (http://catkin-tools.readthedocs.org/en/latest/troubleshooting.html)
+[//]: # (https://catkin-tools.readthedocs.org/en/latest/troubleshooting.html)
 
 [//]: # (And check for open issues here:)
 [//]: # (https://github.com/catkin/catkin_tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug)

.github/workflows/workflow.yml

@@ -0,0 +1,51 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        versions:
+          - dist: ubuntu-18.04
+            python: 3.6
+            catkin: indigo-devel
+          - dist: ubuntu-18.04
+            python: 3.7
+            catkin: indigo-devel
+          - dist: ubuntu-18.04
+            python: 3.8
+            catkin: indigo-devel
+          - dist: ubuntu-20.04
+            python: 3.9
+            catkin: indigo-devel
+
+    runs-on: ${{ matrix.versions.dist }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.versions.python }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.versions.python }}
+      - name: Install package and dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install .
+          pip install --upgrade empy sphinx_rtd_theme sphinxcontrib-spelling nose coverage flake8 mock
+      - name: Set up catkin
+        run: |
+          git clone https://github.com/ros/catkin.git -b ${{ matrix.versions.catkin }} /tmp/catkin_source
+          mkdir /tmp/catkin_source/build
+          pushd /tmp/catkin_source/build
+          cmake .. && make
+          popd
+      - name: Test catkin_tools
+        run: |
+          source /tmp/catkin_source/build/devel/setup.bash
+          nosetests -s tests
+      - name: Build documentation
+        run: |
+          pushd docs
+          make html
+          sphinx-build -b spelling . build -t use_spelling
+          popd

CHANGELOG.rst

@@ -2,6 +2,88 @@
 Changelog for package catkin_tools
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Upcoming
+--------
+
+0.8.2 (2021-12-01)
+------------------
+
+* Add back flags that were removed in #691 (#702)
+* Documentation: Update CLI documentation
+
+0.8.1 (2021-11-30)
+------------------
+
+* catkin test: add --limit-status-rate option (#699)
+
+0.8.0 (2021-11-30)
+------------------
+
+* Add catkin test verb (#676)
+* Code cleanup (#692)
+* Documentation: https in docs, properties over vars, sphinx cleanup (#690)
+* Documentation: Improve wording (#694)
+* Documentation: Add custom build, devel, install dirs (#697)
+* Contributors: Balint, Jim Aldon D'Souza, Matthijs van der Burgh, mobangjack, pseyfert, Timon Engelke
+
+0.7.2 (2021-11-18)
+------------------
+
+* Update installation docs for python 3 (#687)
+* Fix environment variable parsing (#686)
+* Switch from Travis CI to GitHub actions (#684)
+* Regenerate setup files when the install space was cleaned (#682)
+* Add possibility to clean individual package with isolated devel space (#683)
+* Fix regeneration of setup file when the install space was cleaned (#682)
+* Fix workspace generation with catkin build --this and --start-with-this (#685)
+
+0.7.1 (2021-07-17)
+------------------
+* Fixes in the build system requiring a version increase
+
+0.7.0 (2021-03-01)
+------------------
+* Fix placeholders for cmake warning and error coloring (#678)
+* Fix catkin clean --all-profiles when not at workspace root (#673)
+* Fix `catkin create pkg` without license parameter (#671) 
+* Support building from a symlinked workspace (#669)
+* Use loadavg over the last 1 minute (#668)
+* Fix shell completion install locations (#652)
+* Fix blank lines in build output (#666)
+* Use standard python function to determine terminal width (#653)
+* Fix handling of invalid package.xml files (#660)
+* Fixes for extending profiles (#658)
+* escape whitespaces in `catkin config` printout (#657)
+* updates to zsh completion (#609)
+* Ignore catkin_tools_prebuild package in build space (#650)
+* fix 'catkin locate' for symlinked pkgs inside workspace (#624)
+* Report circular dependencies detected by topological_order_packages() (#617)
+* Add `--this` option to `clean` verb (#623)
+* In catkin build, preserve original job list topological ordering (#626)
+* Fail build if jobs were abandoned (#644)
+* Fix installation of new cmake files (#615)
+* Abort with error message on circular dependency. (#641)
+* Changed yield from lock to await for Python 3.9 compat (#635)
+* Remove older py35+xenial config and add py39+focal (#637)
+* Install python2 before travis runs on Focal. (#639)
+* Bump cmake min ver to 2.8.12 (#634)
+* Fix byte decoding for python 3 (Issue #625) (#627)
+* Cleanup of jobs flag parsing (#610, #656, #655)
+* Fix get_python_install_dir for Python 2/3 (#601)
+* Minor cleanup:
+  - import cleanup (#651)
+  - remove hack (#659)
+  - Add missing space in devel layout error message
+  - fix TypeError on executing catkin env (#649)
+  - Put a space between 'workspace' and 'and' (#619)
+  - Remove redundant 'configuration' in mechanics.rst (#646)
+  - Use PYTHONASYNCIODEBUG instead of TROLLIUSDEBUG (#661)
+* Contributors: Akash Patel, Guglielmo Gemignani, Ivor Wanders, Kevin Jaget, Lucas Walter, Mathias Lüdtke, Matthijs van der Burgh, Mike Purvis, Robert Haschke, Simon Schmeisser, Tim Rakowski, Timon Engelke, Vojtech Spurny, ckurtz22, mobangjack, pseyfert, xiaxi, zig-for
+
+0.6.0 (2020-06-03)
+------------------
+* This release restores the 0.4.5 state due to an accident with the 0.5.0 release where we pushed it to Python2 users which it doesn't support.
+
 0.5.0 (2020-06-02)
 ------------------
 * Revert "jobs: Fixing environment required to run catkin test targets on pre-indigo catkin" (`#600 <https://github.com/catkin/catkin_tools/issues/600>`_)

README.md

@@ -1,5 +1,5 @@
-# catkin_tools [![Build Status](https://travis-ci.org/catkin/catkin_tools.svg?branch=master)](https://travis-ci.org/catkin/catkin_tools)
+# catkin_tools [![Build Status](https://github.com/catkin/catkin_tools/actions/workflows/workflow.yml/badge.svg)](https://github.com/catkin/catkin_tools/actions/workflows/workflow.yml)
 
 Command line tools for working with [catkin](https://github.com/ros/catkin)
 
-Documentation: http://catkin-tools.readthedocs.org/
+Documentation: https://catkin-tools.readthedocs.org/

catkin_tools/argument_parsing.py

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import print_function
-
 import argparse
 import os
 import re
@@ -254,7 +252,7 @@ def extract_jobs_flags(mflags):
     :rtype: list
     """
     if not mflags:
-        return []
+        return None
 
     # Each line matches a flag type, i.e. -j, -l, --jobs, --load-average
     # (?:^|\s) and (?=$|\s) make sure that the flag is surrounded by whitespace
@@ -324,14 +322,16 @@ def configure_make_args(make_args, jobs_args, use_internal_make_jobserver):
 
     :param make_args: arguments to be passed to GNU Make
     :type make_args: list
+    :param jobs_args: job arguments overriding make flags
+    :type jobs_args: list
     :param use_internal_make_jobserver: if true, use the internal jobserver
     :type make_args: bool
     :rtype: tuple (final make_args, using makeflags, using cliflags, using jobserver)
     """
 
     # Configure default jobs options: use all CPUs in each package
     try:
-        # NOTE: this will yeild greater than 100% CPU utilization
+        # NOTE: this will yield greater than 100% CPU utilization
         n_cpus = cpu_count()
         jobs_flags = {
             'jobs': n_cpus,
@@ -378,7 +378,7 @@ def argument_preprocessor(args):
 
     :param args: system arguments from which special arguments need to be extracted
     :type args: list
-    :returns: a tuple contianing a list of the arguments which can be handled
+    :returns: a tuple containing a list of the arguments which can be handled
     by argparse and a dict of the extra arguments which this function has
     extracted
     :rtype: tuple
@@ -394,12 +394,12 @@ def argument_preprocessor(args):
     jobs_args = extract_jobs_flags(' '.join(args))
     if jobs_args:
         # Remove jobs flags from cli args if they're present
-        args = re.sub(' '.join(jobs_args), '', ' '.join(args)).split()
+        args = [arg for arg in args if arg not in jobs_args]
     elif make_args is not None:
         jobs_args = extract_jobs_flags(' '.join(make_args))
         if jobs_args:
             # Remove jobs flags from cli args if they're present
-            make_args = re.sub(' '.join(jobs_args), '', ' '.join(make_args)).split()
+            make_args = [arg for arg in make_args if arg not in jobs_args]
 
     extras = {
         'cmake_args': cmake_args,

catkin_tools/commands/catkin.py

@@ -12,18 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import print_function
-
 import argparse
-from datetime import date
 import os
 import pkg_resources
 import sys
-
-try:
-    from shlex import quote as cmd_quote
-except ImportError:
-    from pipes import quote as cmd_quote
+from datetime import date
+from shlex import quote as cmd_quote
 
 from catkin_tools.common import is_tty
 
@@ -195,7 +189,7 @@ def catkin_main(sysargs):
             date.today().year)
         )
         print('catkin_tools is released under the Apache License,'
-              ' Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)')
+              ' Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0)')
         print('---')
         print('Using Python {}'.format(''.join(sys.version.split('\n'))))
         sys.exit(0)