Sync with SCTK settings

Also streamline test dependencies, remove mock for unittest.mock

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

MANIFEST.in

@@ -9,7 +9,7 @@ include *.rst
 include setup.*
 include configure*
 include requirements*
-include .git*
+include .giti*
 
 global-exclude *.py[co] __pycache__ *.*~
 

requirements-dev.txt

@@ -1,12 +1,23 @@
-atomicwrites==1.4.0
+bleach==4.1.0
+build==0.7.0
+commonmark==0.9.1
+docutils==0.18.1
+et-xmlfile==1.1.0
 execnet==1.9.0
 iniconfig==1.1.1
-mock==4.0.3
-packaging==21.0
-pluggy==0.13.1
-py==1.10.0
-pyparsing==2.4.7
-pytest==6.2.5
-pytest-forked==1.3.0
-pytest-xdist==2.3.0
-toml==0.10.2
+jeepney==0.7.1
+keyring==23.4.1
+openpyxl==3.0.9
+pep517==0.12.0
+pkginfo==1.8.2
+py==1.11.0
+pytest==7.0.1
+pytest-forked==1.4.0
+pytest-xdist==2.5.0
+readme-renderer==34.0
+requests-toolbelt==0.9.1
+rfc3986==1.5.0
+rich==12.3.0
+secretstorage==3.3.2
+tomli==1.2.3
+twine==3.8.0

requirements.txt

@@ -1,18 +1,80 @@
-attrs==21.2.0
+attrs==21.4.0
+banal==1.0.6
+beautifulsoup4==4.11.1
+binaryornot==0.4.4
 boolean.py==3.8
-certifi==2021.5.30
-click==8.0.1
+certifi==2021.10.8
+cffi==1.15.0
+chardet==4.0.0
+charset-normalizer==2.0.12
+click==8.0.4
 colorama==0.4.4
-importlib-metadata==4.8.1
-Jinja2==3.0.1
+commoncode==30.2.0
+construct==2.10.68
+container-inspector==31.0.0
+cryptography==36.0.2
+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.3
+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.0.3
+jsonstreams==0.6.0
 license-expression==21.6.14
+lxml==4.8.0
 MarkupSafe==2.0.1
-openpyxl==3.0.9
-packageurl-python==0.9.4
-pip==21.2.4
+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.12.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.27.1
+rpm-inspector-rpm==4.16.1.3.210404
 saneyaml==0.5.2
-setuptools==58.1.0
-typing-extensions==3.10.0.2
-wheel==0.37.0
-zipp==3.5.0
+six==1.16.0
+soupsieve==2.3.1
+spdx-tools==0.7.0a3
+text-unidecode==1.3
+toml==0.10.2
+typecode==30.0.0
+typecode-libmagic==5.39.210531
+urllib3==1.26.9
+urlpy==0.5
+wcwidth==0.2.5
+webencodings==0.5.1
+xmltodict==0.12.0
+zipp==3.6.0

setup.cfg

@@ -19,6 +19,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Topic :: Software Development
     Topic :: Software Development :: Documentation
     Topic :: Software Development :: Quality Assurance
@@ -34,6 +35,10 @@ keywords =
     attribution
     software
     inventory
+    open source
+    sca
+    SBOM
+    spdx
 
 license_files =
     apache-2.0.LICENSE
@@ -63,8 +68,6 @@ install_requires =
     packageurl_python >= 0.9.0
     saneyaml
 
-python_requires = >=3.6
-
 
 [options.packages.find]
 where = src
@@ -75,8 +78,6 @@ testing =
     pytest >= 6, != 7.0.0
     pytest-xdist >= 2
     black
-    mock
-    colorama
 
 docs =
     Sphinx >= 3.3.1

tests/test_api.py

@@ -13,9 +13,9 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 # ============================================================================
-import unittest
 
-import mock
+import unittest
+from unittest import mock
 
 from attributecode import api
 from attributecode import ERROR

tests/test_model.py

@@ -20,8 +20,8 @@
 import posixpath
 import shutil
 import unittest
+from unittest import mock
 
-import mock
 import saneyaml
 
 from attributecode import CRITICAL