Skip to content

Commit

Permalink
Merge pull request #3422 from nexB/release-prep-v32.0.3
Browse files Browse the repository at this point in the history
Fix scancode-toolkit-mini and release prep v32.0.3 #3421
  • Loading branch information
AyanSinhaMahapatra authored Jun 6, 2023
2 parents 4ec7a92 + e0c6dac commit 3282bc0
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 32 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/about-files-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,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 }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,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 }}

Expand Down
46 changes: 23 additions & 23 deletions .github/workflows/scancode-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ jobs:
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python on ${{ matrix.pyver }}
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.pyver }}

Expand Down Expand Up @@ -69,10 +69,10 @@ jobs:
fail-fast: true

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: "3.10"

Expand Down Expand Up @@ -103,10 +103,10 @@ jobs:
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python on ${{ matrix.pyver }}
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.pyver }}

Expand Down Expand Up @@ -137,10 +137,10 @@ jobs:
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python on ${{ matrix.pyver }}
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.pyver }}

Expand Down Expand Up @@ -171,10 +171,10 @@ jobs:
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python on ${{ matrix.pyver }}
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.pyver }}

Expand Down Expand Up @@ -202,10 +202,10 @@ jobs:
fail-fast: true

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: "3.10"

Expand Down Expand Up @@ -239,10 +239,10 @@ jobs:
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.pyver }}

Expand Down Expand Up @@ -285,10 +285,10 @@ jobs:
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.pyver }}

Expand Down Expand Up @@ -330,10 +330,10 @@ jobs:
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.pyver }}

Expand Down Expand Up @@ -371,10 +371,10 @@ jobs:
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.pyver }}

Expand Down Expand Up @@ -412,10 +412,10 @@ jobs:
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.pyver }} on ${{ matrix.os }}
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.pyver }}

Expand Down Expand Up @@ -577,7 +577,7 @@ jobs:

steps:
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: 3.8

Expand Down
5 changes: 5 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
---------------------

Expand Down
6 changes: 6 additions & 0 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,9 @@
.. role:: img-title-para
"""

# -- Options for LaTeX output -------------------------------------------------

latex_elements = {
'classoptions': ',openany,oneside'
}
4 changes: 2 additions & 2 deletions setup-mini.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = scancode-toolkit
version = 32.0.2
name = scancode-toolkit-mini
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
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/scancode_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3282bc0

Please sign in to comment.