Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
1562549
Initial commit
steven-esser Sep 22, 2020
85d1780
Add initial skeleton files
steven-esser Sep 22, 2020
aa71e06
Use pytest-xdist by default for threading support
steven-esser Sep 22, 2020
774dc7d
Add additional files
steven-esser Sep 23, 2020
9a56b88
Follow modern python packaging and conf practices
steven-esser Sep 25, 2020
565feee
Add some minimal documentation
steven-esser Sep 25, 2020
5febefb
Fix hanging tag chars in setup.cfg
steven-esser Sep 29, 2020
343ff29
Update README instructions with proper git merge conventions
steven-esser Sep 30, 2020
fa55f68
Add minimal .travis.yml CI config file
steven-esser Oct 16, 2020
3296b9f
Update setuptools_scm declaration
steven-esser Oct 22, 2020
ad02f4e
Merge pull request #1 from nexB/add-initial-skeleton-files
steven-esser Oct 22, 2020
083bd04
Add azure pipeline config files and templates
JonoYang Oct 26, 2020
847564e
Fix path to Scripts directory
JonoYang Oct 27, 2020
0f293cb
Install current project in configure.bat
JonoYang Oct 27, 2020
63f6946
Call pytest from proper location
JonoYang Oct 27, 2020
7fd2506
Use newer VM images on Azure
JonoYang Oct 27, 2020
bceb8f9
Add .gitattributes
JonoYang Oct 29, 2020
e772fe6
Clean template
JonoYang Nov 4, 2020
ae44984
Merge pull request #11 from nexB/add-ci-config
JonoYang Nov 4, 2020
5593c2f
Merge pull request #14 from nexB/develop
JonoYang Nov 5, 2020
629abed
Update .gitignore to ignore Jupyter temp files
AyanSinhaMahapatra Nov 5, 2020
6001c74
Merge pull request #15 from nexB/jupyter-patch
pombredanne Nov 5, 2020
ef210cd
Quick doc update
steven-esser Nov 16, 2020
0b6caf9
Add RTD docs configuration file
AyanSinhaMahapatra Dec 10, 2020
f2c1400
Add basic RTD documentaion #4
AyanSinhaMahapatra Dec 10, 2020
e7d1990
Add RTD requirements file and test scripts
AyanSinhaMahapatra Dec 10, 2020
7d37af0
Add `src` folder to pass CI tests and RTD builds
AyanSinhaMahapatra Dec 16, 2020
b6ef568
Merge pull request #16 from AyanSinhaMahapatra/add-basic-docs
steven-esser Dec 21, 2020
03ffc8a
Ensure we use official full text of Apache 2.0
pombredanne Jan 6, 2021
98d4d69
Merge pull request #18 from nexB/apache-license
steven-esser Jan 6, 2021
5e386d9
Never ever let Git convert line delimiters
pombredanne Jan 14, 2021
2e48dca
Run tests on more OSes and Python versions
pombredanne Jan 14, 2021
b959539
Do not make wheel universal
pombredanne Jan 14, 2021
98641a0
Format and add license
pombredanne Jan 14, 2021
9fa3f31
Format
pombredanne Jan 14, 2021
0b8cd65
Improve documentation
pombredanne Jan 14, 2021
3007691
Format for spaces
pombredanne Jan 14, 2021
b49895c
Add manifest for source distributions
pombredanne Jan 14, 2021
d3e2d28
Add Apache license NOTICE
pombredanne Jan 14, 2021
a2a1901
Merge pull request #19 from nexB/update-boilerplate
steven-esser Jan 19, 2021
f46bc48
Default to 64 bits windows on CI
pombredanne Jan 24, 2021
182532f
Use wheels embedded in virtualenv.pyz
pombredanne Jan 25, 2021
cd4e87b
Do not force an upgrade on virtualenv.pyz embeds
pombredanne Jan 25, 2021
51510cb
Fix .gitattributes
steven-esser Feb 11, 2021
386bb90
Merge pull request #21 from nexB/fix-gitattributes
steven-esser Feb 12, 2021
1c84e9e
Merge pull request #24 from nexB/use-venv-embeds
pombredanne May 7, 2021
d6fe59f
Update markers syntax for pytest
pombredanne May 7, 2021
ca6ab21
Add fallback version for setuptools_scm
pombredanne May 7, 2021
1364bbb
Add note for setuptools_scam fallback version
pombredanne May 11, 2021
be851b0
Use azure-posix.yml for linux and macOS
pombredanne May 11, 2021
4f0aecf
Adopt new configure script derived from ScanCode
pombredanne May 11, 2021
aa04429
Add notes on customization
pombredanne May 11, 2021
56ada8f
Adopt new configure --dev convention
pombredanne May 11, 2021
0dbcdc9
Clarify CHANGELOG to be Rst
pombredanne May 11, 2021
d21aef3
Add skeleton release notes to README.rst
pombredanne May 11, 2021
a75737d
Merge pull request #25 from nexB/new-configure
pombredanne May 12, 2021
3aeb2ec
Update format
pombredanne May 31, 2021
2c412e8
Add Python 3.9 to Travis
pombredanne May 31, 2021
69eec23
Format and remove spurious spaces
pombredanne May 31, 2021
0e09ad9
Bump to more modern version of setuptools_scm
pombredanne May 31, 2021
e339a70
Add space for correct syntax
pombredanne May 31, 2021
9dff54a
Create junction from Scripts to bin
chinyeungli Jun 17, 2021
b735a3f
Merge pull request #26 from nexB/windows-junction
pombredanne Jun 17, 2021
77ce5e4
Check for deps in local thirdparty directory #31
JonoYang Aug 31, 2021
fa13562
Merge pull request #32 from nexB/install-from-thirdparty-dir
JonoYang Aug 31, 2021
1bcaaa5
Enforce use of requirements.txt #34
JonoYang Sep 1, 2021
e9067c8
Add scripts from scancode-toolkit/etc/release/ #33
JonoYang Sep 2, 2021
0e1f56b
Normalize license in load_pkginfo_data #33
JonoYang Sep 2, 2021
288532d
Add --init option to configure #33
JonoYang Sep 2, 2021
a5ae4f3
Update README.rst #33
JonoYang Sep 2, 2021
593e237
Use venv as virtual environment directory name #37
JonoYang Sep 3, 2021
9342bc1
Update configure.bat #33
JonoYang Sep 3, 2021
45e4a2a
Add placeholder requirements.txt files #33
JonoYang Sep 3, 2021
944fbae
Handle multiple options in configure #33
JonoYang Sep 3, 2021
3532b22
Fix path to aboutcode in utils_thirdparty.py #33
JonoYang Sep 4, 2021
9c78ddb
Update release notes in README.rst
JonoYang Sep 4, 2021
ebcfb93
Handle ExpressionParseError #33
JonoYang Sep 4, 2021
6ab9c10
Update README.rst
pombredanne Sep 7, 2021
bfdc6ff
Address review comments #33
JonoYang Sep 7, 2021
8583d7f
Merge pull request #39 from nexB/update-skeleton
JonoYang Sep 8, 2021
71d8dad
Update READMEs
JonoYang Sep 8, 2021
d3b8524
Merge pull request #40 from nexB/add-scripts-readme
JonoYang Sep 8, 2021
d2bafb9
Fixed #41 - Handled encoding issue when generating ABOUT files
chinyeungli Sep 15, 2021
c41196a
Merge pull request #42 from nexB/41_fix_encoding_error
chinyeungli Oct 4, 2021
5671563
Treat text files as text
pombredanne Oct 5, 2021
14f6a2d
Add helper to publish files in GH releases
pombredanne Oct 5, 2021
1a2a144
Add code to use curl if wget is not installed
chinyeungli Oct 6, 2021
7aa7d4c
Do not issue warning if thirdparty dir is missing
pombredanne Oct 8, 2021
51d0c5c
Merge pull request #45 from nexB/open-as-text
pombredanne Oct 11, 2021
b46d84f
Handle as_text correctly in cache
pombredanne Oct 11, 2021
255a898
Handle as_text correctly in cache
pombredanne Oct 11, 2021
7b76f4a
Merge origin/as_text-cache
pombredanne Oct 15, 2021
1f065ae
Stream release scripts
pombredanne Oct 15, 2021
f79950d
Move skeleton script to etc/scripts
pombredanne Oct 15, 2021
8affca0
Fix typos
pombredanne Oct 15, 2021
3a5307c
Merge pull request #47 from nexB/as_text-cache
pombredanne Oct 15, 2021
24baa62
Use latest skeleton code
pombredanne Oct 18, 2021
e5833d1
Add support for Python 3.10
pombredanne Oct 18, 2021
0a0ef12
Adopt black style
pombredanne Oct 29, 2021
31ed446
Drop Ubuntu 16 add Python 3.10
pombredanne Oct 29, 2021
00aaa26
Merge pull request #48 from nexB/update-system
pombredanne Oct 29, 2021
2ce7c7a
Disable Python 3.10 tests on macOS 10.14
pombredanne Oct 29, 2021
1fa3699
Merge pull request #49 from nexB/update-system
pombredanne Oct 29, 2021
2cc2c5a
Add code to remove the symlink before creating
chinyeungli Nov 10, 2021
696a17a
Merge branch 'develop' of https://github.com/nexB/scancode-toolkit.gi…
pombredanne Nov 26, 2021
6b2320a
Improve handling licenses without scancode
pombredanne Nov 26, 2021
678f97a
Rename README
pombredanne Nov 26, 2021
3d5a5d4
Apply black style
pombredanne Nov 26, 2021
6ccff2b
Add support for deb and rpm containers
pombredanne Nov 26, 2021
6962f8b
Support licenses when ScanCode is not installed
pombredanne Nov 26, 2021
2f77f97
Improve wheel build
pombredanne Jan 12, 2022
cb7651a
REmove unused scripts
pombredanne Jan 12, 2022
0dd1d28
Use black
pombredanne Jan 12, 2022
48f4388
Merge latest main branch from nexB/skeleton
pombredanne Jan 12, 2022
784e701
Aligne with latest ScanCode TK updates
pombredanne Jan 12, 2022
9535d31
Merge latest main branch from nexB/skeleton
pombredanne Jan 12, 2022
9e06cda
Merge latest develop from upstream
pombredanne Jan 12, 2022
1345e08
Drop SCANCODE_DEV_MODE tag file
pombredanne Jan 12, 2022
a7c2efd
Do not ignore setup.py
pombredanne Jan 12, 2022
b1dabd8
Update scripts
pombredanne Jan 12, 2022
2dfa443
Finish adjustments for skeleton adoption
pombredanne Jan 12, 2022
d9ab0ef
Remove legacy travis CI
pombredanne Jan 12, 2022
e5a1fa1
Merge remote-tracking branch 'skeleton/main' into adopt-skeleton
pombredanne Jan 12, 2022
5827ae3
Use new pip and pkginfo parsers
pombredanne Jan 28, 2022
907bb60
Use dparse2, not dparse
pombredanne Jan 28, 2022
0eb2973
Bump pip-requirements-parser
pombredanne Jan 28, 2022
332e283
Remove unused moved test files #2524
pombredanne Jan 28, 2022
324064a
Adjust tests to use pip-requirements-parser
pombredanne Jan 28, 2022
bd5cb78
Use new pip requirements parser
pombredanne Jan 28, 2022
d06bbea
Complete switch to new PyPI parsers
pombredanne Jan 28, 2022
86c5710
Bump lxml to 4.6.5 and pin to 4.7.1
pombredanne Jan 28, 2022
7d3e45e
Bump packaging
pombredanne Jan 28, 2022
4fb0227
Complete migration to skeleton
pombredanne Jan 29, 2022
bcc541f
Use correct requirements extras for testing
pombredanne Jan 30, 2022
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
6 changes: 3 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# make sure end of lines are always lf
* text eol=lf
*.bat text eol=crlf
# Ignore all Git auto CR/LF line endings conversions
* -text
pyproject.toml export-subst

