Skip to content

Commit af339f8

Browse files
authored
Merge pull request #227 from aboutcode-org/release-prep
Prepare Release 0.14.0
2 parents 988a063 + 588f559 commit af339f8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+973
-752
lines changed

.github/workflows/docs-ci.yml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,29 @@ on: [push, pull_request]
44

55
jobs:
66
build:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-24.04
88

99
strategy:
1010
max-parallel: 4
1111
matrix:
12-
python-version: [3.9]
12+
python-version: [3.12]
1313

1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717

1818
- name: Set up Python ${{ matrix.python-version }}
19-
uses: actions/setup-python@v4
19+
uses: actions/setup-python@v5
2020
with:
2121
python-version: ${{ matrix.python-version }}
2222

23-
- name: Give permission to run scripts
24-
run: chmod +x ./docs/scripts/doc8_style_check.sh
25-
2623
- name: Install Dependencies
27-
run: pip install -e .[docs]
24+
run: ./configure --dev
2825

29-
- name: Check Sphinx Documentation build minimally
30-
working-directory: ./docs
31-
run: sphinx-build -E -W source build
26+
- name: Check documentation and HTML for errors and dead links
27+
run: make docs-check
3228

33-
- name: Check for documentation style errors
34-
working-directory: ./docs
35-
run: ./scripts/doc8_style_check.sh
29+
- name: Check documentation for style errors
30+
run: make doc8
3631

3732

.github/workflows/pypi-release.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,24 @@ on:
2121
jobs:
2222
build-pypi-distribs:
2323
name: Build and publish library to PyPI
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-24.04
2525

2626
steps:
2727
- uses: actions/checkout@v4
2828
- name: Set up Python
29-
uses: actions/setup-python@v4
29+
uses: actions/setup-python@v5
3030
with:
31-
python-version: 3.9
31+
python-version: 3.12
3232

33-
- name: Install pypa/build
34-
run: python -m pip install build --user
33+
- name: Install pypa/build and twine
34+
run: python -m pip install --user build twine
3535

3636
- name: Build a binary wheel and a source tarball
3737
run: python -m build --sdist --wheel --outdir dist/
3838

