Skip to content

Commit d058614

Browse files
authored
Remove purldb-toolkit (#610)
* Remove purldb-toolkit from purldb * purldb-toolkit is available at github.com/aboutcode-org/purldb-toolkit Signed-off-by: Jono Yang <jyang@nexb.com> * Update docs Signed-off-by: Jono Yang <jyang@nexb.com> --------- Signed-off-by: Jono Yang <jyang@nexb.com>
1 parent c36c2dc commit d058614

32 files changed

+16
-9933
lines changed

Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,11 @@ test_purldb:
131131
${ACTIVATE} ${DJSM_PDB} pytest -vvs --lf minecode packagedb purl2vcs purldb_project purldb_public_project --ignore packagedb/tests/test_throttling.py
132132
${ACTIVATE} ${DJSM_PDB} pytest -vvs --lf packagedb/tests/test_throttling.py
133133

134-
test_toolkit:
135-
${ACTIVATE} pytest -vvs purldb-toolkit/
136-
137134
test_clearcode:
138135
${ACTIVATE} ${DJSM_PDB} ${PYTHON_EXE} -m pytest -vvs clearcode clearindex
139136

140137
test_matchcode:
141-
${ACTIVATE} ${DJSM_MAT} ${PYTHON_EXE} -m pytest -vvs matchcode_pipeline matchcode-toolkit matchcode
138+
${ACTIVATE} ${DJSM_MAT} ${PYTHON_EXE} -m pytest -vvs matchcode_pipeline matchcode
142139

143140
test: test_purldb test_matchcode test_toolkit test_clearcode
144141

configure

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ CLI_ARGS=$1
3030
CUSTOM_PACKAGES=""
3131

3232
# Requirement arguments passed to pip and used by default or with --dev.
33-
REQUIREMENTS="$CUSTOM_PACKAGES --editable purldb-toolkit/ --editable purl2vcs/ --editable . --constraint requirements.txt"
34-
DEV_REQUIREMENTS="$CUSTOM_PACKAGES --editable purldb-toolkit/[testing] --editable .[dev] --editable purl2vcs/[testing] --constraint requirements.txt --constraint requirements-dev.txt"
33+
REQUIREMENTS="$CUSTOM_PACKAGES --editable purl2vcs/ --editable . --constraint requirements.txt"
34+
DEV_REQUIREMENTS="$CUSTOM_PACKAGES --editable .[dev] --editable purl2vcs/[testing] --constraint requirements.txt --constraint requirements-dev.txt"
3535

3636

3737
# where we create a virtualenv
3838
VIRTUALENV_DIR=venv
3939

4040
# Cleanable files and directories to delete with the --clean option
41-
CLEANABLE="build dist venv .cache .eggs *.egg-info docs/_build/ pip-selfcheck.json matchcode-toolkit/build matchcode-toolkit/dist matchcode-toolkit/.eggs purldb-toolkit/build purldb-toolkit/dist"
41+
CLEANABLE="build dist venv .cache .eggs *.egg-info docs/_build/ pip-selfcheck.json"
4242

4343

4444
# extra arguments passed to pip

docs/source/index.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ PurlDB toolkit
110110
purldb-toolkit is command line utility and library to use the PurlDB, its API
111111
and various related libraries.
112112

113-
.. toctree::
114-
:maxdepth: 2
113+
.. note::
115114

116-
purldb-toolkit/index
115+
purldb-toolkit has moved to its own repo at https://github.com/aboutcode-org/purldb-toolkit
116+
from its previous location at https://github.com/aboutcode-org/purldb/tree/main/purldb-toolkit
117117

118118
----
119119

docs/source/purldb-toolkit/index.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/source/testing.rst

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,3 @@ Run all PURLdb tests
1414
.. code-block:: console
1515
1616
make test
17-
18-
19-
purldb-toolkit
20-
--------------
21-
22-
Run all purldb-toolkit non-live tests (i.e., no live network calls)
23-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
24-
25-
.. code-block:: console
26-
27-
DJANGO_SETTINGS_MODULE=purldb_project.settings pytest -vvs purldb-toolkit/tests/test_purlcli.py
28-
29-
30-
Run all purldb-toolkit live tests (i.e., check actual API endpoints etc.)
31-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
32-
33-
.. code-block:: console
34-
35-
DJANGO_SETTINGS_MODULE=purldb_project.settings pytest -vvs purldb-toolkit/tests/test_purlcli_live.py --run_live_fetch

matchcode-toolkit/README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ and `ScanCode.io <https://github.com/aboutcode-org/scancode.io>`_ by implementin
77
HaloHash algorithm and using it in ScanCode toolkit and ScanCode.io plugins and
88
pipelines.
99

10+
.. note::
11+
12+
MatchCode toolkit has moved to its own repo at https://github.com/aboutcode-org/matchcode-toolkit
13+
from its previous location https://github.com/aboutcode-org/purldb/tree/main/matchcode-toolkit
14+
1015

1116
Installation
1217
------------
@@ -50,8 +55,3 @@ Resources and computes those values for directories.
5055
MatchCode toolkit provides the ``scan_and_fingerprint_package`` pipeline for
5156
ScanCode.io. This is the same as the ``scan_single_package`` pipeline, but has the
5257
added step of computing fingerprints for directories.
53-
54-
.. note::
55-
56-
MatchCode toolkit has moved to its own repo at https://github.com/aboutcode-org/matchcode-toolkit
57-
from its previous location https://github.com/aboutcode-org/purldb/tree/main/matchcode-toolkit

purldb-toolkit/CHANGELOG.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

purldb-toolkit/CODE_OF_CONDUCT.rst

Lines changed: 0 additions & 86 deletions
This file was deleted.

purldb-toolkit/NOTICE

Lines changed: 0 additions & 12 deletions
This file was deleted.

purldb-toolkit/README.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ the PurlDB and MatchCode REST API and exposes various PURL-based services.
1111

1212
purldb-toolkit serves as a tool, a library and an example of how to use the services programmatically.
1313

14+
.. note::
15+
16+
purldb-toolkit has moved to its own repo at https://github.com/aboutcode-org/purldb-toolkit
17+
from its previous location at https://github.com/aboutcode-org/purldb/tree/main/purldb-toolkit
1418

1519
Installation
1620
------------

0 commit comments

Comments
 (0)