diff --git a/bin/csvalign b/bin/csvalign index 40aed3b..2404599 100755 --- a/bin/csvalign +++ b/bin/csvalign @@ -36,7 +36,7 @@ from csvmagic import libcsv __copyright__ = 'Copyright 2020-2022 Mark Kim' __license__ = 'Apache 2.0' -__version__ = '2.0.0' +__version__ = '2.1.0' __author__ = 'Mark Kim' diff --git a/bin/csvcsv b/bin/csvcsv index 3de8b3d..16106c8 100755 --- a/bin/csvcsv +++ b/bin/csvcsv @@ -36,7 +36,7 @@ from csvmagic import libcsv __copyright__ = 'Copyright 2020-2022 Mark Kim' __license__ = 'Apache 2.0' -__version__ = '2.0.0' +__version__ = '2.1.0' __author__ = 'Mark Kim' diff --git a/bin/csvcut b/bin/csvcut index 313dd09..38e1f35 100755 --- a/bin/csvcut +++ b/bin/csvcut @@ -36,7 +36,7 @@ from csvmagic import libcsv __copyright__ = 'Copyright 2019-2022 Mark Kim' __license__ = 'Apache 2.0' -__version__ = '2.0.0' +__version__ = '2.1.0' __author__ = 'Mark Kim' diff --git a/bin/csvgrep b/bin/csvgrep index 9be69ac..45273df 100755 --- a/bin/csvgrep +++ b/bin/csvgrep @@ -36,7 +36,7 @@ from csvmagic import libcsv __copyright__ = 'Copyright 2019-2022 Mark Kim' __license__ = 'Apache 2.0' -__version__ = '2.0.0' +__version__ = '2.1.0' __author__ = 'Mark Kim' diff --git a/bin/csvread b/bin/csvread index 7ff7b37..cb3ce14 100755 --- a/bin/csvread +++ b/bin/csvread @@ -33,13 +33,13 @@ import sys import errno import getopts import importlib -import pkg_resources +import importlib_resources from csvmagic import libcsv from itertools import zip_longest __copyright__ = 'Copyright 2019-2022 Mark Kim' __license__ = 'Apache 2.0' -__version__ = '2.0.0' +__version__ = '2.1.0' __author__ = 'Mark Kim' @@ -170,7 +170,7 @@ def setup_environ(): # Add plugin paths to sys.path sys.path = [ os.path.join(SCRIPTDIR, '..', 'plugins'), - pkg_resources.resource_filename('csvmagic', 'plugins'), + os.path.join(importlib_resources.files('csvmagic'), 'plugins'), ] + sys.path if 'CSV_PLUGINS_PATH' in os.environ: diff --git a/bin/csvsql b/bin/csvsql index 1932f37..55d9ad9 100755 --- a/bin/csvsql +++ b/bin/csvsql @@ -40,7 +40,7 @@ from csvmagic import libcsv __copyright__ = 'Copyright 2020-2022 Mark Kim' __license__ = 'Apache 2.0' -__version__ = '2.0.0' +__version__ = '2.1.0' __author__ = 'Mark Kim' diff --git a/lib/csvmagic/__init__.py b/lib/csvmagic/__init__.py index 8c4fb07..852d6dd 100644 --- a/lib/csvmagic/__init__.py +++ b/lib/csvmagic/__init__.py @@ -5,6 +5,6 @@ __copyright__ = "Copyright 2019-2022 Mark Kim" __license__ = "Apache 2.0" -__version__ = '2.0.0' +__version__ = '2.1.0' __author__ = "Mark Kim" diff --git a/lib/csvmagic/libcsv.py b/lib/csvmagic/libcsv.py index 612a6ef..13dbfc4 100644 --- a/lib/csvmagic/libcsv.py +++ b/lib/csvmagic/libcsv.py @@ -9,7 +9,7 @@ __copyright__ = 'Copyright 2019-2022 Mark Kim' __license__ = 'Apache 2.0' -__version__ = '2.0.0' +__version__ = '2.1.0' __author__ = 'Mark Kim' diff --git a/plugins/__init__.py b/plugins/__init__.py index 5b70005..44e8a86 100644 --- a/plugins/__init__.py +++ b/plugins/__init__.py @@ -5,6 +5,6 @@ __copyright__ = "Copyright 2019-2022 Mark Kim" __license__ = "Apache 2.0" -__version__ = '2.0.0' +__version__ = '2.1.0' __author__ = "Mark Kim" diff --git a/plugins/fix.py b/plugins/fix.py index b2eaf28..b8ed1b1 100644 --- a/plugins/fix.py +++ b/plugins/fix.py @@ -7,7 +7,7 @@ __copyright__ = "Copyright 2018-2022 Mark Kim" __license__ = "Apache 2.0" -__version__ = '2.0.0' +__version__ = '2.1.0' __author__ = "Mark Kim" diff --git a/setup.py b/setup.py index dac777a..61027f1 100755 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ setup( name = "csvmagic", description = "CSV Utilities", - version = "2.0.0", + version = "2.1.0", license = "Apache 2.0", author = "Mark Kim", author_email = "markuskimius+py@gmail.com", @@ -39,5 +39,8 @@ ], packages = find_packages("lib"), package_dir = { "": "lib" }, - install_requires = [ "getopts" ], + install_requires = [ + "getopts", + "importlib_resources", + ], )