Merge main and fix conflicts

Signed-off-by: Thomas Druez <tdruez@nexb.com>

Author: tdruez

CHANGELOG.rst

@@ -5,11 +5,11 @@ v31.0.0 (next)
 ---------------
 
 - WARNING: Drop support for Python 3.6 and 3.7. Add support for Python 3.10.
-  Upgrade Django to version 4.x series.
+  Upgrade Django to version 4.1 series.
 
-- Upgrade ScanCode-toolkit to version v31.
+- Upgrade ScanCode-toolkit to version 31.0.1.
   See https://github.com/nexB/scancode-toolkit/blob/develop/CHANGELOG.rst for an
-  overview of the changes in v31 compared to v30.
+  overview of the changes in the v31 compared to v30.
 
 - Implement run status auto-refresh using the htmx JavaScript library.
   The statuses of queued and running pipeline are now automatically refreshed
@@ -98,6 +98,13 @@ v31.0.0 (next)
   how scancode-toolkit's JSON output returns ``package_uid``s in the
   ``for_packages`` field for Resources.
 
+- Add support for .tgz extension for input files in Docker pipeline
+  https://github.com/nexB/scancode.io/issues/499
+
+- Add support for resource missing file content in details view.
+  Refine the annotation using the new className instead of type.
+  https://github.com/nexB/scancode.io/issues/495
+
 v30.2.0 (2021-12-17)
 --------------------
 

Makefile

@@ -113,7 +113,7 @@ sqlitedb:
 	@$(MAKE) migrate
 
 run:
-	${MANAGE} runserver 8001 --insecure --noreload
+	${MANAGE} runserver 8001 --insecure
 
 test:
 	@echo "-> Run the test suite"

docs/installation.rst

@@ -75,12 +75,16 @@ An overview of the web application usage is available at :ref:`user_interface`.
 
 .. warning::
     To access a dockerized ScanCode.io app from a remote location, the ``ALLOWED_HOSTS``
-    setting needs to be provided in your ``.env`` file::
+    and ``CSRF_TRUSTED_ORIGINS`` settings need to be provided in your ``.env`` file,
+    for example::
 
-        ALLOWED_HOSTS=.domain.com,127.0.0.1
+        ALLOWED_HOSTS=.your-domain.com,127.0.0.1
+        CSRF_TRUSTED_ORIGINS=https://*.your-domain.com,http://127.0.0.1:8001
 
-    Refer to `Django ALLOWED_HOSTS settings <https://docs.djangoproject.com/
-    en/dev/ref/settings/#allowed-hosts>`_ for more details.
+    Refer to `ALLOWED_HOSTS settings <https://docs.djangoproject.com/
+    en/dev/ref/settings/#allowed-hosts>`_ and `CSRF_TRUSTED_ORIGINS settings
+    <https://docs.djangoproject.com/en/dev/ref/settings/
+    #std-setting-CSRF_TRUSTED_ORIGINS>`_ for more details.
 
 Execute a Command
 ^^^^^^^^^^^^^^^^^
@@ -170,7 +174,7 @@ Before you install ScanCode.io, make sure you have the following prerequisites:
 
  * **Python: versions 3.8 to 3.10** found at https://www.python.org/downloads/
  * **Git**: most recent release available at https://git-scm.com/
- * **PostgreSQL**: release 10 or later found at https://www.postgresql.org/ or
+ * **PostgreSQL**: release 11 or later found at https://www.postgresql.org/ or
    https://postgresapp.com/ on macOS
 
 .. _system_dependencies:

etc/thirdparty/virtualenv.pyz

@@ -1,7 +1,7 @@
 about_resource: virtualenv.pyz
 name: get-virtualenv
-version: 20.15.1
-download_url: https://github.com/pypa/get-virtualenv/raw/20.15.1/public/virtualenv.pyz
+version: 20.16.3
+download_url: https://github.com/pypa/get-virtualenv/raw/20.16.3/public/virtualenv.pyz
 description: virtualenv is a tool to create isolated Python environments.
 homepage_url: https://github.com/pypa/virtualenv
 license_expression: lgpl-2.1-plus AND (bsd-new OR apache-2.0) AND mit AND python AND bsd-new
@@ -10,4 +10,4 @@ copyright: Copyright (c) The Python Software Foundation and others
 redistribute: yes
 attribute: yes
 track_changes: yes
-package_url: pkg:github/pypa/get-virtualenv@20.15.1#public/virtualenv.pyz
+package_url: pkg:github/pypa/get-virtualenv@20.16.3#public/virtualenv.pyz

etc/thirdparty/virtualenv.pyz.ABOUT

@@ -30,9 +30,9 @@
 SCAN_NOTICE = Path(__file__).resolve().parent.joinpath("scan.NOTICE").read_text()
 
 
-# Turn off the warnings from the `parameter_expansion` and `cluecode` modules.
-warnings.filterwarnings("ignore", module="parameter_expansion")
-warnings.filterwarnings("ignore", module="cluecode")
+# Turn off the warnings for the following modules.
+warnings.filterwarnings("ignore", module="extractcode")
+warnings.filterwarnings("ignore", module="typecode")
 
 
 def command_line():

scancodeio/__init__.py

@@ -1,15 +1,13 @@
-about_resource: ace-1.4.12.min.js
+about_resource: ace-1.9.5.min.js
 name: ace
-version: 1.4.12
-download_url: https://github.com/ajaxorg/ace/archive/refs/tags/v1.4.12.tar.gz
+version: 1.9.5
+download_url: https://github.com/ajaxorg/ace/archive/refs/tags/v1.9.5.tar.gz
 description: Ajax.org Code Editor is a full featured source code highlighting editor that powers
   the Cloud9 IDE
 homepage_url: http://github.com/ajaxorg/ace
 license_expression: bsd-new
 attribute: yes
-checksum_md5: a7bcd799f947f9857fbbee050072e11f
-checksum_sha1: e017d626e433b1e0ca6b752cd60fb69c5d2af3dc
-package_url: pkg:npm/ace@1.4.12
+package_url: pkg:npm/ace@1.9.5
 licenses:
   - key: bsd-new
     name: BSD-3-Clause

scancodeio/static/ace-1.4.12.min.js

@@ -72,8 +72,8 @@ function setupTabs() {
 
       activeLink.classList.remove('is-active');
       $el.parentNode.classList.add('is-active');
-      activeTabContent.classList.remove('is-active');
-      targetTabContent.classList.add('is-active');
+      if (activeTabContent) activeTabContent.classList.remove('is-active');
+      if (targetTabContent) targetTabContent.classList.add('is-active');
     });
   });
 }