cloud-files 5.3.1__tar.gz → 5.4.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 (38) hide show
  1. {cloud_files-5.3.1 → cloud_files-5.4.0}/ChangeLog +10 -1
  2. {cloud_files-5.3.1 → cloud_files-5.4.0}/PKG-INFO +2 -3
  3. {cloud_files-5.3.1 → cloud_files-5.4.0}/automated_test.py +3 -0
  4. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloud_files.egg-info/PKG-INFO +2 -3
  5. cloud_files-5.4.0/cloud_files.egg-info/pbr.json +1 -0
  6. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/cloudfiles.py +4 -0
  7. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/paths.py +7 -2
  8. {cloud_files-5.3.1 → cloud_files-5.4.0}/setup.cfg +1 -2
  9. cloud_files-5.3.1/cloud_files.egg-info/pbr.json +0 -1
  10. {cloud_files-5.3.1 → cloud_files-5.4.0}/.github/workflows/test-suite.yml +0 -0
  11. {cloud_files-5.3.1 → cloud_files-5.4.0}/AUTHORS +0 -0
  12. {cloud_files-5.3.1 → cloud_files-5.4.0}/LICENSE +0 -0
  13. {cloud_files-5.3.1 → cloud_files-5.4.0}/MANIFEST.in +0 -0
  14. {cloud_files-5.3.1 → cloud_files-5.4.0}/README.md +0 -0
  15. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloud_files.egg-info/SOURCES.txt +0 -0
  16. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloud_files.egg-info/dependency_links.txt +0 -0
  17. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloud_files.egg-info/entry_points.txt +0 -0
  18. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloud_files.egg-info/not-zip-safe +0 -0
  19. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloud_files.egg-info/requires.txt +0 -0
  20. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloud_files.egg-info/top_level.txt +0 -0
  21. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/__init__.py +0 -0
  22. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/compression.py +0 -0
  23. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/connectionpools.py +0 -0
  24. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/exceptions.py +0 -0
  25. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/gcs.py +0 -0
  26. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/interfaces.py +0 -0
  27. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/lib.py +0 -0
  28. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/resumable_tools.py +0 -0
  29. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/scheduler.py +0 -0
  30. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/secrets.py +0 -0
  31. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/test.py +0 -0
  32. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/threaded_queue.py +0 -0
  33. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles/typing.py +0 -0
  34. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles_cli/LICENSE +0 -0
  35. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles_cli/__init__.py +0 -0
  36. {cloud_files-5.3.1 → cloud_files-5.4.0}/cloudfiles_cli/cloudfiles_cli.py +0 -0
  37. {cloud_files-5.3.1 → cloud_files-5.4.0}/requirements.txt +0 -0
  38. {cloud_files-5.3.1 → cloud_files-5.4.0}/setup.py +0 -0
@@ -1,9 +1,18 @@
1
1
  CHANGES
2
2
  =======
3
3
 
4
- 5.3.1
4
+ 5.4.0
5
5
  -----
6
6
 
