Skip to content

Commit 0d25683

Browse files
committed
Minor fixes and updates
* Use updated typecode package * Fix broken pytest.mark reference * Update entry_point for extractcode cli utility Signed-off-by: Steven Esser <sesser@nexb.com>
1 parent 40a3871 commit 0d25683

File tree

2 files changed

+23
-13
lines changed

2 files changed

+23
-13
lines changed

setup.cfg

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@ universal=1
33

44
[metadata]
55
license_file = apache-2.0.LICENSE
6-
name = skeleton
6+
name = extractcode
77
author = nexB. Inc. and others
88
author_email = info@aboutcode.org
9-
description = skeleton
9+
description = A set of utilities and functions for extracting archives.
1010
long_description = file:README.rst
11-
url = https://github.com/nexB/skeleton
11+
url = https://github.com/nexB/extractcode
1212
classifiers =
13-
Development Status :: 5 - Production/Stable
14-
Intended Audience :: Developers
15-
Programming Language :: Python :: 3
16-
Programming Language :: Python :: 3 :: Only
13+
Development Status :: 5 - Production/Stable
14+
Intended Audience :: Developers
15+
Programming Language :: Python :: 2
16+
Programming Language :: Python :: 3
1717
Topic :: Software Development
1818
Topic :: Utilities
19-
keywords =
2019

2120
[options]
2221
package_dir=
@@ -25,13 +24,25 @@ packages=find:
2524
include_package_data = true
2625
zip_safe = false
2726
install_requires =
27+
commoncode >= 20.10
28+
plugincode >= 20.09
29+
typecode >= 20.10
30+
typecode-libmagic >= 5.39.1.1
31+
patch >= 1.15
32+
extractcode-7z >= 16.5
33+
extractcode-libarchive >= 3.4.3
34+
2835
setup_requires = setuptools_scm[toml] >= 4
2936

3037
[options.packages.find]
3138
where=src
3239

3340
[options.extras_require]
3441
testing =
35-
# upstream
36-
pytest >= 6
37-
pytest-xdist >= 2
42+
# upstream
43+
pytest >= 6
44+
pytest-xdist >= 2
45+
46+
[options.entry_points]
47+
console-scripts =
48+
extractcode = extractcode.cli:extractcode

tests/extractcode/test_archive.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
3+
# Copyright (c) nexB Inc. and others. All rights reserved.
44
# http://nexb.com and https://github.com/nexB/scancode-toolkit/
55
# The ScanCode software is licensed under the Apache License version 2.0.
66
# Data generated with ScanCode require an acknowledgment.
@@ -2767,7 +2767,6 @@ def test_extract_zip_with_weird_filenames_with_sevenzip_win(self):
27672767

27682768

27692769
class TestZipSlip(BaseArchiveTestCase):
2770-
pytestmark = pytest.mark.scanslow
27712770

27722771
def test_extract_zipslip_zip_posix(self):
27732772
test_file = self.get_test_loc('archive/zipslip/zip-slip.zip')

0 commit comments

Comments
 (0)