summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--spec/fixtures/expected/python/2/pip/v1.0.json2
-rw-r--r--spec/fixtures/expected/python/2/pip/v1.1.json2
-rw-r--r--spec/fixtures/expected/python/2/pip/v2.0.json2
-rw-r--r--spec/fixtures/expected/python/2/pip/v2.1.json2
-rw-r--r--spec/fixtures/expected/python/3/pip/v1.0.json17
-rw-r--r--spec/fixtures/expected/python/3/pip/v1.1.json23
-rw-r--r--spec/fixtures/expected/python/3/pip/v2.0.json14
-rw-r--r--spec/fixtures/expected/python/3/pip/v2.1.json14
-rw-r--r--spec/fixtures/expected/python/pipenv/v1.0.json2
-rw-r--r--spec/fixtures/expected/python/pipenv/v1.1.json2
-rw-r--r--spec/fixtures/expected/python/pipenv/v2.0.json2
-rw-r--r--spec/fixtures/expected/python/pipenv/v2.1.json2
-rw-r--r--spec/integration/python/pip_spec.rb4
13 files changed, 45 insertions, 43 deletions
diff --git a/spec/fixtures/expected/python/2/pip/v1.0.json b/spec/fixtures/expected/python/2/pip/v1.0.json
index 5adaedd..318c367 100644
--- a/spec/fixtures/expected/python/2/pip/v1.0.json
+++ b/spec/fixtures/expected/python/2/pip/v1.0.json
@@ -193,4 +193,4 @@
}
}
]
-}
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/python/2/pip/v1.1.json b/spec/fixtures/expected/python/2/pip/v1.1.json
index 30e4cc1..c72b6a9 100644
--- a/spec/fixtures/expected/python/2/pip/v1.1.json
+++ b/spec/fixtures/expected/python/2/pip/v1.1.json
@@ -266,4 +266,4 @@
}
}
]
-}
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/python/2/pip/v2.0.json b/spec/fixtures/expected/python/2/pip/v2.0.json
index 5515387..d6f5047 100644
--- a/spec/fixtures/expected/python/2/pip/v2.0.json
+++ b/spec/fixtures/expected/python/2/pip/v2.0.json
@@ -172,4 +172,4 @@
]
}
]
-}
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/python/2/pip/v2.1.json b/spec/fixtures/expected/python/2/pip/v2.1.json
index 05492d6..21b2a83 100644
--- a/spec/fixtures/expected/python/2/pip/v2.1.json
+++ b/spec/fixtures/expected/python/2/pip/v2.1.json
@@ -142,4 +142,4 @@
]
}
]
-}
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/python/3/pip/v1.0.json b/spec/fixtures/expected/python/3/pip/v1.0.json
index 6cf3676..37f2671 100644
--- a/spec/fixtures/expected/python/3/pip/v1.0.json
+++ b/spec/fixtures/expected/python/3/pip/v1.0.json
@@ -10,23 +10,23 @@
},
{
"count": 1,
- "name": "Copyright (c) 2015, Julien Fache"
+ "name": "Apache 2.0"
},
{
"count": 1,
- "name": "New BSD"
+ "name": "Copyright (c) 2015, Julien Fache"
},
{
"count": 1,
- "name": "Python Software Foundation License"
+ "name": "New BSD"
},
{
"count": 1,
- "name": "Standard PIL License"
+ "name": "Other/Proprietary License"
},
{
"count": 1,
- "name": "http://www.apache.org/licenses/LICENSE-2.0"
+ "name": "Python Software Foundation License"
}
],
"dependencies": [
@@ -46,7 +46,7 @@
},
{
"license": {
- "name": "Standard PIL License"
+ "name": "Other/Proprietary License"
},
"dependency": {
"name": "Pillow",
@@ -198,7 +198,8 @@
},
{
"license": {
- "name": "http://www.apache.org/licenses/LICENSE-2.0"
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
"dependency": {
"name": "tornado",
@@ -210,4 +211,4 @@
}
}
]
-}
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/python/3/pip/v1.1.json b/spec/fixtures/expected/python/3/pip/v1.1.json
index 580d4cb..87d584c 100644
--- a/spec/fixtures/expected/python/3/pip/v1.1.json
+++ b/spec/fixtures/expected/python/3/pip/v1.1.json
@@ -11,23 +11,23 @@
},
{
"count": 1,
- "name": "Copyright (c) 2015, Julien Fache"
+ "name": "Apache 2.0"
},
{
"count": 1,
- "name": "New BSD"
+ "name": "Copyright (c) 2015, Julien Fache"
},
{
"count": 1,
- "name": "Python Software Foundation License"
+ "name": "New BSD"
},
{
"count": 1,
- "name": "Standard PIL License"
+ "name": "Other/Proprietary License"
},
{
"count": 1,
- "name": "http://www.apache.org/licenses/LICENSE-2.0"
+ "name": "Python Software Foundation License"
}
],
"dependencies": [
@@ -54,12 +54,12 @@
{
"licenses": [
{
- "name": "Standard PIL License",
+ "name": "Other/Proprietary License",
"url": ""
}
],
"license": {
- "name": "Standard PIL License"
+ "name": "Other/Proprietary License"
},
"dependency": {
"name": "Pillow",
@@ -272,12 +272,13 @@
{
"licenses": [
{
- "name": "http://www.apache.org/licenses/LICENSE-2.0",
- "url": ""
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
}
],
"license": {
- "name": "http://www.apache.org/licenses/LICENSE-2.0"
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
"dependency": {
"name": "tornado",
@@ -289,4 +290,4 @@
}
}
]
-}
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/python/3/pip/v2.0.json b/spec/fixtures/expected/python/3/pip/v2.0.json
index 49c7328..6478188 100644
--- a/spec/fixtures/expected/python/3/pip/v2.0.json
+++ b/spec/fixtures/expected/python/3/pip/v2.0.json
@@ -26,14 +26,14 @@
"count": 1
},
{
- "id": "MIT-CMU",
- "name": "CMU License",
- "url": "https://github.com/python-pillow/Pillow/blob/fffb426092c8db24a5f4b6df243a8a3c01fb63cd/LICENSE",
+ "id": "copyright (c) 2015, julien fache",
+ "name": "Copyright (c) 2015, Julien Fache",
+ "url": "",
"count": 1
},
{
- "id": "copyright (c) 2015, julien fache",
- "name": "Copyright (c) 2015, Julien Fache",
+ "id": "other/proprietary license",
+ "name": "Other/Proprietary License",
"url": "",
"count": 1
},
@@ -64,7 +64,7 @@
"."
],
"licenses": [
- "MIT-CMU"
+ "other/proprietary license"
]
},
{
@@ -189,4 +189,4 @@
]
}
]
-}
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/python/3/pip/v2.1.json b/spec/fixtures/expected/python/3/pip/v2.1.json
index a23b401..c61f7e4 100644
--- a/spec/fixtures/expected/python/3/pip/v2.1.json
+++ b/spec/fixtures/expected/python/3/pip/v2.1.json
@@ -17,11 +17,6 @@
"url": "https://opensource.org/licenses/MIT"
},
{
- "id": "MIT-CMU",
- "name": "CMU License",
- "url": "https://github.com/python-pillow/Pillow/blob/fffb426092c8db24a5f4b6df243a8a3c01fb63cd/LICENSE"
- },
- {
"id": "Python-2.0",
"name": "Python License 2.0",
"url": "https://opensource.org/licenses/Python-2.0"
@@ -35,6 +30,11 @@
"id": "copyright (c) 2015, julien fache",
"name": "Copyright (c) 2015, Julien Fache",
"url": ""
+ },
+ {
+ "id": "other/proprietary license",
+ "name": "Other/Proprietary License",
+ "url": ""
}
],
"dependencies": [
@@ -53,7 +53,7 @@
"package_manager": "pip",
"path": "requirements.txt",
"licenses": [
- "MIT-CMU"
+ "other/proprietary license"
]
},
{
@@ -156,4 +156,4 @@
]
}
]
-}
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/python/pipenv/v1.0.json b/spec/fixtures/expected/python/pipenv/v1.0.json
index 89bce2a..6651358 100644
--- a/spec/fixtures/expected/python/pipenv/v1.0.json
+++ b/spec/fixtures/expected/python/pipenv/v1.0.json
@@ -74,4 +74,4 @@
}
}
]
-}
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/python/pipenv/v1.1.json b/spec/fixtures/expected/python/pipenv/v1.1.json
index 92a5153..15d56b1 100644
--- a/spec/fixtures/expected/python/pipenv/v1.1.json
+++ b/spec/fixtures/expected/python/pipenv/v1.1.json
@@ -99,4 +99,4 @@
}
}
]
-}
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/python/pipenv/v2.0.json b/spec/fixtures/expected/python/pipenv/v2.0.json
index 59913c2..adae6eb 100644
--- a/spec/fixtures/expected/python/pipenv/v2.0.json
+++ b/spec/fixtures/expected/python/pipenv/v2.0.json
@@ -72,4 +72,4 @@
]
}
]
-}
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/python/pipenv/v2.1.json b/spec/fixtures/expected/python/pipenv/v2.1.json
index 9e64c02..474f0be 100644
--- a/spec/fixtures/expected/python/pipenv/v2.1.json
+++ b/spec/fixtures/expected/python/pipenv/v2.1.json
@@ -60,4 +60,4 @@
]
}
]
-}
+} \ No newline at end of file
diff --git a/spec/integration/python/pip_spec.rb b/spec/integration/python/pip_spec.rb
index 856d463..f6ff10e 100644
--- a/spec/integration/python/pip_spec.rb
+++ b/spec/integration/python/pip_spec.rb
@@ -59,10 +59,10 @@ RSpec.describe "pip" do
report = runner.scan
expect(report.licenses_for('webencodings')).to eq(['bsd'])
- expect(report.licenses_for('idna')).to eq(['bsd-like'])
+ expect(report.licenses_for('idna')).to eq(['bsd'])
expect(report.licenses_for('EasyProcess')).to eq(['bsd'])
expect(report.licenses_for('PyVirtualDisplay')).to eq(['bsd'])
- expect(report.licenses_for('click')).to eq(['BSD-3-Clause'])
+ expect(report.licenses_for('click')).to eq(['bsd'])
end
end
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-02 05:12:16 +0000