7
+ * test: check nokura works in path parsing
8
+ * install: fix license information
9
+ * fix: expand hardcoded references to "matrix"
10
+ * feat(alias): add "nokura" as an official alias
11
+
12
+ 5.3.2
13
+ -----
14
+
15
+ * fix: multiprocessing in CloudFiles programatic usage
7
16
  * fix: try different multi-processing method (#111)
8
17
 
9
18
  5.3.0
@@ -1,14 +1,13 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cloud-files
3
- Version: 5.3.1
3
+ Version: 5.4.0
4
4
  Summary: Fast access to cloud storage and local FS.
5
5
  Home-page: https://github.com/seung-lab/cloud-files/
6
6
  Author: William Silversmith
7
7
  Author-email: ws9@princeton.edu
8
- License: License :: OSI Approved :: BSD License
8
+ License: BSD-3-Clause
9
9
  Classifier: Intended Audience :: Developers
10
10
  Classifier: Development Status :: 4 - Beta
11
- Classifier: License :: OSI Approved :: BSD License
12
11
  Classifier: Programming Language :: Python :: 3
13
12
  Classifier: Programming Language :: Python :: 3.9
14
13
  Classifier: Programming Language :: Python :: 3.10
@@ -749,6 +749,9 @@ def test_to_https_protocol():
749
749
  pth = to_https_protocol("matrix://my_bucket/to/heaven")
750
750
  assert pth == "https://s3-hpcrc.rc.princeton.edu/my_bucket/to/heaven"
751
751
 
752
+ pth = to_https_protocol("nokura://my_bucket/to/heaven")
753
+ assert pth == "https://nokura.pni.princeton.edu/my_bucket/to/heaven"
754
+
752
755
  pth = to_https_protocol("tigerdata://my_bucket/to/heaven")
753
756
  assert pth == "https://td.princeton.edu/my_bucket/to/heaven"
754
757
 
@@ -1,14 +1,13 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cloud-files
3
- Version: 5.3.1
3
+ Version: 5.4.0
4
4
  Summary: Fast access to cloud storage and local FS.
5
5
  Home-page: https://github.com/seung-lab/cloud-files/
6
6
  Author: William Silversmith
7
7
  Author-email: ws9@princeton.edu
8
- License: License :: OSI Approved :: BSD License
8
+ License: BSD-3-Clause
9
9
  Classifier: Intended Audience :: Developers
10
10
  Classifier: Development Status :: 4 - Beta
11
- Classifier: License :: OSI Approved :: BSD License
12
11
  Classifier: Programming Language :: Python :: 3
13
12
  Classifier: Programming Language :: Python :: 3.9
14
13
  Classifier: Programming Language :: Python :: 3.10
@@ -0,0 +1 @@
1
+ {"git_version": "002c3fc", "is_release": true}
@@ -149,6 +149,10 @@ def parallel_execute(
149
149
  if platform.system().lower() == "darwin":
150
150
  os.environ["no_proxy"] = "*"
151
151
 
152
+ # Don't fork, spawn entirely new processes. This
153
+ # avoids accidental deadlocks.
154
+ multiprocessing.set_start_method("spawn", force=True)
155
+
152
156
  results = []
153
157
  try:
154
158
  with pathos.pools.ProcessPool(parallel) as executor:
@@ -22,6 +22,7 @@ PRECOMPUTED_SUFFIX = '|neuroglancer-precomputed:'
22
22
 
23
23
  ALIAS_FILE = os.path.join(CLOUD_FILES_DIR, "aliases.json")
24
24
  OFFICIAL_ALIASES = {
25
+ "nokura": "s3://https://nokura.pni.princeton.edu/",
25
26
  "matrix": "s3://https://s3-hpcrc.rc.princeton.edu/",
26
27
  "tigerdata": "s3://https://td.princeton.edu/",
27
28
  }
@@ -40,6 +41,10 @@ ALLOWED_FORMATS = [
40
41
  'render', 'vtk', 'nifti', 'dvid',
41
42
  ]
42
43
 
44
+ CLOUD_PROTOCOLS = [
45
+ "gs", "s3"
46
+ ] + list(OFFICIAL_ALIASES.keys())
47
+
43
48
  def update_aliases_from_file():
44
49
  global ALIASES_FROM_FILE
45
50
  global ALIAS_FILE
@@ -374,7 +379,7 @@ def extract(cloudpath:str, windows=None) -> ExtractedPath:
374
379
  cloudpath = toabs(cloudpath)
375
380
 
376
381
  bucket = None
377
- if protocol in ('gs', 's3', 'matrix', 'mem'):
382
+ if protocol in CLOUD_PROTOCOLS + ['mem']:
378
383
  match = re.match(BUCKET_RE, cloudpath)
379
384
  if not match:
380
385
  raise error
@@ -398,7 +403,7 @@ def extract(cloudpath:str, windows=None) -> ExtractedPath:
398
403
 
399
404
  def to_https_protocol(cloudpath):
400
405
  if isinstance(cloudpath, ExtractedPath):
401
- if cloudpath.protocol in ('gs', 's3', 'matrix'):
406
+ if cloudpath.protocol in CLOUD_PROTOCOLS:
402
407
  return extract(to_https_protocol(ascloudpath(cloudpath)))
403
408
  return cloudpath
404
409
 
@@ -7,11 +7,10 @@ description_file = README.md
7
7
  author = William Silversmith
8
8
  author_email = ws9@princeton.edu
9
9
  home_page = https://github.com/seung-lab/cloud-files/
10
- license = License :: OSI Approved :: BSD License
10
+ license = BSD-3-Clause
11
11
  classifier =
12
12
  Intended Audience :: Developers
13
13
  Development Status :: 4 - Beta
14
- License :: OSI Approved :: BSD License
15
14
  Programming Language :: Python :: 3
16
15
  Programming Language :: Python :: 3.9
17
16
  Programming Language :: Python :: 3.10
@@ -1 +0,0 @@
1
- {"git_version": "7636038", "is_release": true}
File without changes
File without changes
File without changes
File without changes
File without changes