Skip to content

Commit 6e6067f

Browse files
pombredannepombredanne
authored
Merge pull request #3065 from nexB/prepare-release-31-0-2
Prepare release 31.0.2
2 parents 4c0f6ac + feeb5c0 commit 6e6067f

File tree

9 files changed

+271
-18
lines changed

9 files changed

+271
-18
lines changed

‎CHANGELOG.rst

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,23 @@ License detection:
2323
positive or ambiguous license detections.
2424

2525

26+
- The data structure of the JSON output has changed for licenses. We now
27+
return match details once for each matched license expression rather than
28+
once for each license in a matched expression. There is a new top-level
29+
"license_references" attribute that contains the data details for each
30+
detected license only once. This data can contain the reference license text
31+
as an option.
32+
33+
34+
v31.0.2 - 2022-08-24
35+
----------------------------------
36+
37+
This is a minor release with small bug fixes and minor updates.
38+
39+
- Fix minor bug in PyPI package assembly
40+
- Add a few new licenses and license detection rules
41+
- Update commoncode
42+
2643

2744
v31.0.0 - 2022-08-17
2845
-----------------------
@@ -39,13 +56,6 @@ Important API changes:
3956
- The data structure of the JSON output has changed for copyrights, authors
4057
and holders. We now use a proper name for attributes and not a generic "value".
4158

42-
- The data structure of the JSON output has changed for licenses. We now
43-
return match details once for each matched license expression rather than
44-
once for each license in a matched expression. There is a new top-level
45-
"license_references" attribute that contains the data details for each
46-
detected license only once. This data can contain the reference license text
47-
as an option.
48-
4959
- The data structure of the JSON output has changed for packages. We now
5060
return "package_data" package information at the manifest file-level
5161
rather than "packages". This has all the data attributes of a "package_data"
@@ -83,7 +93,7 @@ Important API changes:
8393
from a git clone
8494

