rms-filecache 2.0.3__tar.gz → 2.1.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/.github/workflows/run-tests.yml +3 -3
  2. {rms_filecache-2.0.3/rms_filecache.egg-info → rms_filecache-2.1.0}/PKG-INFO +2 -1
  3. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/filecache/_version.py +2 -2
  4. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/filecache/file_cache.py +2 -2
  5. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/filecache/file_cache_source.py +7 -7
  6. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/pyproject.toml +4 -0
  7. {rms_filecache-2.0.3 → rms_filecache-2.1.0/rms_filecache.egg-info}/PKG-INFO +2 -1
  8. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/rms_filecache.egg-info/SOURCES.txt +1 -0
  9. rms_filecache-2.1.0/tests/__init__.py +0 -0
  10. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/tests/test_file_cache.py +1 -1
  11. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/.coveragerc +0 -0
  12. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/.flake8 +0 -0
  13. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/.github/pull_request_template.md +0 -0
  14. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/.github/workflows/publish_to_pypi.yml +0 -0
  15. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/.github/workflows/publish_to_test_pypi.yml +0 -0
  16. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/.gitignore +0 -0
  17. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/.readthedocs.yaml +0 -0
  18. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/LICENSE +0 -0
  19. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/README.md +0 -0
  20. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/docs/Makefile +0 -0
  21. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/docs/conf.py +0 -0
  22. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/docs/index.rst +0 -0
  23. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/docs/make.bat +0 -0
  24. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/docs/module.rst +0 -0
  25. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/filecache/__init__.py +0 -0
  26. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/filecache/file_cache_path.py +0 -0
  27. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/filecache/file_cache_types.py +0 -0
  28. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/filecache/my_glob.py +0 -0
  29. /rms_filecache-2.0.3/tests/__init__.py → /rms_filecache-2.1.0/filecache/py.typed +0 -0
  30. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/mypy.ini +0 -0
  31. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/requirements.txt +0 -0
  32. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/rms_filecache.egg-info/dependency_links.txt +0 -0
  33. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/rms_filecache.egg-info/requires.txt +0 -0
  34. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/rms_filecache.egg-info/top_level.txt +0 -0
  35. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/setup.cfg +0 -0
  36. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/test_files/expected/lorem1.txt +0 -0
  37. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/test_files/expected/subdir1/lorem1.txt +0 -0
  38. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/test_files/expected/subdir1/subdir2a/binary1.bin +0 -0
  39. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/test_files/expected/subdir1/subdir2b/binary1.bin +0 -0
  40. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/test_programs/locking.py +0 -0
  41. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/test_programs/multi_download.py +0 -0
  42. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/tests/gs_lifecycle_config.json +0 -0
  43. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/tests/gs_lifecycle_config_info.txt +0 -0
  44. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/tests/s3_bucket_policy_read.txt +0 -0
  45. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/tests/s3_bucket_policy_write.txt +0 -0
  46. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/tests/s3_lifecycle_policy.txt +0 -0
  47. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/tests/test_file_cache_path.py +0 -0
  48. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/tests/test_file_cache_source.py +0 -0
  49. {rms_filecache-2.0.3 → rms_filecache-2.1.0}/tests/test_url_to_path.py +0 -0
@@ -43,7 +43,7 @@ jobs:
43
43
  strategy:
44
44
  matrix:
45
45
  os: [ubuntu-latest, macos-latest, windows-latest]
46
- python-version: ['3.9', '3.10', '3.11', '3.12']
46
+ python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
47
47
  fail-fast: false
48
48
  permissions:
49
49
  contents: read
@@ -80,8 +80,8 @@ jobs:
80
80
  coverage report -m
81
81
 
82
82
  - name: Upload coverage report to codecov
83
- uses: codecov/codecov-action@v4
84
- if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.12'
83
+ uses: codecov/codecov-action@v5
84
+ if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.13'
85
85
  with:
86
86
  token: ${{ secrets.CODECOV_TOKEN }}
87
87
  verbose: true
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: rms-filecache
3
- Version: 2.0.3
3
+ Version: 2.1.0
4
4
  Summary: File cache for files retrieved from the cloud
5
5
  Maintainer-email: "Robert S. French" <rfrench@seti.org>
6
6
  License: Apache-2.0
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.9
19
19
  Classifier: Programming Language :: Python :: 3.10
20
20
  Classifier: Programming Language :: Python :: 3.11
21
21
  Classifier: Programming Language :: Python :: 3.12
22
+ Classifier: Programming Language :: Python :: 3.13
22
23
  Classifier: Operating System :: MacOS :: MacOS X
23
24
  Classifier: Operating System :: POSIX :: Linux
24
25
  Classifier: Operating System :: Microsoft :: Windows
@@ -12,5 +12,5 @@ __version__: str
12
12
  __version_tuple__: VERSION_TUPLE
13
13
  version_tuple: VERSION_TUPLE
14
14
 
15
- __version__ = version = '2.0.3'
16
- __version_tuple__ = version_tuple = (2, 0, 3)
15
+ __version__ = version = '2.1.0'
16
+ __version_tuple__ = version_tuple = (2, 1, 0)
@@ -349,7 +349,7 @@ class FileCache:
349
349
  # file:///dir/file
350
350
  # We have to add the / back on the beginning
351
351
  sub_path = f'/{sub_path}'
352
- sub_path = str(Path(sub_path).expanduser().resolve())
352
+ sub_path = str(Path(sub_path))
353
353
  if scheme not in _SCHEME_CLASSES:
354
354
  raise ValueError(f'Unknown scheme {scheme} in {url}')
355
355
  return scheme, remote, sub_path
@@ -362,7 +362,7 @@ class FileCache:
362
362
  cache_dir: Path,
