Skip to content

Commit 752ba90

Browse files
committed
Update link references of ownership from nexB to aboutcode-org
Signed-off-by: Chin Yeung Li <[email protected]>
1 parent c39f8ad commit 752ba90

24 files changed

+368
-214
lines changed

CONTRIBUTING.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Feature requests and feedback
1414
=============================
1515

1616
To send feedback, file an issue at
17-
https://github.com/nexB/tracecode-build/issues
17+
https://github.com/aboutcode-org/tracecode-build/issues
1818

1919
If you are proposing a feature:
2020

@@ -26,7 +26,7 @@ If you are proposing a feature:
2626
Bug reports
2727
===========
2828

29-
When reporting a bug at https://github.com/nexB/tracecode-build/issues please
29+
When reporting a bug at https://github.com/aboutcode-org/tracecode-build/issues please
3030
include:
3131

3232
* Your operating system name, version and architecture (32 or 64 bits).
@@ -53,8 +53,8 @@ Development
5353

5454
To set up TraceCode for local development:
5555

56-
1. Fork tracecode-build on GitHub at
57-
https://github.com/nexB/tracecode-build
56+
1. Fork tracecode-build on GitHub at
57+
https://github.com/aboutcode-org/tracecode-build
5858

5959
2. Clone your fork locally::
6060

@@ -68,15 +68,15 @@ To set up TraceCode for local development:
6868
The configure script creates an isolated Python `virtual environment` in
6969
your checkout directory, the Python `pip` tool, and installs the thirdparty
7070
libraries (from the `thirdparty/ directory`), setup the paths, etc.
71-
See https://virtualenv.pypa.io/en/latest/ for more details.
71+
See https://virtualenv.pypa.io/en/latest/ for more details.
7272

7373
Run this command to configure TraceCode::
7474

7575
source configure
7676

7777
On Windows use instead::
7878

79-
configure
79+
configure
8080

8181
When you create a new terminal/shell to work on TraceCode, either rerun the
8282
configure script or `source bin/activate` (or run `bin\\activate` on Windows)
@@ -85,7 +85,7 @@ To set up TraceCode for local development:
8585
Please create new unit tests for your code.
8686

8787
6. When you are done with your changes, run all the tests.
88-
Use this command::
88+
Use this command::
8989

9090
py.test
9191

@@ -108,7 +108,7 @@ create a pull request. You can add new commits to your branch as needed.
108108
For merging, your request would need to:
109109

110110
1. Include unit tests that are passing (run ``py.test``).
111-
2. Update documentation as needed for new API, functionality etc.
111+
2. Update documentation as needed for new API, functionality etc.
112112
3. Add a note to ``CHANGELOG.rst`` about the changes.
113113
4. Add your name to ``AUTHORS.rst``.
114114

Makefile

Lines changed: 2 additions & 2 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

@@ -35,7 +35,7 @@ check:
3535
@echo "-> Run pycodestyle (PEP8) validation"
3636
@${ACTIVATE} pycodestyle --max-line-length=100 --exclude=.eggs,venv,lib,thirdparty,docs,migrations,settings.py,.cache .
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 setup.py src tests .
3939
@echo "-> Run black validation"
4040
@${ACTIVATE} black --check --check -l 100 src tests setup.py
4141

NOTICE

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ TraceCode software is licensed under the Apache License version 2.0.
1010

1111
See https://www.apache.org/licenses/LICENSE-2.0 for the Apache-2.0 license text.
1212

13-
See https://github.com/nexB/tracecode-toolkit-strace for support or download.
13+
See https://github.com/aboutcode-org/tracecode-toolkit-strace for support or download.
1414
See https://aboutcode.org for more information about nexB OSS projects
1515

1616

@@ -26,12 +26,12 @@ The corresponding source code for pre-compiled third-party software is available
2626
for immediate download from the same release page where you obtained TraceCode,
2727
including:
2828

29-
- https://github.com/nexB/tracecode-toolkit-strace
29+
- https://github.com/aboutcode-org/tracecode-toolkit-strace
3030
- https://thirdparty.aboutcode.org/pypi/
31-
- https://github.com/nexB/thirdparty-packages/pypi/
32-
- https://github.com/nexB/scancode-plugins/
33-
- https://github.com/nexB/scancode-thirdparty-src/
34-
- https://github.com/nexB/thirdparty-packages/
31+
- https://github.com/aboutcode-org/thirdparty-packages/pypi/
32+
- https://github.com/aboutcode-org/scancode-plugins/
33+
- https://github.com/aboutcode-org/scancode-thirdparty-src/
34+
- https://github.com/aboutcode-org/thirdparty-packages/
3535

3636
You may also contact us to request the source code by email at [email protected] or
3737
by postal mail at:

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/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
# This points to aboutcode.readthedocs.io
3535
# In case of "undefined label" ERRORS check docs on intersphinx to troubleshoot
36-
# Link was created at commit - https://github.com/nexB/aboutcode/commit/faea9fcf3248f8f198844fe34d43833224ac4a83
36+
# Link was created at commit - https://github.com/aboutcode-org/aboutcode/commit/faea9fcf3248f8f198844fe34d43833224ac4a83
3737

