Skip to content
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.

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

Merge latest skeleton into scancode #3305

Merged
merged 47 commits into from
Apr 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
421d175
New repository initialized by cvs2svn.
Feb 28, 2003
5664513
Initial commit
agustinhenze Jul 31, 2013
c7ba5bd
Initial commit
Jun 13, 2017
c83207d
Initial commit
pombredanne Jan 18, 2020
7ab4312
Merge branch 'dlt-master'
pombredanne Jan 18, 2020
61af9f9
Merge remote-tracking branch 'puppeter/basic' into adopt-vers-spec
pombredanne Nov 23, 2021
04c5de3
Merge remote-tracking branch 'rubygems/master' into refinements
pombredanne Dec 6, 2021
dd188e4
Merge pull request #14 from nexB/refinements
pombredanne Jan 10, 2022
5351f0b
automate pypi release on a tag
TG1999 Feb 17, 2022
96b6405
Refine GH Action definition
pombredanne Feb 18, 2022
635df78
Format GH action yaml
pombredanne Feb 18, 2022
6bbeddd
Use verbose name for job
pombredanne Feb 18, 2022
5431ee5
Properly check for existance of thirdparty dir
JonoYang Apr 28, 2022
435e9ee
Merge pull request #66 from nexB/check-for-thirdparty-dir
JonoYang Apr 28, 2022
b02d5d5
Merge remote-tracking branch 'uni/main' into main
pombredanne Apr 29, 2022
c44c442
Improve GH action documentation
pombredanne Apr 29, 2022
99ba101
Use Python 3.9 as a base for actions
pombredanne Apr 29, 2022
00f4fe7
Remove variable from string in fetch_thirdparty.py
JonoYang Apr 29, 2022
5d48c1c
Improve thirdparty scripts
pombredanne May 2, 2022
6a3c5b0
Update thirdparty fetching utilities
pombredanne May 7, 2022
ff348f5
Format code with black
pombredanne May 9, 2022
d35d4fe
Only use PyPI for downloads
pombredanne May 10, 2022
154144b
Enable automatic release on tag
pombredanne May 12, 2022
1165f12
Remove Travis config
pombredanne May 25, 2022
c1f70fc
Add ScanCode Code of Conduct
pombredanne May 27, 2022
9acab17
Improve detection of thirdparty dir
pombredanne May 27, 2022
4dc2521
Add comment
pombredanne May 29, 2022
04a872c
Remove the thirdparty directory
chinyeungli Sep 22, 2022
07cd736
Update the azure-piprlines
chinyeungli Sep 22, 2022
509b032
Add missing os import in utils_requirements.py
JonoYang Oct 18, 2022
c6bba07
Reinstate Ubuntu 18 and drop Python 3.6 and 3.7
pombredanne Nov 25, 2022
bec5391
Merge pull request #68 from nexB/remove_thirdparty_and_update_ci
pombredanne Nov 25, 2022
1bd7a2f
Replace packaging with packvers
swastkk Jan 5, 2023
5be2690
Merge pull request #71 from swastkk/packvers-added
pombredanne Jan 12, 2023
6f21d2b
Ignore egginfo
pombredanne Jan 15, 2023
f841c2f
Drop Python 3.7 add Python 3.11
pombredanne Jan 15, 2023
bd2a464
Clean .cache and .eggs
pombredanne Jan 15, 2023
6270a88
Add COC to redistributed license-like files
pombredanne Jan 15, 2023
d3a19bd
Add new Makefile
pombredanne Jan 15, 2023
91f5613
Align scripts with latest ScanCode Toolkit
pombredanne Jan 15, 2023
1205bc0
Merge latest main branch
pombredanne Jan 15, 2023
e985492
Remove deprecated github-actions/azure images
AyanSinhaMahapatra Mar 28, 2023
3349130
Merge pull request #73 from nexB/update-ci-images
AyanSinhaMahapatra Mar 29, 2023
d964e02
Merge skeleton/main branch into scancode
AyanSinhaMahapatra Apr 4, 2023
b7c1f5d
Merge remote-tracking branch 'skeleton/main' into update-skeleton-ci-…
AyanSinhaMahapatra Apr 4, 2023
e64a4cc
Remove deprecated ubuntu18 images
AyanSinhaMahapatra Apr 5, 2023
cb971ce
Remove sample.json
AyanSinhaMahapatra Apr 5, 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
23 changes: 3 additions & 20 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,6 @@ jobs:
venv/bin/pytest -vvs --test-suite=plugins \
tests/licensedcode/test_additional_license.py

