autoproj 2.13.0 → 2.15.2

data/lib/autoproj/python.rb

@@ -0,0 +1,297 @@
+require "open3"
+require "rubygems"
+
+module Autoproj
+    module Python
+        # Get the python version for a given python executable
+        # @return [String] The python version as <major>.<minor>
+        def self.get_python_version(python_bin)
+            unless File.exist?(python_bin)
+                raise ArgumentError, "Autoproj::Python.get_python_version executable "\
+                                     "'#{python_bin}' does not exist"
+            end
+
+            cmd = "#{python_bin} -c \"import sys;"\
+                  "version=sys.version_info[:3]; "\
+                  "print('{0}.{1}'.format(*version))\"".strip
+
+            msg, status = Open3.capture2e(cmd)
+            if status.success?
+                msg.strip
+
+            else
+                raise "Autoproj::Python.get_python_version identification"\
+                      " of python version for '#{python_bin}' failed: #{msg}"
+            end
+        end
+
+        def self.get_pip_version(pip_bin)
+            unless File.exist?(pip_bin)
+                raise ArgumentError, "Autoproj::Python.get_pip_version executable "\
+                                     "'#{pip_bin}' does not exist"
+            end
+
+            cmd = "#{pip_bin} --version"
+
+            msg, status = Open3.capture2e(cmd)
+            if status.success?
+                msg.split(" ")[1]
+
+            else
+                raise "Autoproj::Python.get_pip_version identification"\
+                      " of pip version for '#{pip_bin}' failed: #{msg}"
+            end
+        end
+
+        def self.validate_version(version, version_constraint)
+            if version_constraint
+                dependency = Gem::Dependency.new("python", version_constraint)
+                dependency.match?("python", version)
+            else
+                true
+            end
+        end
+
+        # Validate that a given python executable's version fulfills
+        # a given version constraint
+        # @param [String] python_bin the python executable
+        # @param [String] version_constraint version constraint, e.g., <3.8, >= 3.7, 3.6
+        # @return [String,Bool] Version and validation result, i.e.,
+        #         True if binary fulfills the version constraint, false otherwise
+        def self.validate_python_version(python_bin, version_constraint)
+            version = get_python_version(python_bin)
+            [version, validate_version(version, version_constraint)]
+        end
+
+        # Find python given a version constraint
+        # @return [String,String] path to python executable and python version
+        def self.find_python(ws: Autoproj.workspace,
+            version: ws.config.get("python_version", nil))
+            finders = [
+                -> { Autobuild.programs["python"] },
+                -> { `which python3`.strip },
+                -> { `which python`.strip }
+            ]
+
+            finders.each do |finder|
+                python_bin = finder.call
+                if python_bin && !python_bin.empty?
+                    python_version, valid = validate_python_version(python_bin, version)
+                    return python_bin, python_version if valid
+                end
+            end
+            raise "Autoproj::Python.find_python_bin: failed to find python" \
+                  " for version '#{version}'"
+        end
+
+        # Get information about the python executable from autoproj config,
+        # but ensure the version constraint matches
+        #
+        # @return [String, String] Return path and version if the constraints
+        #      are fulfilled nil otherwise
+
+        def self.get_python_from_config(ws: Autoproj.workspace, version: nil)
+            config_bin = ws.config.get("python_executable", nil)
+            return unless config_bin
+
+            config_version = ws.config.get("python_version", nil)
+            config_version ||= get_python_version(config_bin)
+
+            # If a version constraint is given, ensure fulfillment
+            if validate_version(config_version, version)
+                [config_bin, config_version]
+            else
+                raise "python_executable in autoproj config with " \
+                      "version '#{config_version}' does not match "\
+                      "version constraints '#{version}'"
+            end
+        end
+
+        def self.custom_resolve_python(bin: nil,
+            version: nil)
+            version, valid = validate_python_version(bin, version)
+            if valid
+                [bin, version]
+            else
+                raise "Autoproj::Python.resolve_python: requested python"\
+                      "executable '#{bin}' does not satisfy version"\
+                      "constraints '#{version}'"
+            end
+        end
+
+        def self.auto_resolve_python(ws: Autoproj.workspace,
+            version: nil)
+            version_constraint = version
+            resolvers = [
+                -> { get_python_from_config(ws: ws, version: version_constraint) },
+                -> { find_python(ws: ws, version: version_constraint) }
+            ]
+
+            bin = nil
+            resolvers.each do |resolver|
+                bin, version = resolver.call
+                if bin && File.exist?(bin) && version
+                    Autoproj.debug "Autoproj::Python.resolve_python: " \
+                                   "found python '#{bin}' version '#{version}'"
+                    break
+                end
+            rescue RuntimeError => e
+                Autoproj.debug "Autoproj::Python.resolve_python: " \
+                               "resolver failed: #{e}"
+            end
+
+            unless bin
+                msg = "Autoproj::Python.resolve_python: " \
+                      "failed to find a python executable"
+                if version_constraint
+                    msg += " satisfying version constraint '#{version_constraint}'"
+                end
+                raise msg
+            end
+            [bin, version]
+        end
+
+        # Resolve the python executable according to a given version constraint
+        # @param [Autoproj.workspace] ws Autoproj workspace
+        # @param [String] bin Path to the python executable that shall be used,
+        #   first fallback is the python_executable set in Autoproj's configuration,
+        #   second fallback is a full search
+        # @param [String] version version constraint
+        # @return [String,String] python path and python version
+        def self.resolve_python(ws: Autoproj.workspace,
+            bin: nil,
+            version: nil)
+            if bin
+                custom_resolve_python(bin: bin, version: version)
+            else
+                auto_resolve_python(ws: ws, version: version)
+            end
+        end
+
+        def self.remove_python_shims(prefix_dir)
+            shim_path = File.join(prefix_dir, "bin", "python")
+            FileUtils.rm shim_path if File.exist?(shim_path)
+        end
+
+        def self.remove_pip_shims(prefix_dir)
+            shim_path = File.join(prefix_dir, "bin", "pip")
+            FileUtils.rm shim_path if File.exist?(shim_path)
+        end
+
+        def self.rewrite_python_shims(python_executable, prefix_dir)
+            shim_path = File.join(prefix_dir, "bin")
+            unless File.exist?(shim_path)
+                FileUtils.mkdir_p shim_path
+                Autoproj.warn "Autoproj::Python.rewrite_python_shims: creating "\
+                              "#{shim_path} - "\
+                              "are you operating on a valid autoproj workspace?"
+            end
+
+            python_path = File.join(shim_path, "python")
+            File.open(python_path, "w") do |io|
+                io.puts "#! /bin/sh"
+                io.puts "exec #{python_executable} \"$@\""
+            end
+            FileUtils.chmod 0o755, python_path
+            python_path
+        end
+
+        def self.rewrite_pip_shims(python_executable, prefix_dir)
+            shim_path = File.join(prefix_dir, "bin")
+            unless File.exist?(shim_path)
+                FileUtils.mkdir_p shim_path
+                Autoproj.warn "Autoproj::Python.rewrite_pip_shims: creating "\
+                              "#{shim_path} - "\
+                              "are you operating on a valid autoproj workspace?"
+            end
+            pip_path = File.join(shim_path, "pip")
+            File.open(pip_path, "w") do |io|
+                io.puts "#! /bin/sh"
+                io.puts "exec #{python_executable} -m pip \"$@\""
+            end
+            FileUtils.chmod 0o755, pip_path
+            pip_path
+        end
+
+        # Activate configuration for python in the autoproj configuration
+        # @return [String,String] python path and python version
+        def self.activate_python(ws: Autoproj.workspace,
+            bin: nil,
+            version: nil)
+            bin, version = resolve_python(ws: ws, bin: bin, version: version)
+            ws.config.set("python_executable", bin, true)
+            ws.config.set("python_version", version, true)
+
+            ws.osdep_suffixes << "python#{$1}" if version =~ /^([0-9]+)\./
+
+            rewrite_python_shims(bin, ws.dot_autoproj_dir)
+            rewrite_pip_shims(bin, ws.dot_autoproj_dir)
+            [bin, version]
+        end
+
+        def self.deactivate_python(ws: Autoproj.workspace)
+            remove_python_shims(ws.dot_autoproj_dir)
+            remove_pip_shims(ws.dot_autoproj_dir)
+            ws.config.reset("python_executable")
+            ws.config.reset("python_version")
+        end
+
+        # Allow to update the PYTHONPATH for package if autoproj configuration
+        # USE_PYTHON is set to true.
+        # Then tries to guess the python binary from Autobuild.programs['python']
+        # and system's default setting
+        # @param [Autobuild::Package] pkg
+        # @param [Autoproj.workspace] ws Autoproj workspace
+        # @param [String] bin Path to a custom python version
+        # @param [String] version version constraint for python executable
+        # @return tuple of [executable, version, site-packages path] if set,
+        #    otherwise nil
+        def self.activate_python_path(pkg,
+            ws: Autoproj.workspace,
+            bin: nil,
+            version: nil)
+            return unless ws.config.get("USE_PYTHON", nil)
+
+            bin, version = resolve_python(ws: ws, bin: bin, version: version)
+            path = File.join(pkg.prefix, "lib",
+                             "python#{version}", "site-packages")
+            pkg.env_add_path "PYTHONPATH", path
+
+            [bin, version, path]
+        end
+
+        def self.assert_python_activated(ws: Autoproj.workspace)
+            return true if ws.config.get("USE_PYTHON")
+
+            raise ConfigError,
+                  "Your current package selection requires the use of python," \
+                  " but this is either unspecified or has been denied,"\
+                  " see setting of USE_PYTHON in your workspace configuration." \
+                  " Either remove all packages depending on pip packages " \
+                  " from the workspace layout (manifest) or " \
+                  " call 'autoproj reconfigure' to change the setting."
+        end
+
+        def self.setup_python_configuration_options(ws: Autoproj.workspace)
+            ws.config.declare "USE_PYTHON", "boolean",
+                              default: "no",
+                              doc: ["Do you want to activate python?"]
+
+            if ws.config.get("USE_PYTHON")
+                unless ws.config.has_value_for?("python_executable")
+                    remove_python_shims(ws.dot_autoproj_dir)
+                    remove_pip_shims(ws.dot_autoproj_dir)
+                    python_bin, = auto_resolve_python(ws: ws)
+                end
+
+                ws.config.declare "python_executable", "string",
+                                  default: python_bin.to_s,
+                                  doc: ["Select the path to the python executable"]
+
+                activate_python(ws: ws)
+            else
+                deactivate_python(ws: ws)
+            end
+        end
+    end
+end