# data in the tests should be kept as is
**/data/** binary
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci-about-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ jobs:
run: ./configure --dev

- name: Activate VirtualEnv
run: source bin/activate
run: source venv/bin/activate

#- name: Check About Files in thirdparty
# run: ./bin/about check thirdparty/
# run: ./venv/bin/about check thirdparty/

- name: Check About Files in thirdparty
run: ./bin/about check src/
run: ./venv/bin/about check src/

- name: Check About Files in thirdparty
run: ./bin/about check etc/
run: ./venv/bin/about check etc/

- name: Check About Files in thirdparty
run: ./bin/about check scancode-toolkit.ABOUT
run: ./venv/bin/about check scancode-toolkit.ABOUT
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
# Python compiled files
*.py[cod]

# do not commit thriparty cache of wheels
# do not commit thirdparty cache of wheels
/thirdparty

# virtualenv and other misc bits
/src/*.egg-info
*.egg-info
/dist
/build
/bin
Expand All @@ -18,6 +19,7 @@
/Lib
/pip-selfcheck.json
/tmp
/venv
.Python
/include
/Include
Expand Down Expand Up @@ -83,6 +85,9 @@ lib64
tcl
/.env

# Ignore Jupyter Notebook related temp files
.ipynb_checkpoints/

*.orig
/release*
/00-*.txt
Expand Down
18 changes: 18 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# .readthedocs.yml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Where the Sphinx conf.py file is located
sphinx:
configuration: docs/source/conf.py

# Setting the python version and doc build requirements
python:
install:
- method: pip
path: .
extra_requirements:
- docs
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Changelog
=========


31.0.0 (next, roadmap)
-----------------------

Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,15 @@ To set up ScanCode for local development:

Then activate the virtual environment::

source bin/activate
source venv/bin/activate

or

. bin/activate
. venv/bin/activate

On Windows use::

Scripts\activate
venv\Scripts\activate

When you create a new terminal/shell to work on ScanCode rerun the activate step.

Expand Down
2 changes: 1 addition & 1 deletion INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Advanced installation: pip install a Python PyPI package

- Create a virtual environment for Python 3.x and activate it::

virtualenv -p python3 venv-scancode && source venv-scancode/bin/activate
virtualenv -p python3 venv && source venv/bin/activate

- Run ``pip install scancode-toolkit[full]``

Expand Down
8 changes: 5 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
graft src

graft thirdparty
recursive-include etc configure.py
graft etc/thirdparty
Expand All @@ -7,19 +8,20 @@ recursive-include etc/thirdparty *
include *.LICENSE
include NOTICE
include *.ABOUT

include *.toml
include *.yml
include *.rst
include setup.*
include configure*
include requirements*
include *.toml
include .git*

include extractcode*
include scancode*

# path to executable used by a built app
include PYTHON_EXECUTABLE

include *.rst
include Dockerfile
include .VERSION

Expand Down
1 change: 0 additions & 1 deletion apache-2.0.LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ build: off

test_script:
- python -c "import sys;print(sys.getdefaultencoding())"
- cmd: "set PYTHON_EXECUTABLE=%PYTHON%\\python.exe && configure --dev && Scripts\\pytest -vvs --reruns 2 tests\\scancode"
- cmd: "set PYTHON_EXECUTABLE=%PYTHON%\\python.exe && configure --dev && venv\\Scripts\\pytest -vvs tests\\scancode"
Loading