Fix test failures

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>

Author: AyanSinhaMahapatra

Makefile

@@ -38,8 +38,6 @@ check:
 	@echo "-> Run Ruff format validation"
 	@${ACTIVATE} ruff format --check
 	@$(MAKE) doc8
-	@echo "-> Run ABOUT files validation"
-	@${ACTIVATE} about check etc/
 
 clean:
 	@echo "-> Clean the Python env"

README.rst

@@ -34,9 +34,8 @@ license expression engine in several projects and products such as:
 
 - AboutCode-toolkit https://github.com/aboutcode-org/aboutcode-toolkit
 - AlekSIS (School Information System) https://edugit.org/AlekSIS/official/AlekSIS-Core
-- Barista https://github.com/Optum/barista
 - Conda forge tools https://github.com/conda-forge/conda-smithy
-- DejaCode https://dejacode.com
+- DejaCode https://enterprise.dejacode.com
 - DeltaCode https://github.com/nexB/deltacode
 - FenixscanX https://github.com/SmartsYoung/FenixscanX
 - FetchCode https://github.com/aboutcode-org/fetchcode
@@ -49,7 +48,7 @@ license expression engine in several projects and products such as:
 - SecObserve https://github.com/MaibornWolff/SecObserve
 
 See also for details:
-- https://spdx.github.io/spdx-spec/appendix-IV-SPDX-license-expressions/
+- https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions
 
 ``license-expression`` is also packaged for most Linux distributions. See below.
 
@@ -65,17 +64,6 @@ libraries in other languages (but not as powerful of course!):
 - Ada https://github.com/Fabien-Chouteau/spdx_ada
 - Java https://github.com/spdx/tools and https://github.com/aschet/spdx-license-expression-tools
 
-Build and tests status
-======================
-
-+--------------------------+------------------------+----------------------------------+
-|**Linux & macOS (Travis)**| **Windows (AppVeyor)** |**Linux, Windows & macOS (Azure)**|
-+==========================+========================+==================================+
-|                          |                        |                                  |
-| |travis-badge-icon|      | |appveyor-badge-icon|  |   |azure-badge-icon|             |
-|                          |                        |                                  |
-+--------------------------+------------------------+----------------------------------+
-
 Source code and download
 ========================
 
@@ -125,36 +113,36 @@ validate, compare, simplify and normalize license expressions.
 
 Create an SPDX Licensing and parse expressions::
 
-	>>> from license_expression import get_spdx_licensing
-	>>> licensing = get_spdx_licensing()
-	>>> expression = ' GPL-2.0 or LGPL-2.1 and mit '
-	>>> parsed = licensing.parse(expression)
-	>>> print(parsed.pretty())
-	OR(
-	  LicenseSymbol('GPL-2.0-only'),
-	  AND(
-	    LicenseSymbol('LGPL-2.1-only'),
-	    LicenseSymbol('MIT')
-	  )
-	)
-
-	>>> str(parsed)
-	'GPL-2.0-only OR (LGPL-2.1-only AND MIT)'
-
-	>>> licensing.parse('unknwon with foo', validate=True, strict=True)
-	license_expression.ExpressionParseError: A plain license symbol cannot be used
-	as an exception in a "WITH symbol" statement. for token: "foo" at position: 13
-
-	>>> licensing.parse('unknwon with foo', validate=True)
-	license_expression.ExpressionError: Unknown license key(s): unknwon, foo
-
-	>>> licensing.validate('foo and MIT and GPL-2.0+')
-	ExpressionInfo(
-	    original_expression='foo and MIT and GPL-2.0+',
-	    normalized_expression=None,
-	    errors=['Unknown license key(s): foo'],
-	    invalid_symbols=['foo']
-	)
+    >>> from license_expression import get_spdx_licensing
+    >>> licensing = get_spdx_licensing()
+    >>> expression = ' GPL-2.0 or LGPL-2.1 and mit '
+    >>> parsed = licensing.parse(expression)
+    >>> print(parsed.pretty())
+    OR(
+      LicenseSymbol('GPL-2.0-only'),
+      AND(
+        LicenseSymbol('LGPL-2.1-only'),
+        LicenseSymbol('MIT')
+      )
+    )
+
+    >>> str(parsed)
+    'GPL-2.0-only OR (LGPL-2.1-only AND MIT)'
+
+    >>> licensing.parse('unknwon with foo', validate=True, strict=True)
+    license_expression.ExpressionParseError: A plain license symbol cannot be used
+    as an exception in a "WITH symbol" statement. for token: "foo" at position: 13
+
+    >>> licensing.parse('unknwon with foo', validate=True)
+    license_expression.ExpressionError: Unknown license key(s): unknwon, foo
+
+    >>> licensing.validate('foo and MIT and GPL-2.0+')
+    ExpressionInfo(
+        original_expression='foo and MIT and GPL-2.0+',
+        normalized_expression=None,
+        errors=['Unknown license key(s): foo'],
+        invalid_symbols=['foo']
+    )
 
 
 Create a simple Licensing and parse expressions::
@@ -243,20 +231,3 @@ Development
 - On Windows run  ``configure.bat --dev`` and then ``Scripts\bin\activate`` instead.
 
 - To run the tests, run ``pytest -vvs``
-
-
-.. |travis-badge-icon| image:: https://api.travis-ci.org/nexB/license-expression.png?branch=master
-    :target: https://travis-ci.org/nexB/license-expression
-    :alt: Travis tests status
-    :align: middle
-
-.. |appveyor-badge-icon| image:: https://ci.appveyor.com/api/projects/status/github/nexB/license-expression?svg=true
-    :target: https://ci.appveyor.com/project/nexB/license-expression
-    :alt: Appveyor tests status
-    :align: middle
-
-.. |azure-badge-icon| image:: https://dev.azure.com/nexB/license-expression/_apis/build/status/nexB.license-expression?branchName=master
-    :target: https://dev.azure.com/nexB/license-expression/_build/latest?definitionId=2&branchName=master
-    :alt: Azure pipelines tests status
-    :align: middle
-

docs/source/conf.py

@@ -12,7 +12,7 @@
 import pathlib
 import sys
 
-srcdir = pathlib.Path(__file__).resolve().parents[2].joinpath('src')
+srcdir = pathlib.Path(__file__).resolve().parents[2].joinpath("src")
 sys.path.insert(0, srcdir.as_posix())
 
 # -- Project information -----------------------------------------------------
@@ -40,7 +40,7 @@
 
 # FIXME: including AND, NOT and OR will result in endless recursion
 autodoc_default_options = {
-    'exclude-members': 'AND, NOT, OR',
+    "exclude-members": "AND, NOT, OR",
 }
 
 
@@ -61,7 +61,7 @@
 }
 
 # Setting for sphinxcontrib.apidoc to automatically create API documentation.
-apidoc_module_dir = srcdir.joinpath('license_expression').as_posix()
+apidoc_module_dir = srcdir.joinpath("license_expression").as_posix()
 
 # Reference to other Sphinx documentations
 intersphinx_mapping = {

docs/source/index.rst

@@ -7,6 +7,7 @@ Welcome to license-expressions's documentation!
 
    readme_link
    API<api/modules>
+   contribute/contrib_doc
 
 Indices and tables
 ==================