Skip to content

Commit 7d464f9

Browse files
committed
Fix packaging for namespace package
Signed-off-by: Keshav Priyadarshi <git@keshav.space>
1 parent 5c16dc9 commit 7d464f9

File tree

5 files changed

+37
-3
lines changed

5 files changed

+37
-3
lines changed

aboutcode/__init__.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#
2+
# Copyright (c) nexB Inc. and others. All rights reserved.
3+
# FederatedCode is a trademark of nexB Inc.
4+
# SPDX-License-Identifier: Apache-2.0
5+
# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
6+
# See https://github.com/nexB/federatedcode for support or download.
7+
# See https://aboutcode.org for more information about AboutCode.org OSS projects.
8+
#
9+
10+
import pkgutil
11+
12+
__path__ = pkgutil.extend_path(__path__, __name__)

aboutcode/federatedcode/client/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
from urllib.parse import urljoin
1414

1515
import requests
16-
from aboutcode.hashid import get_package_base_dir
1716
from dotenv import load_dotenv
1817
from packageurl import PackageURL
1918

19+
from aboutcode.hashid import get_package_base_dir
20+
2021
load_dotenv()
2122

2223
FEDERATEDCODE_GIT_RAW_URL = os.getenv(
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#
2+
# Copyright (c) nexB Inc. and others. All rights reserved.
3+
# FederatedCode is a trademark of nexB Inc.
4+
# SPDX-License-Identifier: Apache-2.0
5+
# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
6+
# See https://github.com/nexB/federatedcode for support or download.
7+
# See https://aboutcode.org for more information about AboutCode.org OSS projects.
8+
#
9+
10+
from unittest.mock import patch
11+
12+
from aboutcode.federatedcode.client import discover_package_in_ap_server
13+
14+
15+
def test_discover_package_in_ap_server():
16+
with patch("requests.head") as mock_head:
17+
mock_response = mock_head.return_value
18+
mock_response.status_code = 200
19+
20+
result = discover_package_in_ap_server("pkg:foo/bar")
21+
expected = "http://localhost:8000/purls/@pkg:npm/foo/bar"
22+
result == expected

fedcode/pipelines/sync_scancode_scans.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from traceback import format_exc as traceback_format_exc
1212

1313
from aboutcode.pipeline import LoopProgress
14-
1514
from fedcode.models import Package
1615
from fedcode.models import Repository
1716
from fedcode.pipelines import FederatedCodePipeline

fedcode/pipelines/sync_vulnerablecode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
from itertools import zip_longest
1313

1414
import saneyaml
15-
from aboutcode.pipeline import LoopProgress
1615

16+
from aboutcode.pipeline import LoopProgress
1717
from fedcode.activitypub import Activity
1818
from fedcode.activitypub import UpdateActivity
1919
from fedcode.models import Note

0 commit comments

Comments
 (0)