data/lib/autoproj/query_base.rb

@@ -10,6 +10,7 @@ module Autoproj
         attr_reader :fields
         # The expected value
         attr_reader :value
+
         # Whether the match can be partial
         attr_predicate :partial?, true
 
@@ -19,7 +20,9 @@ module Autoproj
         #
         # Use {.all}
         class All
-            def match(pkg); true end
+            def match(pkg)
+                true
+            end
         end
 
         # Get a query that matches anything
@@ -57,13 +60,14 @@ module Autoproj
         # @api private
         #
         # Parse a single field in a query (i.e. a FIELD[=~]VALUE string)
-        # 
+        #
         # This is NOT meant to be used directly. Subclasses are supposed to
         # redefine .parse to create the relevant match object.
         def self.parse(str, allowed_fields: [], default_fields: Hash.new)
-            if parsed = /[=~]/.match(str)
-                field, value = parsed.pre_match, parsed.post_match
-                partial = (parsed[0] == '~')
+            if (parsed = /[=~]/.match(str))
+                field = parsed.pre_match
+                value = parsed.post_match
+                partial = (parsed[0] == "~")
             else
                 raise ArgumentError, "invalid query string '#{str}', expected FIELD and VALUE separated by either = or ~"
             end
@@ -71,17 +75,17 @@ module Autoproj
             field = default_fields[field] || field
 
             # Validate the query key
