jrpyprogramming 0.2.2__tar.gz → 0.2.4__tar.gz

{jrpyprogramming-0.2.2 → jrpyprogramming-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: jrpyprogramming
-Version: 0.2.2
+Version: 0.2.4
 Summary: Jumping Rivers: Programming with Python
 Author: Jumping Rivers
 Author-email: info@jumpingrivers.com

jrpyprogramming-0.2.4/jrpyprogramming/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.2.4"

{jrpyprogramming-0.2.2 → jrpyprogramming-0.2.4}/jrpyprogramming/data.py

@@ -1,11 +1,16 @@
-import pandas as pd
-import pkg_resources
+from importlib import resources
 from shutil import copyfile
+import os
+
+import pandas as pd
 
 
 def load(file):
+    # Get absolute path to data
+    data_path = resources.files("jrpyprogramming") / "data"
+
     # List data sources in package
-    files = pkg_resources.resource_listdir(__name__, "data")
+    files = os.listdir(data_path)
 
     # Map from filename (without) extension, to file name with extension
     files_w_ext = {data.split(".")[0]: data for data in files}
@@ -21,20 +26,23 @@ def load(file):
     file_w_ext = files_w_ext[file]
 
     # Get absolute path to file
-    abs_path = pkg_resources.resource_filename(__name__, f"data/{file_w_ext}")
+    abs_path = data_path / file_w_ext
 
     return pd.read_csv(abs_path)
 
 
 def populate_examples():
+    # Get absolute path to data
+    data_path = resources.files("jrpyprogramming") / "data"
+
     # Get path to files relative to package
-    pkg_data = pkg_resources.resource_listdir(__name__, 'data')
+    pkg_data = os.listdir(data_path)
 
     # Only list files which have a name which starts with "data"
     files = [file for file in pkg_data if file.startswith('data')]
 
     # Copy files to current dir
     for file in files:
-        abs_path = pkg_resources.resource_filename(__name__, f'data/{file}')
+        abs_path = data_path / file
         copyfile(abs_path, file)
         print(f'\nCreated file {file} in current directory.\n')

{jrpyprogramming-0.2.2 → jrpyprogramming-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jrpyprogramming"
-version = "0.2.2"
+version = "0.2.4"
 description = "Jumping Rivers: Programming with Python"
 authors = ["Jumping Rivers <info@jumpingrivers.com>"]
 

jrpyprogramming-0.2.2/jrpyprogramming/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.2.2"