Skip to content

Commit aa5c662

Browse files
pombredannepombredanne
committed
Adapt PyPI tests with correct requirements
We now include the original requirements as-is Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent 9dbbccd commit aa5c662

28 files changed

Lines changed: 189 additions & 189 deletions

‎tests/packagedcode/data/pypi/more_setup.py/extras_require_with_vars_setup.py-expected.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"dependencies": [
3232
{
3333
"purl": "pkg:pypi/pytest",
34-
"extracted_requirement": null,
34+
"extracted_requirement": "pytest",
3535
"scope": "test",
3636
"is_runtime": true,
3737
"is_optional": false,

‎tests/packagedcode/data/pypi/more_setup.py/flask_setup.py-expected.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"dependencies": [
7171
{
7272
"purl": "pkg:pypi/werkzeug",
73-
"extracted_requirement": ">=0.14",
73+
"extracted_requirement": "Werkzeug>=0.14",
7474
"scope": "install",
7575
"is_runtime": true,
7676
"is_optional": false,
@@ -79,7 +79,7 @@
7979
},
8080
{
8181
"purl": "pkg:pypi/jinja2",
82-
"extracted_requirement": ">=2.10",
82+
"extracted_requirement": "Jinja2>=2.10",
8383
"scope": "install",
8484
"is_runtime": true,
8585
"is_optional": false,
@@ -88,7 +88,7 @@
8888
},
8989
{
9090
"purl": "pkg:pypi/itsdangerous",
91-
"extracted_requirement": ">=0.24",
91+
"extracted_requirement": "itsdangerous>=0.24",
9292
"scope": "install",
9393
"is_runtime": true,
9494
"is_optional": false,
@@ -97,7 +97,7 @@
9797
},
9898
{
9999
"purl": "pkg:pypi/click",
100-
"extracted_requirement": ">=5.1",
100+
"extracted_requirement": "click>=5.1",
101101
"scope": "install",
102102
"is_runtime": true,
103103
"is_optional": false,
@@ -106,7 +106,7 @@
106106
},
107107
{
108108
"purl": "pkg:pypi/python-dotenv",
109-
"extracted_requirement": null,
109+
"extracted_requirement": "python-dotenv",
110110
"scope": "dotenv",
111111
"is_runtime": true,
112112
"is_optional": false,
@@ -115,7 +115,7 @@
115115
},
116116
{
117117
"purl": "pkg:pypi/pytest",
118-
"extracted_requirement": ">=3",
118+
"extracted_requirement": "pytest>=3",
119119
"scope": "dev",
120120
"is_runtime": true,
121121
"is_optional": false,
@@ -124,7 +124,7 @@
124124
},
125125
{
126126
"purl": "pkg:pypi/coverage",
127-
"extracted_requirement": null,
127+
"extracted_requirement": "coverage",
128128
"scope": "dev",
129129
"is_runtime": true,
130130
"is_optional": false,
@@ -133,7 +133,7 @@
133133
},
134134
{
135135
"purl": "pkg:pypi/tox",
136-
"extracted_requirement": null,
136+
"extracted_requirement": "tox",
137137
"scope": "dev",
138138
"is_runtime": true,
139139
"is_optional": false,
@@ -142,7 +142,7 @@
142142
},
143143
{
144144
"purl": "pkg:pypi/sphinx",
145-
"extracted_requirement": null,
145+
"extracted_requirement": "sphinx",
146146
"scope": "dev",
147147
"is_runtime": true,
148148
"is_optional": false,
@@ -151,7 +151,7 @@
151151
},
152152
{
153153
"purl": "pkg:pypi/pallets-sphinx-themes",
154-
"extracted_requirement": null,
154+
"extracted_requirement": "pallets-sphinx-themes",
155155
"scope": "dev",
156156
"is_runtime": true,
157157
"is_optional": false,
@@ -160,7 +160,7 @@
160160
},
161161
{
162162
"purl": "pkg:pypi/sphinxcontrib-log-cabinet",
163-
"extracted_requirement": null,
163+
"extracted_requirement": "sphinxcontrib-log-cabinet",
164164
"scope": "dev",
165165
"is_runtime": true,
166166
"is_optional": false,
@@ -169,7 +169,7 @@
169169
},
170170
{
171171
"purl": "pkg:pypi/sphinx",
172-
"extracted_requirement": null,
172+
"extracted_requirement": "sphinx",
173173
"scope": "docs",
174174
"is_runtime": true,
175175
"is_optional": false,
@@ -178,7 +178,7 @@
178178
},
179179
{
180180
"purl": "pkg:pypi/pallets-sphinx-themes",
181-
"extracted_requirement": null,
181+
"extracted_requirement": "pallets-sphinx-themes",
182182
"scope": "docs",
183183
"is_runtime": true,
184184
"is_optional": false,
@@ -187,7 +187,7 @@
187187
},
188188
{
189189
"purl": "pkg:pypi/sphinxcontrib-log-cabinet",
190-
"extracted_requirement": null,
190+
"extracted_requirement": "sphinxcontrib-log-cabinet",
191191
"scope": "docs",
192192
"is_runtime": true,
193193
"is_optional": false,

‎tests/packagedcode/data/pypi/more_setup.py/pendulum_setup.py-expected.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"dependencies": [
4242
{
4343
"purl": "pkg:pypi/python-dateutil",
44-
"extracted_requirement": "<3.0,>=2.6",
44+
"extracted_requirement": "python-dateutil<3.0,>=2.6",
4545
"scope": "install",
4646
"is_runtime": true,
4747
"is_optional": false,
@@ -50,7 +50,7 @@
5050
},
5151
{
5252
"purl": "pkg:pypi/pytzdata",
53-
"extracted_requirement": ">=2018.3",
53+
"extracted_requirement": "pytzdata>=2018.3",
5454
"scope": "install",
5555
"is_runtime": true,
5656
"is_optional": false,
@@ -59,7 +59,7 @@
5959
},
6060
{
6161
"purl": "pkg:pypi/typing",
62-
"extracted_requirement": "<4.0,>=3.6",
62+
"extracted_requirement": "typing<4.0,>=3.6",
6363
"scope": ":python_version < \"3.5\"",
6464
"is_runtime": true,
6565
"is_optional": false,

‎tests/packagedcode/data/pypi/more_setup.py/requests_setup.py-expected.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"dependencies": [
5252
{
5353
"purl": "pkg:pypi/chardet",
54-
"extracted_requirement": "<3.1.0,>=3.0.2",
54+
"extracted_requirement": "chardet<3.1.0,>=3.0.2",
5555
"scope": "install",
5656
"is_runtime": true,
5757
"is_optional": false,
@@ -60,7 +60,7 @@
6060
},
6161
{
6262
"purl": "pkg:pypi/idna",
63-
"extracted_requirement": "<2.8,>=2.5",
63+
"extracted_requirement": "idna<2.8,>=2.5",
6464
"scope": "install",
6565
"is_runtime": true,
6666
"is_optional": false,
@@ -69,7 +69,7 @@
6969
},
7070
{
7171
"purl": "pkg:pypi/urllib3",
72-
"extracted_requirement": "<1.25,>=1.21.1",
72+
"extracted_requirement": "urllib3<1.25,>=1.21.1",
7373
"scope": "install",
7474
"is_runtime": true,
7575
"is_optional": false,
@@ -78,7 +78,7 @@
7878
},
7979
{
8080
"purl": "pkg:pypi/certifi",
81-
"extracted_requirement": ">=2017.4.17",
81+
"extracted_requirement": "certifi>=2017.4.17",
8282
"scope": "install",
8383
"is_runtime": true,
8484
"is_optional": false,
@@ -87,7 +87,7 @@
8787
},
8888
{
8989
"purl": "pkg:pypi/pyopenssl",
90-
"extracted_requirement": ">=0.14",
90+
"extracted_requirement": "pyOpenSSL>=0.14",
9191
"scope": "security",
9292
"is_runtime": true,
9393
"is_optional": false,
@@ -96,7 +96,7 @@
9696
},
9797
{
9898
"purl": "pkg:pypi/cryptography",
99-
"extracted_requirement": ">=1.3.4",
99+
"extracted_requirement": "cryptography>=1.3.4",
100100
"scope": "security",
101101
"is_runtime": true,
102102
"is_optional": false,
@@ -105,7 +105,7 @@
105105
},
106106
{
107107
"purl": "pkg:pypi/idna",
108-
"extracted_requirement": ">=2.0.0",
108+
"extracted_requirement": "idna>=2.0.0",
109109
"scope": "security",
110110
"is_runtime": true,
111111
"is_optional": false,
@@ -114,7 +114,7 @@
114114
},
115115
{
116116
"purl": "pkg:pypi/pysocks",
117-
"extracted_requirement": "!=1.5.7,>=1.5.6",
117+
"extracted_requirement": "PySocks!=1.5.7,>=1.5.6",
118118
"scope": "socks",
119119
"is_runtime": true,
120120
"is_optional": false,
@@ -123,7 +123,7 @@
123123
},
124124
{
125125
"purl": "pkg:pypi/win-inet-pton",
126-
"extracted_requirement": null,
126+
"extracted_requirement": "win_inet_pton",
127127
"scope": "socks:sys_platform == \"win32\" and python_version == \"2.7\"",
128128
"is_runtime": true,
129129
"is_optional": false,

‎tests/packagedcode/data/pypi/more_setup.py/sqlalchemy_setup.py-expected.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"dependencies": [
5454
{
5555
"purl": "pkg:pypi/mysqlclient",
56-
"extracted_requirement": null,
56+
"extracted_requirement": "mysqlclient",
5757
"scope": "mysql",
5858
"is_runtime": true,
5959
"is_optional": false,
@@ -62,7 +62,7 @@
6262
},
6363
{
6464
"purl": "pkg:pypi/pymysql",
65-
"extracted_requirement": null,
65+
"extracted_requirement": "pymysql",
6666
"scope": "pymysql",
6767
"is_runtime": true,
6868
"is_optional": false,
@@ -71,7 +71,7 @@
7171
},
7272
{
7373
"purl": "pkg:pypi/psycopg2",
74-
"extracted_requirement": null,
74+
"extracted_requirement": "psycopg2",
7575
"scope": "postgresql",
7676
"is_runtime": true,
7777
"is_optional": false,
@@ -80,7 +80,7 @@
8080
},
8181
{
8282
"purl": "pkg:pypi/pg8000",
83-
"extracted_requirement": null,
83+
"extracted_requirement": "pg8000",
8484
"scope": "postgresql_pg8000",
8585
"is_runtime": true,
8686
"is_optional": false,
@@ -89,7 +89,7 @@
8989
},
9090
{
9191
"purl": "pkg:pypi/psycopg2cffi",
92-
"extracted_requirement": null,
92+
"extracted_requirement": "psycopg2cffi",
9393
"scope": "postgresql_psycopg2cffi",
9494
"is_runtime": true,
9595
"is_optional": false,
@@ -98,7 +98,7 @@
9898
},
9999
{
100100
"purl": "pkg:pypi/cx-oracle",
101-
"extracted_requirement": null,
101+
"extracted_requirement": "cx_oracle",
102102
"scope": "oracle",
103103
"is_runtime": true,
104104
"is_optional": false,
@@ -107,7 +107,7 @@
107107
},
108108
{
109109
"purl": "pkg:pypi/pyodbc",
110-
"extracted_requirement": null,
110+
"extracted_requirement": "pyodbc",
111111
"scope": "mssql_pyodbc",
112112
"is_runtime": true,
113113
"is_optional": false,
@@ -116,7 +116,7 @@
116116
},
117117
{
118118
"purl": "pkg:pypi/pymssql",
119-
"extracted_requirement": null,
119+
"extracted_requirement": "pymssql",
120120
"scope": "mssql_pymssql",
121121
"is_runtime": true,
122122
"is_optional": false,

‎tests/packagedcode/data/pypi/more_setup.py/unpack_kwargs_setup.py-expected.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"dependencies": [
4242
{
4343
"purl": "pkg:pypi/pendulum",
44-
"extracted_requirement": ">=1.4.4",
44+
"extracted_requirement": "pendulum>=1.4.4",
4545
"scope": "install",
4646
"is_runtime": true,
4747
"is_optional": false,
@@ -50,7 +50,7 @@
5050
},
5151
{
5252
"purl": "pkg:pypi/cachy",
53-
"extracted_requirement": ">=0.2.0",
53+
"extracted_requirement": "cachy[msgpack]>=0.2.0",
5454
"scope": "install",
5555
"is_runtime": true,
5656
"is_optional": false,

‎tests/packagedcode/data/pypi/setup.py-versions/cdp-seattle-backend-1.0.0/setup.py-expected.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"dependencies": [
5454
{
5555
"purl": "pkg:pypi/cdp-backend@3.0.16",
56-
"extracted_requirement": "==3.0.16",
56+
"extracted_requirement": "cdp-backend[pipeline]==3.0.16",
5757
"scope": "install",
5858
"is_runtime": true,
5959
"is_optional": false,
@@ -62,7 +62,7 @@
6262
},
6363
{
6464
"purl": "pkg:pypi/cdp-scrapers",
65-
"extracted_requirement": ">=0.4.0",
65+
"extracted_requirement": "cdp-scrapers>=0.4.0",
6666
"scope": "install",
6767
"is_runtime": true,
6868
"is_optional": false,
@@ -71,7 +71,7 @@
7171
},
7272
{
7373
"purl": "pkg:pypi/black",
74-
"extracted_requirement": ">=19.10b0",
74+
"extracted_requirement": "black>=19.10b0",
7575
"scope": "test",
7676
"is_runtime": true,
7777
"is_optional": false,
@@ -80,7 +80,7 @@
8080
},
8181
{
8282
"purl": "pkg:pypi/flake8",
83-
"extracted_requirement": ">=3.8.3",
83+
"extracted_requirement": "flake8>=3.8.3",
8484
"scope": "test",
8585
"is_runtime": true,
8686
"is_optional": false,
@@ -89,7 +89,7 @@
8989
},
9090
{
9191
"purl": "pkg:pypi/flake8-debugger",
92-
"extracted_requirement": ">=3.2.1",
92+
"extracted_requirement": "flake8-debugger>=3.2.1",
9393
"scope": "test",
9494
"is_runtime": true,
9595
"is_optional": false,

0 commit comments

Comments
 (0)