8595
- ``DatafileHandler.assemble()``, ``DatafileHandler.assemble_from_many()``, and
86-
the other ``.assemble()``` methods from the other Package handlers from
96+
the other ``.assemble()`` methods from the other Package handlers from
8797
packagedcode, have been updated to yield Package items before Dependency or
8898
Resource items. This is particulary important in the case where we are calling
8999
the ``assemble()`` method outside of the scancode-toolkit context, where we

‎azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
python_architecture: x64
183183
test_suites:
184184
click_versions: |
185-
for clk_ver in 8.0.4 8.0.3 8.0.2 8.0.1 7.1.2 7.1.1 7.1 6.7;
185+
for clk_ver in 8.1.3 8.1.2 8.1.1 8.1.0 8.0.4 8.0.3 8.0.2 8.0.1 7.1.2 7.1.1 7.1 6.7;
186186
do
187187
venv/bin/pip install click==$clk_ver;
188188
venv/bin/scancode -i samples/ -n3 --json foo.json;

‎requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ chardet==5.0.0
99
charset-normalizer==2.1.0
1010
click==8.1.3
1111
colorama==0.4.5
12-
commoncode==31.0.0b4
12+
commoncode==31.0.0
1313
construct==2.10.68
1414
container-inspector==31.1.0
1515
cryptography==37.0.4
16-
debian-inspector==31.0.0b1
16+
debian-inspector==31.0.0
1717
dockerfile-parse==1.2.0
1818
dparse2==0.6.1
1919
extractcode==31.0.0
@@ -47,7 +47,7 @@ pefile==2022.5.30
4747
pip-requirements-parser==31.2.0
4848
pkginfo2==30.0.0
4949
pluggy==1.0.0
50-
plugincode==31.0.0b1
50+
plugincode==31.0.0
5151
ply==3.11
5252
publicsuffix2==2.20191221
5353
pyahocorasick==2.0.0b1

‎setup-mini.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ install_requires =
6868
chardet >= 3.0.0
6969
click >= 6.7, !=7.0
7070
colorama >= 0.3.9
71-
commoncode==31.0.0b4
71+
commoncode >= 31.0.0
7272
container-inspector >= 31.0.0
73-
debian-inspector >= 31.0.0b1
73+
debian-inspector >= 31.0.0
7474
dparse2 >= 0.6.1
7575
fasteners
7676
fingerprints >= 0.6.0
@@ -95,7 +95,7 @@ install_requires =
9595
pkginfo2 >= 30.0.0
9696
pip-requirements-parser >= 31.2.0
9797
pluggy >= 1.0.0
98-
plugincode==31.0.0b1
98+
plugincode >= 31.0.0
9999
publicsuffix2
100100
pyahocorasick >= 2.0.0b1
101101
pygmars >= 0.7.0

‎setup.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ install_requires =
6868
chardet >= 3.0.0
6969
click >= 6.7, !=7.0
7070
colorama >= 0.3.9
71-
commoncode==31.0.0b4
71+
commoncode >= 31.0.0
7272
container-inspector >= 31.0.0
73-
debian-inspector >= 31.0.0b1
73+
debian-inspector >= 31.0.0
7474
dparse2 >= 0.6.1
7575
fasteners
7676
fingerprints >= 0.6.0
@@ -95,7 +95,7 @@ install_requires =
9595
pkginfo2 >= 30.0.0
9696
pip-requirements-parser >= 31.2.0
9797
pluggy >= 1.0.0
98-
plugincode==31.0.0b1
98+
plugincode >= 31.0.0
9999
publicsuffix2
100100
pyahocorasick >= 2.0.0b1
101101
pygmars >= 0.7.0

‎tests/packagedcode/data/pypi/setup.py/complex_setup.py

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
#!/usr/bin/env python
2+
from setuptools import setup, find_packages
3+
import pkg_resources
4+
import sys
5+
import os
6+
import fastentrypoints
7+
8+
9+
try:
10+
if int(pkg_resources.get_distribution("pip").version.split('.')[0]) < 6:
11+
print('pip older than 6.0 not supported, please upgrade pip with:\n\n'
12+
' pip install -U pip')
13+
sys.exit(-1)
14+
except pkg_resources.DistributionNotFound:
15+
pass
16+
17+
if os.environ.get('CONVERT_README'):
18+
import pypandoc
19+
20+
long_description = pypandoc.convert('README.md', 'rst')
21+
else:
22+
long_description = ''
23+
24+
version = sys.version_info[:2]
25+
if version < (2, 7):
26+
print('thefuck requires Python version 2.7 or later' +
27+
' ({}.{} detected).'.format(*version))
28+
sys.exit(-1)
29+
elif (3, 0) < version < (3, 5):
30+
print('thefuck requires Python version 3.5 or later' +
31+
' ({}.{} detected).'.format(*version))
32+
sys.exit(-1)
33+
34+
VERSION = '3.32'
35+
36+
install_requires = ['psutil', 'colorama', 'six']
37+
extras_require = {':python_version<"3.4"': ['pathlib2'],
38+
':python_version<"3.3"': ['backports.shutil_get_terminal_size'],
39+
':python_version<="2.7"': ['decorator<5', 'pyte<0.8.1'],
40+
':python_version>"2.7"': ['decorator', 'pyte'],
41+
":sys_platform=='win32'": ['win_unicode_console']}
42+
43+
setup(name='thefuck',
44+
version=VERSION,
45+
description="Magnificent app which corrects your previous console command",
46+
long_description=long_description,
47+
author='Vladimir Iakovlev',
48+
author_email='nvbn.rm@gmail.com',
49+
url='https://github.com/nvbn/thefuck',
50+
license='MIT',
51+
packages=find_packages(exclude=['ez_setup', 'examples',
52+
'tests', 'tests.*', 'release']),
53+
include_package_data=True,
54+
zip_safe=False,
55+
install_requires=install_requires,
56+
extras_require=extras_require,
57+
entry_points={'console_scripts': [
58+
'thefuck = thefuck.entrypoints.main:main',
59+
'fuck = thefuck.entrypoints.not_configured:main']})

‎tests/packagedcode/data/pypi/setup.py/complex_setup.py-expected-args.json

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"name": "thefuck",
3+
"version": "3.32",
4+
"description": "Magnificent app which corrects your previous console command",
5+
"author": "Vladimir Iakovlev",
6+
"author_email": "nvbn.rm@gmail.com",
7+
"url": "https://github.com/nvbn/thefuck",
8+
"license": "MIT",
9+
"install_requires": [
10+
"psutil",
11+
"colorama",
12+
"six"
13+
],
14+
"extras_require": {
15+
":python_version<\"3.4\"": [
16+
"pathlib2"
17+
],
18+
":python_version<\"3.3\"": [
19+
"backports.shutil_get_terminal_size"
20+
],
21+
":python_version<=\"2.7\"": [
22+
"decorator<5",
23+
"pyte<0.8.1"
24+
],
25+
":python_version>\"2.7\"": [
26+
"decorator",
27+
"pyte"
28+
],
29+
":sys_platform=='win32'": [
30+
"win_unicode_console"
31+
]
32+
}
33+
}

‎tests/packagedcode/data/pypi/setup.py/complex_setup.py-expected.json

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
[
2+
{
3+
"type": "pypi",
4+
"namespace": null,
5+
"name": "thefuck",
6+
"version": "3.32",
7+
"qualifiers": {},
8+
"subpath": null,
9+
"primary_language": "Python",
10+
"description": "Magnificent app which corrects your previous console command",
11+
"release_date": null,
12+
"parties": [
13+
{
14+
"type": "person",
15+
"role": "author",
16+
"name": "Vladimir Iakovlev",
17+
"email": "nvbn.rm@gmail.com",
18+
"url": null
19+
}
20+
],
21+
"keywords": [],
22+
"homepage_url": "https://github.com/nvbn/thefuck",
23+
"download_url": null,
24+
"size": null,
25+
"sha1": null,
26+
"md5": null,
27+
"sha256": null,
28+
"sha512": null,
29+
"bug_tracking_url": null,
30+
"code_view_url": null,
31+
"vcs_url": null,
32+
"copyright": null,
33+
"license_expression": "mit",
34+
"declared_license": {
35+
"license": "MIT"
36+
},
37+
"notice_text": null,
38+
"source_packages": [],
39+
"file_references": [],
40+
"extra_data": {},
41+
"dependencies": [
42+
{
43+
"purl": "pkg:pypi/psutil",
44+
"extracted_requirement": "psutil",
45+
"scope": "install",
46+
"is_runtime": true,
47+
"is_optional": false,
48+
"is_resolved": false,
49+
"resolved_package": {},
50+
"extra_data": {}
51+
},
52+
{
53+
"purl": "pkg:pypi/colorama",
54+
"extracted_requirement": "colorama",
55+
"scope": "install",
56+
"is_runtime": true,
57+
"is_optional": false,
58+
"is_resolved": false,
59+
"resolved_package": {},
60+
"extra_data": {}
61+
},
62+
{
63+
"purl": "pkg:pypi/six",
64+
"extracted_requirement": "six",
65+
"scope": "install",
66+
"is_runtime": true,
67+
"is_optional": false,
68+
"is_resolved": false,
69+
"resolved_package": {},
70+
"extra_data": {}
71+
},
72+
{
73+
"purl": "pkg:pypi/pathlib2",
74+
"extracted_requirement": "pathlib2",
75+
"scope": ":python_version<\"3.4\"",
76+
"is_runtime": true,
77+
"is_optional": false,
78+
"is_resolved": false,
79+
"resolved_package": {},
80+
"extra_data": {}
81+
},
82+
{
83+
"purl": "pkg:pypi/backports-shutil-get-terminal-size",
84+
"extracted_requirement": "backports.shutil_get_terminal_size",
85+
"scope": ":python_version<\"3.3\"",
86+
"is_runtime": true,
87+
"is_optional": false,
88+
"is_resolved": false,
89+
"resolved_package": {},
90+
"extra_data": {}
91+
},
92+
{
93+
"purl": "pkg:pypi/decorator",
94+
"extracted_requirement": "decorator<5",
95+
"scope": ":python_version<=\"2.7\"",
96+
"is_runtime": true,
97+
"is_optional": false,
98+
"is_resolved": false,
99+
"resolved_package": {},
100+
"extra_data": {}
101+
},
102+
{
103+
"purl": "pkg:pypi/pyte",
104+
"extracted_requirement": "pyte<0.8.1",
105+
"scope": ":python_version<=\"2.7\"",
106+
"is_runtime": true,
107+
"is_optional": false,
108+
"is_resolved": false,
109+
"resolved_package": {},
110+
"extra_data": {}
111+
},
112+
{
113+
"purl": "pkg:pypi/decorator",
114+
"extracted_requirement": "decorator",
115+
"scope": ":python_version>\"2.7\"",
116+
"is_runtime": true,
117+
"is_optional": false,
118+
"is_resolved": false,
119+
"resolved_package": {},
120+
"extra_data": {}
121+
},
122+
{
123+
"purl": "pkg:pypi/pyte",
124+
"extracted_requirement": "pyte",
125+
"scope": ":python_version>\"2.7\"",
126+
"is_runtime": true,
127+
"is_optional": false,
128+
"is_resolved": false,
129+
"resolved_package": {},
130+
"extra_data": {}
131+
},
132+
{
133+
"purl": "pkg:pypi/win-unicode-console",
134+
"extracted_requirement": "win_unicode_console",
135+
"scope": ":sys_platform=='win32'",
136+
"is_runtime": true,
137+
"is_optional": false,
138+
"is_resolved": false,
139+
"resolved_package": {},
140+
"extra_data": {}
141+
}
142+
],
143+
"repository_homepage_url": "https://pypi.org/project/thefuck",
144+
"repository_download_url": "https://pypi.org/packages/source/t/thefuck/thefuck-3.32.tar.gz",
145+
"api_data_url": "https://pypi.org/pypi/thefuck/3.32/json",
146+
"datasource_id": "pypi_setup_py",
147+
"purl": "pkg:pypi/thefuck@3.32"
148+
}
149+
]

‎tests/packagedcode/data/pypi/setup.py/complex_setup.py.ABOUT

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
date: 2022-08-20
2+
download_url: https://raw.githubusercontent.com/nvbn/thefuck/f9768cf929c5e96bd146a770b838680b4cdc04a9/setup.py

0 commit comments

Comments
 (0)