-            if !allowed_fields.include?(field)
+            unless allowed_fields.include?(field)
                 raise ArgumentError, "'#{field}' is not a known query key"
             end
 
-            fields = field.split('.')
-            return fields, value, partial
+            fields = field.split(".")
+            [fields, value, partial]
         end
 
         # Parse a complete query
         def self.parse_query(query, *args)
-            query = query.split(':')
+            query = query.split(":")
             query = query.map do |str|
                 parse(str, *args)
             end
@@ -97,9 +101,11 @@ module Autoproj
             def initialize(submatches)
                 @submatches = submatches
             end
+
             def each_subquery(&block)
                 @submatches.each(&block)
             end
+
             def match(pkg)
                 @submatches.map { |m| m.match(pkg) }.compact.max
             end
@@ -110,19 +116,19 @@ module Autoproj
             def initialize(submatches)
                 @submatches = submatches
             end
+
             def each_subquery(&block)
                 @submatches.each(&block)
             end
+
             def match(pkg)
                 matches = @submatches.map do |m|
-                    if p = m.match(pkg)
-                        p
-                    else return
-                    end
+                    return unless (p = m.match(pkg))
+
+                    p
                 end
                 matches.min
             end
         end
     end
 end
-

data/lib/autoproj/reporter.rb

@@ -1,10 +1,12 @@
-require 'autobuild/reporting'
+require "autobuild/reporting"
 module Autoproj
     class << self
         attr_accessor :verbose
