Fix handling of nested resource files (#308)

Author: blink1073

.github/workflows/test.yml

@@ -45,7 +45,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ["3.7", "3.10"]
+        python-version: ["3.8", "3.10"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

docs/source/how_to_guides/write_config.md

@@ -93,5 +93,5 @@ package
 
 ```toml
 [tool.jupyter-releaser.options]
-pydist_resource_paths = ["my-package/img1.png", "my-package/foo.json"]
+pydist_resource_paths = ["my-package/img1.png", "my-package/foo/bar.json"]
 ```

jupyter_releaser/python.py

@@ -82,12 +82,11 @@ def check_dist(
                 )
             raise e
         for resource_path in resource_paths:
-            name, _, rest = resource_path.partition("/")
+            name, _, _ = resource_path.partition("/")
             test_file = Path(td) / "test_path.py"
             test_text = f"""
-import importlib.resources
-with importlib.resources.path('{name}','{rest}') as resource_path:
-    assert resource_path.exists()
+from importlib.metadata import PackagePath, files
+assert PackagePath('{resource_path}') in files('{name}')
 """
             test_file.write_text(test_text, encoding="utf-8")
             test_file = util.normalize_path(test_file)
@@ -124,12 +123,12 @@ def get_pypi_token(release_url, python_package):
 def start_local_pypi():
     """Start a local PyPI server"""
     temp_dir = TemporaryDirectory()
-    cmd = f"pypi-server -p 8081  -P . -a . -o  -v {temp_dir.name}"
-    proc = Popen(shlex.split(cmd), stderr=PIPE)
+    cmd = f"pypi-server run -p 8081  -P . -a . -o  -v {temp_dir.name}"
+    proc = Popen(shlex.split(cmd), stdout=PIPE)
     # Wait for the server to start
     while True:
-        assert proc.stderr is not None
-        line = proc.stderr.readline().decode("utf-8").strip()
+        assert proc.stdout is not None
+        line = proc.stdout.readline().decode("utf-8").strip()
         util.log(line)
         if "Listening on" in line:
             break

jupyter_releaser/tests/test_cli.py

@@ -441,19 +441,21 @@ def test_check_python_different_names(
 
 
 def test_check_python_resource_path(monkeypatch, py_package, runner, build_mock, git_prep):
-    monkeypatch.setenv("RH_PYDIST_RESOURCE_PATHS", "foo/baz.txt")
+    monkeypatch.setenv("RH_PYDIST_RESOURCE_PATHS", "foo/bar/baz.txt")
 
     # Convert the package to use a package dir.
     foo_dir = Path(util.CHECKOUT_NAME) / "foo"
     foo_dir.mkdir()
     shutil.move(Path(util.CHECKOUT_NAME) / "foo.py", foo_dir / "__init__.py")
 
-    path = foo_dir / "baz.txt"
+    bar_dir = foo_dir / "bar"
+    bar_dir.mkdir()
+    path = bar_dir / "baz.txt"
     path.write_text("hello", encoding="utf-8")
 
     manifest = Path(util.CHECKOUT_NAME) / "MANIFEST.in"
     manifest_text = manifest.read_text(encoding="utf-8")
-    manifest_text += "\ninclude foo/baz.txt\n"
+    manifest_text += "\ninclude foo/bar/baz.txt\n"
     manifest.write_text(manifest_text, encoding="utf-8")
 
     setup_cfg_path = Path(util.CHECKOUT_NAME) / "setup.cfg"

setup.cfg

@@ -27,7 +27,7 @@ include_package_data = True
 packages = find:
 package_dir =
     "" = "jupyter_releaser"
-python_requires = >=3.7
+python_requires = >=3.8
 install_requires =
     build
     check-manifest