- template: etc/ci/azure-posix.yml
parameters:
job_name: ubuntu18_cpython
image_name: ubuntu-18.04
python_versions: ['3.8', '3.9', '3.10', '3.11']
python_architecture: x64
test_suites:
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py --reruns 2

- template: etc/ci/azure-posix.yml
parameters:
job_name: ubuntu20_cpython
Expand Down Expand Up @@ -147,9 +138,9 @@ jobs:

- template: etc/ci/azure-win.yml
parameters:
job_name: win2019_cpython_2
image_name: windows-2019
python_versions: ['3.9', '3.10', '3.11']
job_name: win2022_cpython
image_name: windows-2022
python_versions: ['3.8', '3.9', '3.10', '3.11']
python_architecture: x64
test_suites:
all: venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py --reruns 2
Expand Down Expand Up @@ -206,14 +197,6 @@ jobs:
test_suites:
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py

- template: etc/ci/azure-posix.yml
parameters:
job_name: ubuntu18_cpython_latest_from_pip
image_name: ubuntu-18.04
python_versions: ['3.8', '3.9', '3.10', '3.11']
test_suites:
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py

- template: etc/ci/azure-posix.yml
parameters:
job_name: ubuntu20_cpython_latest_from_pip
Expand Down
10 changes: 9 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ PROD_REQUIREMENTS="scancode_toolkit*.whl"
VIRTUALENV_DIR=venv

# Cleanable files and directories to delete with the --clean option
CLEANABLE="build venv"
CLEANABLE="build dist venv .cache .eggs"

# extra arguments passed to pip
PIP_EXTRA_ARGS=" "
Expand All @@ -175,6 +175,13 @@ CFG_ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
CFG_BIN_DIR=$CFG_ROOT_DIR/$VIRTUALENV_DIR/bin


################################
# Install with or without and index. With "--no-index" this is using only local wheels
# This is an offline mode with no index and no network operations
# NO_INDEX="--no-index "
NO_INDEX=""


################################
# Thirdparty package locations and index handling
# Find packages from the local thirdparty directory if present
Expand Down Expand Up @@ -308,6 +315,7 @@ while getopts :-: optchar; do
esac
done


PIP_EXTRA_ARGS="$PIP_EXTRA_ARGS"

find_python
Expand Down
2 changes: 1 addition & 1 deletion configure.bat
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ set "REL_REQUIREMENTS=--requirement etc/scripts/requirements.txt"
set "VIRTUALENV_DIR=venv"

@rem # Cleanable files and directories to delete with the --clean option
set "CLEANABLE=build venv"
set "CLEANABLE=build dist venv .cache .eggs"

@rem # extra arguments passed to pip
set "PIP_EXTRA_ARGS= "
Expand Down
12 changes: 5 additions & 7 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.intersphinx',
"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),
"aboutcode": ("https://aboutcode.readthedocs.io/en/latest/", None),
"scancode-workbench": ("https://scancode-workbench.readthedocs.io/en/develop/", None),
}


Expand All @@ -62,7 +62,7 @@
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ["_static"]

master_doc = 'index'
master_doc = "index"

html_context = {
"display_github": True,
Expand All @@ -72,9 +72,7 @@
"conf_py_path": "/docs/source/", # path in the checkout to the docs root
}

html_css_files = [
'_static/theme_overrides.css'
]
html_css_files = ["_static/theme_overrides.css"]


# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
Expand Down
8 changes: 4 additions & 4 deletions etc/scripts/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Pre-requisites
virtualenv or in the the main configured development virtualenv.
These requireements need to be installed::

pip install --requirement etc/release/requirements.txt
pip install --requirement etc/scripts/requirements.txt

TODO: we need to pin the versions of these tools

Expand All @@ -34,7 +34,7 @@ Scripts
~~~~~~~

**gen_requirements.py**: create/update requirements files from currently
installed requirements.
installed requirements.

**gen_requirements_dev.py** does the same but can subtract the main requirements
to get extra requirements used in only development.
Expand All @@ -50,7 +50,7 @@ The sequence of commands to run are:

./configure --clean
./configure
python etc/release/gen_requirements.py --site-packages-dir <path to site-packages dir>
python etc/scripts/gen_requirements.py --site-packages-dir <path to site-packages dir>

* You can optionally install or update extra main requirements after the
./configure step such that these are included in the generated main requirements.
Expand All @@ -59,7 +59,7 @@ The sequence of commands to run are:

./configure --clean
./configure --dev
python etc/release/gen_requirements_dev.py --site-packages-dir <path to site-packages dir>
python etc/scripts/gen_requirements_dev.py --site-packages-dir <path to site-packages dir>

* You can optionally install or update extra dev requirements after the
./configure step such that these are included in the generated dev
Expand Down
Loading