Skip to content

Updated python and deps #578

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

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/docs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.9]
python-version: [3.10]

steps:
- name: Checkout code
Expand Down
8 changes: 6 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
==============================
Changelog

2024-09-16
Release 11.0.2

* Fixed the installation issues with docker (#571, #572)


2024-08-06
Release 11.0.1

* Update doc formatting
* Added fields type and types description into the spec
* Update link references of ownership from nexB to aboutcode-org

Signed-off-by: Chin Yeung Li <[email protected]>


2024-07-15
Release 11.0.0
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ RUN bash -c "source ./configure"
# Set entrypoint to be the aboutcode command, allows to run the generated docker image directly with the aboutcode arguments:
# `docker run (...) <containername> <about arguments>`
# Example: docker run --rm --name "aboutcode" -v ${PWD}:/project -v /tmp/result:/result aboutcode-toolkit attrib /project /result/c.html
ENTRYPOINT ["./bin/about"]
ENTRYPOINT ["./about"]
2 changes: 1 addition & 1 deletion about.ABOUT
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
about_resource: .
name: AboutCode-toolkit
version: 11.0.1
version: 11.0.2
author: Jillian Daguil, Chin Yeung Li, Philippe Ombredanne, Thomas Druez
copyright: Copyright (c) nexB Inc.
description: |
Expand Down
80 changes: 0 additions & 80 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,80 +0,0 @@
attrs==21.4.0
banal==1.0.6
beautifulsoup4==4.11.1
binaryornot==0.4.4
boolean.py==3.8
certifi==2023.7.22
cffi==1.15.0
chardet==4.0.0
charset-normalizer==2.0.12
click==8.0.4
colorama==0.4.4
commoncode==30.2.0
construct==2.10.68
container-inspector==31.0.0
cryptography==42.0.4
debian-inspector==30.0.0
dockerfile-parse==1.2.0
dparse2==0.6.1
extractcode==31.0.0
extractcode-7z==16.5.210531
extractcode-libarchive==3.5.1.210531
fasteners==0.17.3
fingerprints==1.0.3
ftfy==6.0.3
future==0.18.2
gemfileparser==0.8.0
html5lib==1.1
idna==3.7
importlib-metadata==4.8.3
inflection==0.5.1
intbitset==3.0.1
isodate==0.6.1
jaraco.functools==3.4.0
javaproperties==0.8.1
Jinja2==3.1.4
jsonstreams==0.6.0
license-expression==21.6.14
lxml==4.9.1
MarkupSafe==2.0.1
more-itertools==8.13.0
normality==2.3.3
packagedcode-msitools==0.101.210706
packageurl-python==0.9.9
packaging==21.3
parameter-expansion-patched==0.3.1
patch==1.16
pdfminer-six==20220506
pefile==2021.9.3
pip-requirements-parser==31.2.0
pkginfo2==30.0.0
pluggy==1.0.0
plugincode==30.0.0
ply==3.11
publicsuffix2==2.20191221
pyahocorasick==2.0.0b1
pycparser==2.21
pygmars==0.7.0
Pygments==2.15.0
pymaven-patch==0.3.0
pyparsing==3.0.8
pytz==2022.1
PyYAML==6.0
rdflib==5.0.0
regipy==2.3.1
requests==2.31.0
rpm-inspector-rpm==4.16.1.3.210404
saneyaml==0.5.2
six==1.16.0
soupsieve==2.3.1
spdx-tools==0.7.0rc0
text-unidecode==1.3
toml==0.10.2
typecode==30.0.0
typecode-libmagic==5.39.210531
urllib3==1.26.19
urlpy==0.5
wcwidth==0.2.5
webencodings==0.5.1
xmltodict==0.12.0
zipp==3.6.0
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ install_requires =
license_expression >= 0.94
openpyxl
packageurl_python >= 0.9.0
requests
saneyaml


Expand Down
2 changes: 1 addition & 1 deletion src/attributecode/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import saneyaml

__version__ = '11.0.1'
__version__ = '11.0.2'

__about_spec_version__ = '4.0.0'

Expand Down
8 changes: 6 additions & 2 deletions src/attributecode/attrib.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,12 @@ def generate_sctk_input(abouts, min_license_score, license_dict):
for key in lic_key:
lic_name.append(license_dict[key][0])
lic_score = about.license_score.value
assert len(lic_key) == len(lic_name)
assert len(lic_key) == len(lic_score)
if len(lic_key) != len(lic_name):
raise ValueError("Mismatch in length: 'lic_key' and 'lic_name' must have the same number of elements")

if len(lic_key) != len(lic_score):
raise ValueError("Mismatch in length: 'lic_key' and 'lic_score' must have the same number of elements")


lic_key_expression = about.license_key_expression.value
if lic_key_expression:
Expand Down
Loading