Skip to content

Commit 95fdcc5

Browse files
keshav-spacekeshav-space
committed
Merge remote-tracking branch 'origin/master' into dependabot/pip/idna-3.7
2 parents fadaf53 + 9288b23 commit 95fdcc5

File tree

642 files changed

+93641
-85230
lines changed

Some content is hidden

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

642 files changed

+93641
-85230
lines changed

‎.github/workflows/docs-ci.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

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

99
strategy:
1010
max-parallel: 4
@@ -20,9 +20,6 @@ jobs:
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
2724
run: pip install -e .[docs]
2825

‎.github/workflows/pypi-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ 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-22.04
2525

2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
- name: Set up Python
2929
uses: actions/setup-python@v4
3030
with:
@@ -47,7 +47,7 @@ jobs:
4747
name: Create GH release
4848
needs:
4949
- build-pypi-distribs
50-
runs-on: ubuntu-20.04
50+
runs-on: ubuntu-22.04
5151

5252
steps:
5353
- name: Download built archives
@@ -67,7 +67,7 @@ jobs:
6767
name: Create PyPI release
6868
needs:
6969
- create-gh-release
70-
runs-on: ubuntu-20.04
70+
runs-on: ubuntu-22.04
7171

7272
steps:
7373
- name: Download built archives

‎CHANGELOG.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Changelog
22
=========
33

4+
v0.5.2
5+
------
6+
- Update link references of ownership from nexB to aboutcode-org
7+
48

59
v0.5.1
610
-------
@@ -9,7 +13,7 @@ v0.5.1
913

1014
v0.5.0
1115
-------
12-
- FetchCode now supports retrieving package info for following generic packages:
16+
- FetchCode now supports retrieving package info for following generic packages:
1317
* pkg:generic/linux
1418
* pkg:generic/mtd-utils
1519
* pkg:generic/barebox
@@ -42,7 +46,7 @@ v0.5.0
4246

4347
v0.4.0
4448
-------
45-
- FetchCode now supports retrieving package info for following generic packages:
49+
- FetchCode now supports retrieving package info for following generic packages:
4650
``busybox``, ``bzip2``, ``dnsmasq``, ``dropbear``, ``ebtables``, ``hostapd``, ``ipkg``,
4751
``iproute2``, ``iptables``, ``libnl``, ``lighttpd``, ``nftables``, ``openssh``, ``samba``,
4852
``syslinux``, ``toybox``, ``uclibc``, ``uclibc-ng``, ``util-linux`` and ``wpa_supplicant``.
@@ -63,4 +67,3 @@ v0.1.0
6367
---------
6468

6569
First, initial release.
66-

‎Makefile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# ScanCode is a trademark of nexB Inc.
55
# SPDX-License-Identifier: Apache-2.0
66
# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
7-
# See https://github.com/nexB/skeleton for support or download.
7+
# See https://github.com/aboutcode-org/skeleton for support or download.
88
# See https://aboutcode.org for more information about nexB OSS projects.
99
#
1010

@@ -19,11 +19,11 @@ dev:
1919

2020
isort:
2121
@echo "-> Apply isort changes to ensure proper imports ordering"
22-
${VENV}/bin/isort --sl -l 100 src tests setup.py
22+
${VENV}/bin/isort --sl -l 100 --skip=src/fetchcode/vcs/pip setup.py src tests
2323

2424
black:
2525
@echo "-> Apply black code formatter"
26-
${VENV}/bin/black -l 100 src tests setup.py
26+
${VENV}/bin/black -l 100 --exclude=src/fetchcode/vcs/pip src tests setup.py
2727

2828
doc8:
2929
@echo "-> Run doc8 validation"
@@ -33,15 +33,17 @@ valid: isort black
3333

3434
check:
3535
@echo "-> Run pycodestyle (PEP8) validation"
36-
@${ACTIVATE} pycodestyle --max-line-length=100 --exclude=.eggs,venv,lib,thirdparty,docs,migrations,settings.py,.cache .
36+
@${ACTIVATE} pycodestyle --max-line-length=100 --exclude=.eggs,venv,lib,thirdparty,docs,migrations,settings.py,.cache,etc,src/fetchcode/vcs/pip,tests/data/ .
3737
@echo "-> Run isort imports ordering validation"
38-
@${ACTIVATE} isort --sl --check-only -l 100 setup.py src tests .
38+
@${ACTIVATE} isort --sl --check-only -l 100 --skip=src/fetchcode/vcs/pip setup.py src tests
3939
@echo "-> Run black validation"
40-
@${ACTIVATE} black --check --check -l 100 src tests setup.py
40+
@${ACTIVATE} black --check --check -l 100 --exclude=src/fetchcode/vcs/pip src tests setup.py
4141

4242
clean:
4343
@echo "-> Clean the Python env"
4444
./configure --clean
45+
rm -rf .venv/ .*cache/ *.egg-info/ build/ dist/
46+
find . -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete
4547

4648
test:
4749
@echo "-> Run the test suite"

‎NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) nexB Inc. and others.
33
# SPDX-License-Identifier: Apache-2.0
44
#
5-
# Visit https://aboutcode.org and https://github.com/nexB/ for support and download.
5+
# Visit https://aboutcode.org and https://github.com/aboutcode-org/ for support and download.
66
# ScanCode is a trademark of nexB Inc.
77
#
88
# Licensed under the Apache License, Version 2.0 (the "License");

‎README.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ systems. It can work using plain HTTP and FTP URLs, as well as
77
as used in Python pip and as specified in `SPDX Package Download Location
88
<https://spdx.github.io/spdx-spec/3-package-information/#37-package-download-location>`_
99

