From e3aaf6309e65ad8d814d9713a20d4e930b07cbe9 Mon Sep 17 00:00:00 2001 From: Arijit De Date: Wed, 31 May 2023 20:50:06 +0530 Subject: [PATCH 1/5] Publish PDF version of RTD documentation Made changes in the .readthedocs.yaml to enable format for downloading pdf and epub versions of the documentation and added latex_elements in the conf.py file which generates the pdf without blank pages. The minimum version requirement for sphinx was 6.2.1 which was causing build failure in read the docs, hence changing it 3.3.1 as written in setup.cfg of nexB/aboutcode Signed-off-by: Arijit De --- .readthedocs.yml | 5 +++++ docs/source/conf.py | 6 ++++++ setup.cfg | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 1b71cd9e13d..2a7dc0b40d1 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -5,6 +5,11 @@ # Required version: 2 +# Build PDF & ePub +formats: + - epub + - pdf + # Where the Sphinx conf.py file is located sphinx: configuration: docs/source/conf.py diff --git a/docs/source/conf.py b/docs/source/conf.py index d5435e75591..39835c69400 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -95,3 +95,9 @@ .. role:: img-title-para """ + +# -- Options for LaTeX output ------------------------------------------------- + +latex_elements = { + 'classoptions': ',openany,oneside' +} \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 18bfbdecb13..b02fd346365 100644 --- a/setup.cfg +++ b/setup.cfg @@ -58,6 +58,6 @@ testing = isort docs = - Sphinx == 6.2.1 + Sphinx == 5.1.0 sphinx-rtd-theme >= 0.5.0 doc8 >= 0.8.1 From c205cee2e6d4f3e3e1642131cdf8b7e0bf1c3cb6 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Tue, 6 Jun 2023 21:13:44 +0530 Subject: [PATCH 2/5] Fix scancode-toolkit-mini release #3421 Set the package name in setup-mini.cfg as scancode-toolkit-mini to correctly generate the wheels. Signed-off-by: Ayan Sinha Mahapatra --- setup-mini.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-mini.cfg b/setup-mini.cfg index 2182b1557a4..f9cca2c4a9f 100644 --- a/setup-mini.cfg +++ b/setup-mini.cfg @@ -1,5 +1,5 @@ [metadata] -name = scancode-toolkit +name = scancode-toolkit-mini version = 32.0.2 license = Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft From 5be7a24d3f6b581f3dd9aef193923a4a23420dea Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Tue, 6 Jun 2023 21:46:49 +0530 Subject: [PATCH 3/5] Bump github actions versions #75 Update the following actions: * actions/checkout * actions/setup-python Reference: https://github.com/nexB/skeleton/issues/75 Signed-off-by: Ayan Sinha Mahapatra --- .github/workflows/docs-ci.yml | 4 ++-- .github/workflows/pypi-release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs-ci.yml b/.github/workflows/docs-ci.yml index 18a44aa0846..511b7c283a6 100644 --- a/.github/workflows/docs-ci.yml +++ b/.github/workflows/docs-ci.yml @@ -13,10 +13,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml index 22315ff0e8d..4ebe10d1406 100644 --- a/.github/workflows/pypi-release.yml +++ b/.github/workflows/pypi-release.yml @@ -24,9 +24,9 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@master + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: 3.9 From 264822b08c809f0243070aac6434a3a93bf37c70 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Tue, 6 Jun 2023 22:06:08 +0530 Subject: [PATCH 4/5] Bump version to v32.0.3 Signed-off-by: Ayan Sinha Mahapatra --- setup-mini.cfg | 2 +- setup.cfg | 2 +- src/scancode_config.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/setup-mini.cfg b/setup-mini.cfg index f9cca2c4a9f..88f2172ea52 100644 --- a/setup-mini.cfg +++ b/setup-mini.cfg @@ -1,6 +1,6 @@ [metadata] name = scancode-toolkit-mini -version = 32.0.2 +version = 32.0.3 license = Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft # description must be on ONE line https://github.com/pypa/setuptools/issues/1390 diff --git a/setup.cfg b/setup.cfg index 4ef865bd72c..b843b6e5dfe 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = scancode-toolkit -version = 32.0.2 +version = 32.0.3 license = Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft # description must be on ONE line https://github.com/pypa/setuptools/issues/1390 diff --git a/src/scancode_config.py b/src/scancode_config.py index 630f446bda8..9b7a24cf86c 100644 --- a/src/scancode_config.py +++ b/src/scancode_config.py @@ -132,11 +132,11 @@ def _create_dir(location): # 4. hardcoded This is the default, fallback version in case package is not installed or we # do not have a proper version otherwise. if not __version__: - __version__ = '32.0.2' + __version__ = '32.0.3' ####################### # used to warn user when the version is out of date -__release_date__ = datetime.datetime(2023, 5, 26) +__release_date__ = datetime.datetime(2023, 6, 6) # See https://github.com/nexB/scancode-toolkit/issues/2653 for more information # on the data format version From e0c6dac97dd53e661e09fca21faeafaae71b566d Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Tue, 6 Jun 2023 22:15:39 +0530 Subject: [PATCH 5/5] Update CHANGELOG for v32.0.3 Signed-off-by: Ayan Sinha Mahapatra --- CHANGELOG.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 298539dab36..9653ae2e7c6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -42,6 +42,18 @@ v32.1.0 (next, roadmap) See https://github.com/nexB/scancode-toolkit/issues/1745 +v32.0.3 - 2023-05-26 +--------------------- + +This is a minor bugfix release with the following updates: + +- We were missing scancode-toolkit-mini releases from v32.0.0rc2 and + also the scancode-toolkit release wheels including and after v32.0.0rc2 were + actually scancode-toolkit-mini releases. + Reference: https://github.com/nexB/scancode-toolkit/issues/3421 + +- Updated github actions, for more details see https://github.com/nexB/skeleton/issues/75 + v32.0.2 - 2023-05-26 ---------------------