3838
intersphinx_mapping = {
3939
"aboutcode": ("https://aboutcode.readthedocs.io/en/latest/", None),

docs/source/contribute/contrib_doc.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To get started, create or identify a working directory on your local machine.
1212

1313
Open that directory and execute the following command in a terminal session::
1414

15-
git clone https://github.com/nexB/skeleton.git
15+
git clone https://github.com/aboutcode-org/skeleton.git
1616

1717
That will create an ``/skeleton`` directory in your working directory.
1818
Now you can install the dependencies in a virtualenv::

docs/source/skeleton-usage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ corrected. You can check to see if your corrections are valid by running:
118118
Once the wheels are collected and the ABOUT files are generated and correct,
119119
upload them to thirdparty.aboutcode.org/pypi by placing the wheels and ABOUT
120120
files from the thirdparty directory to the pypi directory at
121-
https://github.com/nexB/thirdparty-packages
121+
https://github.com/aboutcode-org/thirdparty-packages
122122

123123

124124
Usage after project initialization

docs/tutorial/build-patchelf.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ We use patchelf which is a simple GPL-license executable::
1717
tar -xf patchelf-f34751b88bd07d7f44f5cd3200fb4122bf916c7e.tar.gz
1818
mv patchelf-f34751b88bd07d7f44f5cd3200fb4122bf916c7e patchelf-f34751
1919
cd patchelf-f34751/
20-
./bootstrap.sh
21-
./configure
20+
./bootstrap.sh
21+
./configure
2222
cd ..
2323

2424

2525
Fetch tracecode and configure
2626
---------------------------------------
2727

28-
git clone https://github.com/nexB/tracecode-toolkit-strace
28+
git clone https://github.com/aboutcode-org/tracecode-toolkit-strace
2929
cd tracecode-toolkit-strace
3030
./configure
3131
source venv/bin/activate
@@ -47,12 +47,12 @@ Run strace proper:
4747
Compile patchelf "under" strace::
4848

4949
strace -ff -y -ttt -qq -a1 -o TRACE/patchelf-trace make
50-
50+
5151
Making all in src
5252
make[1]: Entering directory '/home/user/tracing/patchelf-f34751/src'
5353
g++ -DPACKAGE_NAME=\"patchelf\" -DPACKAGE_TARNAME=\"patchelf\" -DPACKAGE_VERSION=\"0.12\" -DPACKAGE_STRING=\"patchelf\ 0.12\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"patchelf\" -DVERSION=\"0.12\" -I. -Wall -std=c++11 -D_FILE_OFFSET_BITS=64 -g -O2 -MT patchelf.o -MD -MP -MF .deps/patchelf.Tpo -c -o patchelf.o patchelf.cc
5454
mv -f .deps/patchelf.Tpo .deps/patchelf.Po
55-
g++ -Wall -std=c++11 -D_FILE_OFFSET_BITS=64 -g -O2 -o patchelf patchelf.o
55+
g++ -Wall -std=c++11 -D_FILE_OFFSET_BITS=64 -g -O2 -o patchelf patchelf.o
5656
make[1]: Leaving directory '/home/user/tracing/patchelf-f34751/src'
5757
Making all in tests
5858
make[1]: Entering directory '/home/user/tracing/patchelf-f34751/tests'

etc/scripts/check_thirdparty.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# ScanCode is a trademark of nexB Inc.
66
# SPDX-License-Identifier: Apache-2.0
77
# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
8-
# See https://github.com/nexB/skeleton for support or download.
8+
# See https://github.com/aboutcode-org/skeleton for support or download.
99
# See https://aboutcode.org for more information about nexB OSS projects.
1010
#
1111
import click
@@ -17,7 +17,8 @@
1717
@click.option(
1818
"-d",
1919
"--dest",
20-
type=click.Path(exists=True, readable=True, path_type=str, file_okay=False),
20+
type=click.Path(exists=True, readable=True,
21+
path_type=str, file_okay=False),
2122
required=True,
2223
help="Path to the thirdparty directory to check.",
2324
)

etc/scripts/fetch_thirdparty.py

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

@@ -55,7 +55,8 @@
5555
"-d",
5656
"--dest",
5757
"dest_dir",
58-
type=click.Path(exists=True, readable=True, path_type=str, file_okay=False),
58+
type=click.Path(exists=True, readable=True,
59+
path_type=str, file_okay=False),
5960
metavar="DIR",
6061
default=utils_thirdparty.THIRDPARTY_DIR,
6162
show_default=True,
@@ -224,7 +225,8 @@ def fetch_thirdparty(
224225
environments = None
225226
if wheels:
226227
evts = itertools.product(python_versions, operating_systems)
227-
environments = [utils_thirdparty.Environment.from_pyver_and_os(pyv, os) for pyv, os in evts]
228+
environments = [utils_thirdparty.Environment.from_pyver_and_os(
229+
pyv, os) for pyv, os in evts]
228230

229231
# Collect PyPI repos
230232
repos = []
@@ -260,13 +262,14 @@ def fetch_thirdparty(
260262
repos=repos,
261263
)
262264
if not fetched:
263-
wheels_or_sdist_not_found[f"{name}=={version}"].append(environment)
265+
wheels_or_sdist_not_found[f"{name}=={version}"].append(
266+
environment)
264267
if TRACE:
265268
print(f" NOT FOUND")
266269

267270
if (sdists or
268271
(f"{name}=={version}" in wheels_or_sdist_not_found and name in sdist_only)
269-
):
272+
):
270273
if TRACE:
271274
print(f" ==> Fetching sdist: {name}=={version}")
272275

@@ -289,7 +292,8 @@ def fetch_thirdparty(
289292
sdist_missing = sdists and "sdist" in dists and not name in wheel_only
290293
if sdist_missing:
291294
mia.append(f"SDist missing: {nv} {dists}")
292-
wheels_missing = wheels and any(d for d in dists if d != "sdist") and not name in sdist_only
295+
wheels_missing = wheels and any(
296+
d for d in dists if d != "sdist") and not name in sdist_only
293297
if wheels_missing:
294298
mia.append(f"Wheels missing: {nv} {dists}")
295299

@@ -299,7 +303,8 @@ def fetch_thirdparty(
299303
raise Exception(mia)
300304

301305
print(f"==> FETCHING OR CREATING ABOUT AND LICENSE FILES")
302-
utils_thirdparty.fetch_abouts_and_licenses(dest_dir=dest_dir, use_cached_index=use_cached_index)
306+
utils_thirdparty.fetch_abouts_and_licenses(
307+
dest_dir=dest_dir, use_cached_index=use_cached_index)
303308
utils_thirdparty.clean_about_files(dest_dir=dest_dir)
304309

305310
# check for problems

etc/scripts/gen_requirements.py

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

etc/scripts/gen_requirements_dev.py

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

etc/scripts/utils_dejacode.py

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

3434
def can_do_api_calls():
3535
if not DEJACODE_API_KEY and DEJACODE_API_URL:
36-
print("DejaCode DEJACODE_API_KEY and DEJACODE_API_URL not configured. Doing nothing")
36+
print(
37+
"DejaCode DEJACODE_API_KEY and DEJACODE_API_URL not configured. Doing nothing")
3738
return False
3839
else:
3940
return True
@@ -68,7 +69,8 @@ def get_package_data(distribution):
6869
return results[0]
6970

7071
elif len_results > 1:
71-
print(f"More than 1 entry exists, review at: {DEJACODE_API_URL_PACKAGES}")
72+
print(
73+
f"More than 1 entry exists, review at: {DEJACODE_API_URL_PACKAGES}")
7274
else:
7375
print("Could not find package:", distribution.download_url)
7476

@@ -149,7 +151,8 @@ def find_latest_dejacode_package(distribution):
149151
# there was no exact match, find the latest version
150152
# TODO: consider the closest version rather than the latest
151153
# or the version that has the best data
152-
with_versions = [(packaging_version.parse(p["version"]), p) for p in packages]
154+
with_versions = [(packaging_version.parse(p["version"]), p)
155+
for p in packages]
153156
with_versions = sorted(with_versions)
154157
latest_version, latest_package_version = sorted(with_versions)[-1]
155158
print(

etc/scripts/utils_requirements.py

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

@@ -102,7 +102,8 @@ def lock_dev_requirements(
102102
all_req_nvs = get_required_name_versions(all_req_lines)
103103
dev_only_req_nvs = {n: v for n, v in all_req_nvs if n not in main_names}
104104

105-
new_reqs = "\n".join(f"{n}=={v}" for n, v in sorted(dev_only_req_nvs.items()))
105+
new_reqs = "\n".join(
106+
f"{n}=={v}" for n, v in sorted(dev_only_req_nvs.items()))
106107
with open(dev_requirements_file, "w") as fo:
107108
fo.write(new_reqs)
108109

@@ -113,10 +114,12 @@ def get_installed_reqs(site_packages_dir):
113114
as a text.
114115
"""
115116
if not os.path.exists(site_packages_dir):
116-
raise Exception(f"site_packages directory: {site_packages_dir!r} does not exists")
117+
raise Exception(
118+
f"site_packages directory: {site_packages_dir!r} does not exists")
117119
# Also include these packages in the output with --all: wheel, distribute,
118120
# setuptools, pip
119-
args = ["pip", "freeze", "--exclude-editable", "--all", "--path", site_packages_dir]
121+
args = ["pip", "freeze", "--exclude-editable",
122+
"--all", "--path", site_packages_dir]
120123
return subprocess.check_output(args, encoding="utf-8")
121124

122125

0 commit comments

Comments
 (0)