+
         def silent?
             Autobuild.silent?
         end
+
         def silent=(value)
             Autobuild.silent = value
         end
@@ -70,18 +72,18 @@ module Autoproj
             secs = Time.now - @timer_start
             return if secs < 1
 
-            [[60, 'sec'], [60, 'min'], [24, 'hour'], [1000, 'day']].map do |count, name|
+            [[60, "sec"], [60, "min"], [24, "hour"], [1000, "day"]].map do |count, name|
                 if secs > 0
                     secs, n = secs.divmod(count)
                     next if (val = n.to_i) == 0
 
-                    "#{val} #{val > 1 ? name + 's' : name}"
+                    "#{val} #{val > 1 ? "#{name}s" : name}"
                 end
-            end.compact.reverse.join(' ')
+            end.compact.reverse.join(" ")
         end
 
         def success
-            elapsed_string = elapsed_time ? " (took #{elapsed_time})" : ''
+            elapsed_string = elapsed_time ? " (took #{elapsed_time})" : ""
             Autoproj.message("Command finished successfully at "\
                              "#{Time.now}#{elapsed_string}", :bold, :green)
             if Autobuild.post_success_message
@@ -91,9 +93,9 @@ module Autoproj
     end
 
     def self.report(root_dir: nil, silent: nil, debug: Autobuild.debug,
-                    on_package_success: :report,
-                    on_package_failures: Autobuild::Reporting
-                                         .default_report_on_package_failures)
+        on_package_success: :report,
+        on_package_failures: Autobuild::Reporting
+            .default_report_on_package_failures)
         reporter = Autoproj::Reporter.new
         Autobuild::Reporting << reporter
         interrupted = nil
@@ -105,24 +107,22 @@ module Autoproj
 
         package_failures =
             Autobuild::Reporting.report(on_package_failures: :report_silent) do
-                begin
-                    reporter.reset_timer
-                    yield
-                rescue Interrupt => e
-                    interrupted = e
-                end
+                reporter.reset_timer
+                yield
+            rescue Interrupt => e
+                interrupted = e
             end
 
-
         if package_failures.empty?
             raise interrupted if interrupted
 
             Autobuild::Reporting.success if on_package_success == :report
-            return []
+            []
         else
-            Autobuild::Reporting.report_finish_on_error(package_failures,
-                on_package_failures: on_package_failures,
-                interrupted_by: interrupted)
+            Autobuild::Reporting.report_finish_on_error(
+                package_failures,
+                on_package_failures: on_package_failures, interrupted_by: interrupted
+            )
         end
     rescue CLI::CLIException, InvalidWorkspace, ConfigError => e
         if silent_errors