Merge remote-tracking branch 'skeleton/main' into main

Author: pombredanne

configure.bat

@@ -160,6 +160,9 @@ if %ERRORLEVEL% neq 0 (
     %CFG_REQUIREMENTS%
 
 @rem # Create junction to bin to have the same directory between linux and windows
+if exist "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin" (
+    rmdir /s /q "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin"
+)
 mklink /J %CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin %CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts
 
 if %ERRORLEVEL% neq 0 (

docs/source/conf.py

@@ -18,16 +18,28 @@
 # -- Project information -----------------------------------------------------
 
 project = "nexb-skeleton"
-copyright = "nexb Inc."
-author = "nexb Inc."
+copyright = "nexB Inc. and others."
+author = "AboutCode.org authors and contributors"
 
 
 # -- General configuration ---------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = []
+extensions = [
+'sphinx.ext.intersphinx',
+]
+
+# This points to aboutcode.readthedocs.io
+# In case of "undefined label" ERRORS check docs on intersphinx to troubleshoot
+# Link was created at commit - https://github.com/nexB/aboutcode/commit/faea9fcf3248f8f198844fe34d43833224ac4a83
+
+intersphinx_mapping = {
+    'aboutcode': ('https://aboutcode.readthedocs.io/en/latest/', None),
+    'scancode-workbench': ('https://scancode-workbench.readthedocs.io/en/develop/', None),
+}
+
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ["_templates"]
@@ -50,6 +62,8 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ["_static"]
 
+master_doc = 'index'
+
 html_context = {
     "css_files": [
         "_static/theme_overrides.css",  # override wide tables in RTD theme

etc/ci/azure-container-deb.yml

@@ -0,0 +1,50 @@
+parameters:
+    job_name: ''
+    container: ''
+    python_path: ''
+    python_version: ''
+    package_manager: apt-get
+    install_python: ''
+    install_packages: |
+        set -e -x
+        sudo apt-get -y update
+        sudo apt-get -y install \
+            build-essential \
+            xz-utils zlib1g bzip2 libbz2-1.0 tar \
+            sqlite3 libxml2-dev libxslt1-dev \
+            software-properties-common openssl
+    test_suite: ''
+    test_suite_label: ''
+
+
+jobs:
+    - job: ${{ parameters.job_name }}
+
+      pool:
+          vmImage: 'ubuntu-16.04'
+
+      container:
+          image: ${{ parameters.container }}
+          options: '--name ${{ parameters.job_name }} -e LANG=C.UTF-8 -e LC_ALL=C.UTF-8 -v /usr/bin/docker:/tmp/docker:ro'
+
+      steps:
+          - checkout: self
+            fetchDepth: 10
+
+          - script: /tmp/docker exec -t -e LANG=C.UTF-8 -e LC_ALL=C.UTF-8 -u 0 ${{ parameters.job_name }} $(Build.SourcesDirectory)/etc/ci/install_sudo.sh ${{ parameters.package_manager }}
+            displayName: Install sudo
+
+          - script: ${{ parameters.install_packages }}
+            displayName: Install required packages
+
+          - script: ${{ parameters.install_python }}
+            displayName: 'Install Python ${{ parameters.python_version }}'
+
+          - script: ${{ parameters.python_path }} --version
+            displayName: 'Show Python version'
+
+          - script: PYTHON_EXE=${{ parameters.python_path }} ./configure --dev
+            displayName: 'Run Configure'
+
+          - script: ${{ parameters.test_suite }}
+            displayName: 'Run ${{ parameters.test_suite_label }} tests with py${{ parameters.python_version }} on ${{ parameters.job_name }}'

etc/ci/azure-container-rpm.yml

@@ -0,0 +1,51 @@
+parameters:
+    job_name: ''
+    image_name: 'ubuntu-16.04'
+    container: ''
+    python_path: ''
+    python_version: ''
+    package_manager: yum
+    install_python: ''
+    install_packages: |
+        set -e -x
+        sudo yum groupinstall -y "Development Tools"
+        sudo yum install -y \
+            openssl openssl-devel \
+            sqlite-devel zlib-devel xz-devel bzip2-devel \
+            bzip2 tar unzip zip \
+            libxml2-devel libxslt-devel
+    test_suite: ''
+    test_suite_label: ''
+
+
+jobs:
+    - job: ${{ parameters.job_name }}
+
+      pool:
+          vmImage: ${{ parameters.image_name }}
+
+      container:
+          image: ${{ parameters.container }}
+          options: '--name ${{ parameters.job_name }} -e LANG=C.UTF-8 -e LC_ALL=C.UTF-8 -v /usr/bin/docker:/tmp/docker:ro'
+
+      steps:
+          - checkout: self
+            fetchDepth: 10
+
+          - script: /tmp/docker exec -t -e LANG=C.UTF-8 -e LC_ALL=C.UTF-8 -u 0 ${{ parameters.job_name }} $(Build.SourcesDirectory)/etc/ci/install_sudo.sh ${{ parameters.package_manager }}
+            displayName: Install sudo
+
+          - script: ${{ parameters.install_packages }}
+            displayName: Install required packages
+
+          - script: ${{ parameters.install_python }}
+            displayName: 'Install Python ${{ parameters.python_version }}'
+
+          - script: ${{ parameters.python_path }} --version
+            displayName: 'Show Python version'
+
+          - script: PYTHON_EXE=${{ parameters.python_path }} ./configure --dev
+            displayName: 'Run Configure'
+
+          - script: ${{ parameters.test_suite }}
+            displayName: 'Run ${{ parameters.test_suite_label }} tests with py${{ parameters.python_version }} on ${{ parameters.job_name }}'

etc/ci/azure-posix.yml

@@ -31,6 +31,7 @@ jobs:
             displayName: 'Install Python $(python_version)'
 
           - script: |
+                python --version
                 python3 --version
                 python$(python_version) --version
                 echo "python$(python_version)" > PYTHON_EXECUTABLE

etc/ci/install_sudo.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+
+
+if [[ "$1" == "apt-get" ]]; then
+    apt-get update -y
+    apt-get -o DPkg::Options::="--force-confold" install -y sudo
+
+elif [[ "$1" == "yum" ]]; then
+    yum install -y sudo
+
+elif [[ "$1" == "dnf" ]]; then
+    dnf install -y sudo
+
+fi