Skip to content

Restore help.html from nexB/scancode-licensedb#23 #3202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 18, 2023
Merged

Restore help.html from nexB/scancode-licensedb#23 #3202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9d2e19
Restore help.html from nexB/scancode-licensedb#23
AyanSinhaMahapatra Jan 17, 2023
d4fed87
Fix version issue in outdated
AyanSinhaMahapatra Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
517 changes: 334 additions & 183 deletions src/licensedcode/templates/help.html
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 27 additions & 4 deletions src/scancode/outdated.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@

import datetime
import json
import os
import logging
from os import path
import sys

from packvers import version as packaging_version
import requests
Expand All @@ -54,9 +55,22 @@

SELFCHECK_DATE_FMT = "%Y-%m-%dT%H:%M:%SZ"

TRACE = os.environ.get('SCANCODE_DEBUG_OUTDATED', False)

def logger_debug(*args):
pass


logger = logging.getLogger(__name__)
# logging.basicConfig(stream=sys.stdout)
# logger.setLevel(logging.WARNING)

if TRACE:

if TRACE:
logging.basicConfig(stream=sys.stdout)
logger.setLevel(logging.DEBUG)

def logger_debug(*args):
return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))


def total_seconds(td):
Expand All @@ -70,7 +84,7 @@ def total_seconds(td):
class VersionCheckState:

def __init__(self):
self.statefile_path = path.join(
self.statefile_path = os.path.join(
scancode_cache_dir, 'scancode-version-check.json')
self.lockfile_path = self.statefile_path + '.lockfile'
# Load the existing state
Expand Down Expand Up @@ -154,6 +168,11 @@ def fetch_newer_version(
State is stored in the scancode_cache_dir.
If `force` is True, redo a PyPI remote check.
"""
# If installed version is from git describe, only use the first part of it
# i.e. `v31.2.1-343-gd9d2e19e32` -> `v31.2.1`
if "-" in installed_version:
installed_version = installed_version.split("-")[0]

try:
installed_version = packaging_version.parse(installed_version)
state = VersionCheckState()
Expand Down Expand Up @@ -185,6 +204,10 @@ def fetch_newer_version(

latest_version = packaging_version.parse(latest_version)

if TRACE:
logger_debug(f"installed_version: {installed_version}, latest version: {latest_version}")
logger_debug(f"installed_version < latest_version: {installed_version < latest_version}")

# Determine if our latest_version is older
if (installed_version < latest_version
and installed_version.base_version != latest_version.base_version):
Expand Down
9 changes: 6 additions & 3 deletions tests/licensedcode/data/license_db/license_dump/bash-exception-gpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,12 @@
<a href="https://github.com/nexB/scancode-licensedb" target="_blank">GitHub</a> ·
<a href="https://www.aboutcode.org/" target="_blank">AboutCode</a>
</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>. Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a> 32.0.0b1 on Dec 22, 2022.</p>
<p>This is updated daily automatically with latest updates from the develop branch of scancode-toolkit, if any.</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>.
Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a>
32.0.0b1 on Dec 22, 2022.</p>
<p>SPDX Licenses list version: 3.19</p>

</footer>
</div>

Expand Down
9 changes: 6 additions & 3 deletions tests/licensedcode/data/license_db/license_dump/binary-linux-firmware.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,12 @@
<a href="https://github.com/nexB/scancode-licensedb" target="_blank">GitHub</a> ·
<a href="https://www.aboutcode.org/" target="_blank">AboutCode</a>
</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>. Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a> 32.0.0b1 on Dec 22, 2022.</p>
<p>This is updated daily automatically with latest updates from the develop branch of scancode-toolkit, if any.</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>.
Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a>
32.0.0b1 on Dec 22, 2022.</p>
<p>SPDX Licenses list version: 3.19</p>

</footer>
</div>

Expand Down
9 changes: 6 additions & 3 deletions tests/licensedcode/data/license_db/license_dump/bison-exception-2.0.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,12 @@
<a href="https://github.com/nexB/scancode-licensedb" target="_blank">GitHub</a> ·
<a href="https://www.aboutcode.org/" target="_blank">AboutCode</a>
</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>. Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a> 32.0.0b1 on Dec 22, 2022.</p>
<p>This is updated daily automatically with latest updates from the develop branch of scancode-toolkit, if any.</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>.
Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a>
32.0.0b1 on Dec 22, 2022.</p>
<p>SPDX Licenses list version: 3.19</p>

</footer>
</div>

Expand Down
9 changes: 6 additions & 3 deletions tests/licensedcode/data/license_db/license_dump/bison-exception-2.2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,12 @@
<a href="https://github.com/nexB/scancode-licensedb" target="_blank">GitHub</a> ·
<a href="https://www.aboutcode.org/" target="_blank">AboutCode</a>
</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>. Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a> 32.0.0b1 on Dec 22, 2022.</p>
<p>This is updated daily automatically with latest updates from the develop branch of scancode-toolkit, if any.</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>.
Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a>
32.0.0b1 on Dec 22, 2022.</p>
<p>SPDX Licenses list version: 3.19</p>

</footer>
</div>

Expand Down
9 changes: 6 additions & 3 deletions tests/licensedcode/data/license_db/license_dump/bittorrent-1.0.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,9 +482,12 @@
<a href="https://github.com/nexB/scancode-licensedb" target="_blank">GitHub</a> ·
<a href="https://www.aboutcode.org/" target="_blank">AboutCode</a>
</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>. Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a> 32.0.0b1 on Dec 22, 2022.</p>
<p>This is updated daily automatically with latest updates from the develop branch of scancode-toolkit, if any.</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>.
Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a>
32.0.0b1 on Dec 22, 2022.</p>
<p>SPDX Licenses list version: 3.19</p>

</footer>
</div>

Expand Down
9 changes: 6 additions & 3 deletions tests/licensedcode/data/license_db/license_dump/bittorrent-1.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,12 @@
<a href="https://github.com/nexB/scancode-licensedb" target="_blank">GitHub</a> ·
<a href="https://www.aboutcode.org/" target="_blank">AboutCode</a>
</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>. Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a> 32.0.0b1 on Dec 22, 2022.</p>
<p>This is updated daily automatically with latest updates from the develop branch of scancode-toolkit, if any.</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>.
Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a>
32.0.0b1 on Dec 22, 2022.</p>
<p>SPDX Licenses list version: 3.19</p>

</footer>
</div>

Expand Down
9 changes: 6 additions & 3 deletions tests/licensedcode/data/license_db/license_dump/bittorrent-1.2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,12 @@
<a href="https://github.com/nexB/scancode-licensedb" target="_blank">GitHub</a> ·
<a href="https://www.aboutcode.org/" target="_blank">AboutCode</a>
</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>. Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a> 32.0.0b1 on Dec 22, 2022.</p>
<p>This is updated daily automatically with latest updates from the develop branch of scancode-toolkit, if any.</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>.
Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a>
32.0.0b1 on Dec 22, 2022.</p>
<p>SPDX Licenses list version: 3.19</p>

</footer>
</div>

Expand Down
9 changes: 6 additions & 3 deletions tests/licensedcode/data/license_db/license_dump/bittorrent-eula.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,12 @@
<a href="https://github.com/nexB/scancode-licensedb" target="_blank">GitHub</a> ·
<a href="https://www.aboutcode.org/" target="_blank">AboutCode</a>
</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>. Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a> 32.0.0b1 on Dec 22, 2022.</p>
<p>This is updated daily automatically with latest updates from the develop branch of scancode-toolkit, if any.</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>.
Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a>
32.0.0b1 on Dec 22, 2022.</p>
<p>SPDX Licenses list version: 3.19</p>

</footer>
</div>

Expand Down
9 changes: 6 additions & 3 deletions tests/licensedcode/data/license_db/license_dump/boost-1.0.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,12 @@
<a href="https://github.com/nexB/scancode-licensedb" target="_blank">GitHub</a> ·
<a href="https://www.aboutcode.org/" target="_blank">AboutCode</a>
</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>. Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a> 32.0.0b1 on Dec 22, 2022.</p>
<p>This is updated daily automatically with latest updates from the develop branch of scancode-toolkit, if any.</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>.
Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a>
32.0.0b1 on Dec 22, 2022.</p>
<p>SPDX Licenses list version: 3.19</p>

</footer>
</div>

Expand Down
9 changes: 6 additions & 3 deletions tests/licensedcode/data/license_db/license_dump/boost-original.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,12 @@
<a href="https://github.com/nexB/scancode-licensedb" target="_blank">GitHub</a> ·
<a href="https://www.aboutcode.org/" target="_blank">AboutCode</a>
</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>. Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a> 32.0.0b1 on Dec 22, 2022.</p>
<p>This is updated daily automatically with latest updates from the develop branch of scancode-toolkit, if any.</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>.
Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a>
32.0.0b1 on Dec 22, 2022.</p>
<p>SPDX Licenses list version: 3.19</p>

</footer>
</div>

Expand Down
9 changes: 6 additions & 3 deletions tests/licensedcode/data/license_db/license_dump/bootloader-exception.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,12 @@
<a href="https://github.com/nexB/scancode-licensedb" target="_blank">GitHub</a> ·
<a href="https://www.aboutcode.org/" target="_blank">AboutCode</a>
</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>. Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a> 32.0.0b1 on Dec 22, 2022.</p>
<p>This is updated daily automatically with latest updates from the develop branch of scancode-toolkit, if any.</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>.
Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a>
32.0.0b1 on Dec 22, 2022.</p>
<p>SPDX Licenses list version: 3.19</p>

</footer>
</div>

Expand Down
9 changes: 6 additions & 3 deletions tests/licensedcode/data/license_db/license_dump/bsla.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,12 @@
<a href="https://github.com/nexB/scancode-licensedb" target="_blank">GitHub</a> ·
<a href="https://www.aboutcode.org/" target="_blank">AboutCode</a>
</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>. Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a> 32.0.0b1 on Dec 22, 2022.</p>
<p>This is updated daily automatically with latest updates from the develop branch of scancode-toolkit, if any.</p>
<p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>.
Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
<p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a>
32.0.0b1 on Dec 22, 2022.</p>
<p>SPDX Licenses list version: 3.19</p>

</footer>
</div>

Expand Down
Loading