jrpyprogramming 0.2.2__tar.gz → 0.2.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jrpyprogramming
-Version: 0.2.2
+Version: 0.2.5
 Summary: Jumping Rivers: Programming with Python
 Author: Jumping Rivers
 Author-email: info@jumpingrivers.com
@@ -10,8 +10,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: jrpyintroduction (>=0.2.2)
+Requires-Dist: jrpyintroduction (>=0.3.8)
 Requires-Dist: matplotlib (>=3.5,<4.0)
-Requires-Dist: numpy (>=1.26,<2.0)
-Requires-Dist: pandas (>=1.5,<2.0)
+Requires-Dist: numpy (>=2.0,<3.0)
+Requires-Dist: pandas (>=2.2.0,<3.0.0)

{jrpyprogramming-0.2.2 → jrpyprogramming-0.2.5}/jrpyprogramming/__init__.py

@@ -1,4 +1,3 @@
 from .__version__ import __version__  # noqa: F401
 
 from . import data  # noqa: F401
-from . import vignettes  # noqa: F401

jrpyprogramming-0.2.5/jrpyprogramming/__version__.py

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

{jrpyprogramming-0.2.2 → jrpyprogramming-0.2.5}/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.5}/pyproject.toml

@@ -1,15 +1,15 @@
 [tool.poetry]
 name = "jrpyprogramming"
-version = "0.2.2"
+version = "0.2.5"
 description = "Jumping Rivers: Programming with Python"
 authors = ["Jumping Rivers <info@jumpingrivers.com>"]
 
 [tool.poetry.dependencies]
 python = ">=3.9"
-pandas = "^1.5"
-numpy = "^1.26"
+pandas = "^2.2.0"
+numpy = "^2.0"
 matplotlib = "^3.5"
-jrpyintroduction = ">=0.2.2"
+jrpyintroduction = ">=0.3.8"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

jrpyprogramming-0.2.2/jrpyprogramming/__version__.py

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

jrpyprogramming-0.2.2/jrpyprogramming/vignettes.py

@@ -1,42 +0,0 @@
-import webbrowser
-from pkg_resources import resource_listdir
-from pkg_resources import resource_filename
-
-
-def browse():
-    """
-    List all of the vignettes available for this package.
-    """
-    outs = _get_vignette_titles()
-
-    if len(outs) > 0:
-        print("\nAvailable documents: \n")
-        print("\n".join(outs))
-        print(f"\nTo open use e.g load('{outs[0]}')\n")
-    else:
-        print("\nNo documents available\n")
-
-
-def load(name):
-    """
-    Open a particular vignette from the package.
-    """
-    outs = _get_vignette_titles()
-    if name in outs:
-        path = resource_filename("jrpyprogramming", f"vignettes/{name}")
-        webbrowser.open_new(path)
-    else:
-        print(f"\nVignette '{name}' not found")
-        browse()
-
-
-def _get_vignette_titles():
-    x = resource_listdir("jrpyprogramming", "vignettes")
-    # grab only those which are pdfs or html
-    pdfs = [file for file in x if file.endswith(".pdf")]
-    htmls = [file for file in x if file.endswith(".html")]
-    # Concat pdfs and htmls
-    outs = pdfs + htmls
-    # Return in some legible order
-    outs.sort()
-    return outs