summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTetiana Chupryna <tchupryna@gitlab.com>2020-08-17 19:12:34 +0300
committerTetiana Chupryna <tchupryna@gitlab.com>2020-08-21 13:09:13 +0300
commit4510deb87ee0acb985ebeb7478cae5909741776e (patch)
treed77037daf77ebd52804ad8b292b5d5f3aa363baf
parentd221c4aa84c3f4457836023de742f4e922a59ce5 (diff)
Fix failed python specs
-rw-r--r--spec/fixtures/expected/python/2/pip/v2.1.json10
-rw-r--r--spec/fixtures/expected/python/3/pip/v2.0.json15
-rw-r--r--spec/fixtures/expected/python/3/pip/v2.1.json18
-rw-r--r--spec/fixtures/expected/python/pipenv/v2.1.json10
-rw-r--r--spec/integration/python/pip_spec.rb2
5 files changed, 27 insertions, 28 deletions
diff --git a/spec/fixtures/expected/python/2/pip/v2.1.json b/spec/fixtures/expected/python/2/pip/v2.1.json
index 36d625d..05492d6 100644
--- a/spec/fixtures/expected/python/2/pip/v2.1.json
+++ b/spec/fixtures/expected/python/2/pip/v2.1.json
@@ -7,11 +7,6 @@
"url": "https://opensource.org/licenses/BSD-3-Clause"
},
{
- "id": "bsd",
- "name": "BSD",
- "url": "http://en.wikipedia.org/wiki/BSD_licenses"
- },
- {
"id": "MIT",
"name": "MIT License",
"url": "https://opensource.org/licenses/MIT"
@@ -27,6 +22,11 @@
"url": "https://opensource.org/licenses/Python-2.0"
},
{
+ "id": "bsd",
+ "name": "BSD",
+ "url": "http://en.wikipedia.org/wiki/BSD_licenses"
+ },
+ {
"id": "copyright (c) 2015, julien fache",
"name": "Copyright (c) 2015, Julien Fache",
"url": ""
diff --git a/spec/fixtures/expected/python/3/pip/v2.0.json b/spec/fixtures/expected/python/3/pip/v2.0.json
index b5c23ae..f4f3e1c 100644
--- a/spec/fixtures/expected/python/3/pip/v2.0.json
+++ b/spec/fixtures/expected/python/3/pip/v2.0.json
@@ -2,10 +2,9 @@
"version": "2.0",
"licenses": [
{
- "id": "BSD-4-Clause",
- "name": "BSD 4-Clause \"Original\" or \"Old\" License",
- "url": "http://directory.fsf.org/wiki/License:BSD_4Clause",
- "count": 4
+ "id": "bsd",
+ "name": "BSD",
+ "url": "http://en.wikipedia.org/wiki/BSD_licenses"
},
{
"id": "MIT",
@@ -53,7 +52,7 @@
"."
],
"licenses": [
- "BSD-4-Clause"
+ "bsd"
]
},
{
@@ -86,7 +85,7 @@
"."
],
"licenses": [
- "BSD-4-Clause"
+ "bsd"
]
},
{
@@ -97,7 +96,7 @@
"."
],
"licenses": [
- "BSD-4-Clause"
+ "bsd"
]
},
{
@@ -119,7 +118,7 @@
"."
],
"licenses": [
- "BSD-4-Clause"
+ "bsd"
]
},
{
diff --git a/spec/fixtures/expected/python/3/pip/v2.1.json b/spec/fixtures/expected/python/3/pip/v2.1.json
index 787b800..a23b401 100644
--- a/spec/fixtures/expected/python/3/pip/v2.1.json
+++ b/spec/fixtures/expected/python/3/pip/v2.1.json
@@ -12,11 +12,6 @@
"url": "https://opensource.org/licenses/BSD-3-Clause"
},
{
- "id": "BSD-4-Clause",
- "name": "BSD 4-Clause \"Original\" or \"Old\" License",
- "url": "http://directory.fsf.org/wiki/License:BSD_4Clause"
- },
- {
"id": "MIT",
"name": "MIT License",
"url": "https://opensource.org/licenses/MIT"
@@ -32,6 +27,11 @@
"url": "https://opensource.org/licenses/Python-2.0"
},
{
+ "id": "bsd",
+ "name": "BSD",
+ "url": "http://en.wikipedia.org/wiki/BSD_licenses"
+ },
+ {
"id": "copyright (c) 2015, julien fache",
"name": "Copyright (c) 2015, Julien Fache",
"url": ""
@@ -44,7 +44,7 @@
"package_manager": "pip",
"path": "requirements.txt",
"licenses": [
- "BSD-4-Clause"
+ "bsd"
]
},
{
@@ -71,7 +71,7 @@
"package_manager": "pip",
"path": "requirements.txt",
"licenses": [
- "BSD-4-Clause"
+ "bsd"
]
},
{
@@ -80,7 +80,7 @@
"package_manager": "pip",
"path": "requirements.txt",
"licenses": [
- "BSD-4-Clause"
+ "bsd"
]
},
{
@@ -98,7 +98,7 @@
"package_manager": "pip",
"path": "requirements.txt",
"licenses": [
- "BSD-4-Clause"
+ "bsd"
]
},
{
diff --git a/spec/fixtures/expected/python/pipenv/v2.1.json b/spec/fixtures/expected/python/pipenv/v2.1.json
index 9c58d29..9e64c02 100644
--- a/spec/fixtures/expected/python/pipenv/v2.1.json
+++ b/spec/fixtures/expected/python/pipenv/v2.1.json
@@ -7,16 +7,16 @@
"url": "https://opensource.org/licenses/Apache-2.0"
},
{
- "id": "bsd",
- "name": "BSD",
- "url": "http://en.wikipedia.org/wiki/BSD_licenses"
- },
- {
"id": "MIT",
"name": "MIT License",
"url": "https://opensource.org/licenses/MIT"
},
{
+ "id": "bsd",
+ "name": "BSD",
+ "url": "http://en.wikipedia.org/wiki/BSD_licenses"
+ },
+ {
"id": "public domain, python, 2-clause bsd, gpl 3 (see copying.txt)",
"name": "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)",
"url": ""
diff --git a/spec/integration/python/pip_spec.rb b/spec/integration/python/pip_spec.rb
index 86cdc2b..7aec470 100644
--- a/spec/integration/python/pip_spec.rb
+++ b/spec/integration/python/pip_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe "pip" do
end
context 'with BSD licenses dependencies' do
- let(:requirements) { %w[webencodings idna click EasyProcess].join("\n") }
+ let(:requirements) { %w[webencodings idna click EasyProcess PyVirtualDisplay].join("\n") }
it 'finds proper versions of BSD license' do
runner.add_file('requirements.txt', requirements)