39+
- name: Validate wheel and sdis for Pypi
40+
run: python -m twine check dist/*
41+
3942
- name: Upload built archives
4043
uses: actions/upload-artifact@v4
4144
with:
@@ -47,7 +50,7 @@ jobs:
4750
name: Create GH release
4851
needs:
4952
- build-pypi-distribs
50-
runs-on: ubuntu-20.04
53+
runs-on: ubuntu-24.04
5154

5255
steps:
5356
- name: Download built archives
@@ -57,7 +60,7 @@ jobs:
5760
path: dist
5861

5962
- name: Create GH release
60-
uses: softprops/action-gh-release@v1
63+
uses: softprops/action-gh-release@v2
6164
with:
6265
draft: true
6366
files: dist/*
@@ -67,7 +70,7 @@ jobs:
6770
name: Create PyPI release
6871
needs:
6972
- create-gh-release
70-
runs-on: ubuntu-20.04
73+
runs-on: ubuntu-24.04
7174

7275
steps:
7376
- name: Download built archives

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,5 @@ tcl
7272

7373
# Ignore Jupyter Notebook related temp files
7474
.ipynb_checkpoints/
75+
/.ruff_cache/
76+
.env

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ python:
2626
- method: pip
2727
path: .
2828
extra_requirements:
29-
- docs
29+
- dev

CHANGELOG.rst

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
Changelog
22
=========
33

4-
v0.13.2
4+
v0.14.0
55
-----------
66

77
- Speed up downloads with asyncio
88

9+
- Introduce file-based locking when reading and writing
10+
python package archives to avoid accessing partial zip and tarballs.
11+
912
- New settings featuring environment variables and .env file to store settings and defaults.
1013

1114
- This also changes the CACHE_THIRDPARTY_DIR environment variable: it used to default first
@@ -36,6 +39,8 @@ v0.13.2
3639

3740
- Merge latest skeleton and adopt ruff for code formatting.
3841

42+
- Fix misc bugs.
43+
3944

4045
v0.13.1
4146
-----------
@@ -100,7 +105,8 @@ v0.9.5
100105
v0.9.4
101106
------
102107

103-
- Create PyPI cache location in the home directory if a cache directory cannot be made at the project root.
108+
- Create PyPI cache location in the home directory if a cache directory cannot be made at the
109+
project root.
104110
- Replace packaging with packvers.
105111
- Prevent duplicated package versions.
106112

MANIFEST.in

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
11
graft src
2+
graft docs
3+
graft etc
24

35
include *.LICENSE
46
include NOTICE
57
include *.ABOUT
68
include *.toml
79
include *.yml
810
include *.rst
11+
include *.png
912
include setup.*
1013
include configure*
1114
include requirements*
12-
include .git*
15+
include .dockerignore
16+
include .gitignore
17+
include .readthedocs.yml
18+
include manage.py
19+
include Dockerfile*
20+
include Makefile
21+
include MANIFEST.in
1322

14-
global-exclude *.py[co] __pycache__ *.*~
23+
include .VERSION
1524

25+
global-exclude *.py[co] __pycache__ *.*~

Makefile

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,33 @@ PYTHON_EXE?=python3
1313
VENV=venv
1414
ACTIVATE?=. ${VENV}/bin/activate;
1515

16-
dev:
17-
@echo "-> Configure the development envt."
18-
./configure --dev
1916

20-
isort:
21-
@echo "-> Apply isort changes to ensure proper imports ordering"
22-
${VENV}/bin/isort --sl -l 100 src tests setup.py --skip-glob "*/_packagedcode/*"
17+
conf:
18+
@echo "-> Install dependencies"
19+
./configure
2320

24-
black:
25-
@echo "-> Apply black code formatter"
26-
${VENV}/bin/black -l 100 src tests setup.py --exclude "_packagedcode/.*"
21+
dev:
22+
@echo "-> Configure and install development dependencies"
23+
./configure --dev
2724

2825
doc8:
2926
@echo "-> Run doc8 validation"
30-
@${ACTIVATE} doc8 --max-line-length 100 --ignore-path docs/_build/ --quiet docs/
27+
@${ACTIVATE} doc8 --config pyproject.toml --ignore-path docs/_build --max-line-length 100 docs/ *.rst
3128

32-
valid: isort black
29+
valid:
30+
@echo "-> Run Ruff format"
31+
@${ACTIVATE} ruff format
32+
@echo "-> Run Ruff linter"
33+
@${ACTIVATE} ruff check --fix
3334

3435
check:
35-
@echo "-> Run pycodestyle (PEP8) validation"
36-
@${ACTIVATE} pycodestyle --max-line-length=110 \
37-
--exclude=.eggs,etc/scripts,src/_packagedcode,venv/,lib/,thirdparty/,docs/,.cache/ .
38-
@echo "-> Run isort imports ordering validation"
39-
@${ACTIVATE} isort --sl --check-only -l 100 setup.py src tests --skip-glob "*/_packagedcode/*"
40-
@echo "-> Run black validation"
41-
@${ACTIVATE} black --check -l 100 src tests setup.py --exclude "_packagedcode/.*"
36+
@echo "-> Run Ruff linter validation (pycodestyle, bandit, isort, and more)"
37+
@${ACTIVATE} ruff check
38+
@echo "-> Run Ruff format validation"
39+
@${ACTIVATE} ruff format --check
40+
@$(MAKE) doc8
41+
@echo "-> Run ABOUT files validation"
42+
@${ACTIVATE} about check etc/
4243

4344
clean:
4445
@echo "-> Clean the Python env"
@@ -50,6 +51,10 @@ test:
5051

5152
docs:
5253
rm -rf docs/_build/
53-
@${ACTIVATE} sphinx-build docs/ docs/_build/
54+
@${ACTIVATE} sphinx-build docs/source docs/_build/
55+
56+
docs-check:
57+
@${ACTIVATE} sphinx-build -E -W -b html docs/source docs/_build/
58+
@${ACTIVATE} sphinx-build -E -W -b linkcheck docs/source docs/_build/
5459

55-
.PHONY: conf dev check valid black isort clean test docs
60+
.PHONY: conf dev check valid clean test docs docs-check

NOTICE

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,19 @@
11
#
2-
32
# Copyright (c) nexB Inc. and others.
4-
53
# SPDX-License-Identifier: Apache-2.0
6-
74
#
8-
9-
# Visit https://aboutcode.org and https://github.com/aboutcode-org/python-inspector
10-
11-
# for support and download.
12-
5+
# Visit https://aboutcode.org and https://github.com/aboutcode-org/ for support and download.
136
# ScanCode is a trademark of nexB Inc.
14-
157
#
16-
178
# Licensed under the Apache License, Version 2.0 (the "License");
18-
199
# you may not use this file except in compliance with the License.
20-
2110
# You may obtain a copy of the License at
22-
2311
#
24-
25-
# http://www.apache.org/licenses/LICENSE-2.0
26-
12+
# http://www.apache.org/licenses/LICENSE-2.0
2713
#
28-
2914
# Unless required by applicable law or agreed to in writing, software
30-
3115
# distributed under the License is distributed on an "AS IS" BASIS,
32-
3316
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
34-
3517
# See the License for the specific language governing permissions and
36-
3718
# limitations under the License.
38-
3919
#

README.rst

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,19 @@ This project is funded, supported and sponsored by:
8181

8282
- Generous support and contributions from users like you!
8383
- the European Commission NGI programme
84-
- the NLnet Foundation
84+
- the NLnet Foundation
8585
- the Swiss State Secretariat for Education, Research and Innovation (SERI)
8686
- Google, including the Google Summer of Code and the Google Seasons of Doc programmes
8787
- Mercedes-Benz Group
8888
- Microsoft and Microsoft Azure
8989
- AboutCode ASBL
90-
- nexB Inc.
90+
- nexB Inc.
9191

9292

9393

94-
|europa| |dgconnect|
94+
|europa| |dgconnect|
9595

96-
|ngi| |nlnet|
96+
|ngi| |nlnet|
9797

9898
|aboutcode| |nexb|
9999

@@ -177,11 +177,3 @@ Communications Networks, Content and Technology under grant agreement No 1010929
177177
:target: https://nlnet.nl/discovery/
178178
:height: 40
179179
:alt: NGI Discovery logo
180-
181-
182-
183-
184-
185-
186-
187-

0 commit comments

Comments
 (0)