10-
Homepage and support: https://github.com/nexB/fetchcode
10+
Homepage and support: https://github.com/aboutcode-org/fetchcode
1111

1212

1313
Why FetchCode?
@@ -24,11 +24,11 @@ Development installation
2424

2525
Clone the repo::
2626

27-
git clone https://github.com/nexB/fetchcode
27+
git clone https://github.com/aboutcode-org/fetchcode
2828

29-
Then install all the requirements using::
29+
Then install all the requirements using this command (on POSIX)::
3030

31-
configure --dev
31+
./configure --dev
3232

3333

3434
Running tests
@@ -45,13 +45,13 @@ Usage
4545
Fetch a code archive and get a ``fetchcode.fetch.Response`` object back::
4646

4747
>>> from fetchcode import fetch
48-
>>> f = fetch('https://github.com/nexB/fetchcode/archive/ab65b2e645c889887227ea49eb3332d885fd0a54.zip')
48+
>>> f = fetch('https://github.com/aboutcode-org/fetchcode/archive/ab65b2e645c889887227ea49eb3332d885fd0a54.zip')
4949
>>> f.location
5050
'/tmp/tmp_cm02xsg'
5151
>>> f.content_type
5252
'application/zip'
5353
>>> f.url
54-
'https://github.com/nexB/fetchcode/archive/ab65b2e645c889887227ea49eb3332d885fd0a54.zip'
54+
'https://github.com/aboutcode-org/fetchcode/archive/ab65b2e645c889887227ea49eb3332d885fd0a54.zip'
5555

5656
Fetch some package metadata and get a ``fetchcode.packagedcode_models.Package`` object back::
5757

‎azure-pipelines.yml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,62 @@
1-
21
################################################################################
32
# We use Azure to run the full tests suites on multiple Python 3.x
43
# on multiple Windows, macOS and Linux versions all on 64 bits
54
# These jobs are using VMs with Azure-provided Python builds
65
################################################################################
76

87
jobs:
9-
108
- template: etc/ci/azure-posix.yml
119
parameters:
1210
job_name: ubuntu20_cpython
1311
image_name: ubuntu-20.04
14-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
12+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
1513
test_suites:
1614
all: venv/bin/pytest -n 2 -vvs
1715

1816
- template: etc/ci/azure-posix.yml
1917
parameters:
2018
job_name: ubuntu22_cpython
2119
image_name: ubuntu-22.04
22-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
20+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
2321
test_suites:
2422
all: venv/bin/pytest -n 2 -vvs
2523

2624
- template: etc/ci/azure-posix.yml
2725
parameters:
28-
job_name: macos11_cpython
29-
image_name: macOS-11
30-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
26+
job_name: macos12_cpython
27+
image_name: macOS-12
28+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
3129
test_suites:
3230
all: venv/bin/pytest -n 2 -vvs
3331

3432
- template: etc/ci/azure-posix.yml
3533
parameters:
36-
job_name: macos12_cpython
37-
image_name: macOS-12
38-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
34+
job_name: macos13_cpython
35+
image_name: macOS-13
36+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
3937
test_suites:
4038
all: venv/bin/pytest -n 2 -vvs
4139

4240
- template: etc/ci/azure-posix.yml
4341
parameters:
44-
job_name: macos13_cpython
45-
image_name: macOS-13
46-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
42+
job_name: macos14_cpython_arm64
43+
image_name: macOS-14
44+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
4745
test_suites:
4846
all: venv/bin/pytest -n 2 -vvs
4947

5048
- template: etc/ci/azure-win.yml
5149
parameters:
5250
job_name: win2019_cpython
5351
image_name: windows-2019
54-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
52+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
5553
test_suites:
5654
all: venv\Scripts\pytest -n 2 -vvs
5755

5856
- template: etc/ci/azure-win.yml
5957
parameters:
6058
job_name: win2022_cpython
6159
image_name: windows-2022
62-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
60+
python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
6361
test_suites:
6462
all: venv\Scripts\pytest -n 2 -vvs

‎configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) nexB Inc. and others. All rights reserved.
44
# SPDX-License-Identifier: Apache-2.0
55
# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
6-
# See https://github.com/nexB/ for support or download.
6+
# See https://github.com/aboutcode-org/ for support or download.
77
# See https://aboutcode.org for more information about nexB OSS projects.
88
#
99

‎configure.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@rem Copyright (c) nexB Inc. and others. All rights reserved.
55
@rem SPDX-License-Identifier: Apache-2.0
66
@rem See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
7-
@rem See https://github.com/nexB/ for support or download.
7+
@rem See https://github.com/aboutcode-org/ for support or download.
88
@rem See https://aboutcode.org for more information about nexB OSS projects.
99

1010

‎docs/Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# from the environment for the first two.
66
SPHINXOPTS ?=
77
SPHINXBUILD ?= sphinx-build
8+
SPHINXAUTOBUILD = sphinx-autobuild
89
SOURCEDIR = source
910
BUILDDIR = build
1011

@@ -14,6 +15,13 @@ help:
1415

1516
.PHONY: help Makefile
1617

18+
# Run the development server using sphinx-autobuild
19+
docs:
20+
@echo
21+
@echo "Starting up the docs server..."
22+
@echo
23+
$(SPHINXAUTOBUILD) --port 8000 --watch ${SOURCEDIR} $(SOURCEDIR) "$(BUILDDIR)/html" $(SPHINXOPTS) $(O)
24+
1725
# Catch-all target: route all unknown targets to Sphinx using the new
1826
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
1927
%: Makefile

0 commit comments

Comments
 (0)