Skip to content

Commit 5637038

Browse files
committed
docs
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
1 parent 03573b7 commit 5637038

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

docs/upgrading.rst

+17-17
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,23 @@ Changed Command Line Interface (CLI)
2626
The following describes migration paths only. For all full list of all features
2727
see the :doc:`"usage" documentation</usage>`.
2828

29+
Source: Conda
30+
~~~~~~~~~~~~~
31+
32+
"Conda provides package, dependency, and environment management for **any** language"
33+
34+
-- https://docs.conda.io/en/latest/
35+
36+
Conda (lock file) analysis was entirely removed for the fact that conda is not dedicated to Python.
37+
Yes, conda has some capabilities of managing Python packages and environments, but it does so much more.
38+
39+
However, conda's Python environments are fully supported, as well as other means.
40+
See the :doc:`"usage" documentation</usage>` for examples.
41+
42+
Old: ``cyclonedx-py [-c|-cj] ...``
43+
44+
New: It depends. See the :doc:`"usage" documentation</usage>` for examples.
45+
2946
Source: Environment
3047
~~~~~~~~~~~~~~~~~~~
3148

@@ -62,23 +79,6 @@ Old: ``cyclonedx-py -r -i some/path/requirements.txt``
6279

6380
New: ``cyclonedx-py requirements some/path/requirements.txt``
6481

65-
Source: Conda
66-
~~~~~~~~~~~~~
67-
68-
"Conda provides package, dependency, and environment management for **any** language"
69-
70-
-- https://docs.conda.io/en/latest/
71-
72-
Conda (lock file) analysis was entirely removed for the fact that conda is not dedicated to Python.
73-
Yes, conda has some capabilities of managing Python packages and environments, but it does so much more.
74-
75-
However, conda's Python environments are fully supported, as well as other means.
76-
See the :doc:`"usage" documentation</usage>` for examples.
77-
78-
Old: ``cyclonedx-py [-c|-cj] ...``
79-
80-
New: It depends. See the :doc:`"usage" documentation</usage>` for examples.
81-
8282
Output verbosity
8383
~~~~~~~~~~~~~~~~
8484

0 commit comments

Comments
 (0)