use importlib (v2.1.0)

markuskimius · Mar 2, 2024 · cc9ea0d · cc9ea0d
1 parent 619f587
commit cc9ea0d
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 = "[email protected]",
@@ -39,5 +39,8 @@
                                     ],
                          packages = find_packages("lib"),
                       package_dir = { "": "lib" },
-                 install_requires = [ "getopts" ],
+                 install_requires = [
+                                        "getopts",
+                                        "importlib_resources",
+                                    ],
 )