363
363
  cache_subdir: str) -> Path:
364
364
  if scheme == 'file':
365
- return Path(path).expanduser().resolve()
365
+ return Path(path)
366
366
  return cache_dir / cache_subdir / path
367
367
 
368
368
  def _get_source_and_paths(self,
@@ -333,7 +333,7 @@ class FileCacheSourceFile(FileCacheSource):
333
333
  file.
334
334
  """
335
335
 
336
- local_path_p = Path(local_path).expanduser().resolve()
336
+ local_path_p = Path(local_path)
337
337
 
338
338
  if not local_path_p.is_file():
339
339
  raise FileNotFoundError(f'File does not exist: {local_path_p}')
@@ -360,7 +360,7 @@ class FileCacheSourceFile(FileCacheSource):
360
360
  FileNotFoundError: If the file does not exist.
361
361
  """
362
362
 
363
- local_path_p = Path(local_path).expanduser().resolve()
363
+ local_path_p = Path(local_path)
364
364
 
365
365
  if not local_path_p.is_file():
366
366
  raise FileNotFoundError(f'File does not exist: {local_path_p}')
@@ -452,7 +452,7 @@ class FileCacheSourceHTTP(FileCacheSource):
452
452
  The download is an atomic operation.
453
453
  """
454
454
 
455
- local_path = Path(local_path).expanduser().resolve()
455
+ local_path = Path(local_path)
456
456
 
457
457
  url = self._src_prefix_ + sub_path
458
458
 
@@ -568,7 +568,7 @@ class FileCacheSourceGS(FileCacheSource):
568
568
  The download is an atomic operation.
569
569
  """
570
570
 
571
- local_path = Path(local_path).expanduser().resolve()
571
+ local_path = Path(local_path)
572
572
 
573
573
  local_path.parent.mkdir(parents=True, exist_ok=True)
574
574
 
@@ -608,7 +608,7 @@ class FileCacheSourceGS(FileCacheSource):
608
608
  FileNotFoundError: If the local file does not exist.
609
609
  """
610
610
 
611
- local_path = Path(local_path).expanduser().resolve()
611
+ local_path = Path(local_path)
612
612
 
613
613
  if not local_path.exists():
614
614
  raise FileNotFoundError(f'File does not exist: {local_path}')
@@ -709,7 +709,7 @@ class FileCacheSourceS3(FileCacheSource):
709
709
  The download is an atomic operation.
710
710
  """
711
711
 
712
- local_path = Path(local_path).expanduser().resolve()
712
+ local_path = Path(local_path)
713
713
 
714
714
  local_path.parent.mkdir(parents=True, exist_ok=True)
715
715
 
@@ -745,7 +745,7 @@ class FileCacheSourceS3(FileCacheSource):
745
745
  FileNotFoundError: If the local file does not exist.
746
746
  """
747
747
 
748
- local_path = Path(local_path).expanduser().resolve()
748
+ local_path = Path(local_path)
749
749
 
750
750
  self._client.upload_file(str(local_path), self._bucket_name, sub_path)
751
751
 
@@ -36,6 +36,7 @@ classifiers = [
36
36
  "Programming Language :: Python :: 3.10",
37
37
  "Programming Language :: Python :: 3.11",
38
38
  "Programming Language :: Python :: 3.12",
39
+ "Programming Language :: Python :: 3.13",
39
40
  "Operating System :: MacOS :: MacOS X",
40
41
  "Operating System :: POSIX :: Linux",
41
42
  "Operating System :: Microsoft :: Windows"
@@ -51,6 +52,9 @@ Issues = "https://github.com/SETI/rms-filecache/issues"
51
52
  [tool.setuptools]
52
53
  packages = ["filecache"]
53
54
 
55
+ [tool.setuptools.package-data]
56
+ "pkgname" = ["py.typed"]
57
+
54
58
  [tool.setuptools_scm]
55
59
  local_scheme = "no-local-version"
56
60
  write_to = "filecache/_version.py"
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: rms-filecache
3
- Version: 2.0.3
3
+ Version: 2.1.0
4
4
  Summary: File cache for files retrieved from the cloud
5
5
  Maintainer-email: "Robert S. French" <rfrench@seti.org>
6
6
  License: Apache-2.0
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.9
19
19
  Classifier: Programming Language :: Python :: 3.10
20
20
  Classifier: Programming Language :: Python :: 3.11
21
21
  Classifier: Programming Language :: Python :: 3.12
22
+ Classifier: Programming Language :: Python :: 3.13
22
23
  Classifier: Operating System :: MacOS :: MacOS X
23
24
  Classifier: Operating System :: POSIX :: Linux
24
25
  Classifier: Operating System :: Microsoft :: Windows
@@ -24,6 +24,7 @@ filecache/file_cache_path.py
24
24
  filecache/file_cache_source.py
25
25
  filecache/file_cache_types.py
26
26
  filecache/my_glob.py
27
+ filecache/py.typed
27
28
  rms_filecache.egg-info/PKG-INFO
28
29
  rms_filecache.egg-info/SOURCES.txt
29
30
  rms_filecache.egg-info/dependency_links.txt
File without changes
@@ -220,7 +220,7 @@ def test_easy_logger(capsys):
220
220
  with FileCache(cache_name=None) as fc:
221
221
  fc.get_local_path(f'{WINDOWS_PREFIX}/')
222
222
  if WINDOWS_PREFIX:
223
- assert 'Returning local path for c:/ as C:\\\n' in capsys.readouterr().out
223
+ assert 'Returning local path for c:/ as c:\\\n' in capsys.readouterr().out
224
224
  else:
225
225
  assert 'Returning local path for / as /\n' in capsys.readouterr().out
226
226
  filecache.set_global_logger(None)
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes