Skip to content

Commit 0321d65

Browse files
committed
Restore a gemfileparser module for compatibility
This is breaking downstream users like ScanCode otherwise Reference: aboutcode-org/scancode-toolkit#3160 Reported-by: Daniel Thiele @danielthieleog Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent 5b2f194 commit 0321d65

5 files changed

Lines changed: 26 additions & 8 deletions

File tree

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
graft gemfileparser2
1+
graft src
22
graft tests
33

44
include AUTHORS

setup.cfg

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,23 @@ classifiers =
2626
Topic :: Utilities
2727

2828
[options]
29-
zip_safe = False
30-
include_package_data = True
29+
package_dir =
30+
=src
3131
packages = find:
32+
include_package_data = true
33+
zip_safe = false
34+
35+
py_modules =
36+
gemfileparser
37+
gemfileparser2
38+
3239

3340
setup_requires = setuptools_scm[toml] >= 4
3441

3542
python_requires = >=3.6.*
3643

44+
[options.packages.find]
45+
where = src
3746

3847
[options.extras_require]
3948
testing =

src/gemfileparser.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
# compatibility import
3+
from gemfileparser2 import * # NOQA

tests/test_gemfileparser2.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
# Copyright (c) Balasankar C <balasankarc@autistici.org> and others
44
# SPDX-License-Identifier: GPL-3.0-or-later OR MIT
55

6-
import json
76
import os
87

9-
from gemfileparser2 import GemfileParser
10-
118
TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
129

1310

@@ -18,7 +15,16 @@ def check_gemparser_results(test_file, regen=False):
1815
"-expected.json" suffix appended.
1916
"""
2017
test_file = os.path.join(TEST_DATA_DIR, test_file)
21-
gemparser = GemfileParser(test_file)
18+
19+
from gemfileparser2 import GemfileParser as GemfileParser2
20+
from gemfileparser import GemfileParser
21+
_check_gemparser_results(test_file, parser=GemfileParser, regen=regen)
22+
_check_gemparser_results(test_file, parser=GemfileParser2, regen=regen)
23+
24+
25+
def _check_gemparser_results(test_file, parser, regen=False):
26+
import json
27+
gemparser = parser(test_file)
2228
dependencies = {
2329
group: [dep.to_dict() for dep in deps]
2430
for group, deps in gemparser.parse().items()
@@ -72,7 +78,7 @@ def test_gemspec_3():
7278

7379

7480
def test_gemspec_no_deps():
75-
check_gemparser_results("gemspecs/arel2.gemspec", regen=False)
81+
check_gemparser_results("gemspecs/arel2.gemspec", regen=False)
7682

7783

7884
def test_gemspec_4():

0 commit comments

Comments
 (0)