Skip to content

Commit 1fc087f

Browse files
committed
version bump, and dropped deprecation blocks
1 parent 530476d commit 1fc087f

File tree

3 files changed

+3
-37
lines changed

3 files changed

+3
-37
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 3.6 (prerelease)
1+
## 3.6 – 2025-10-28
22

33
### General
44

cobaya/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
__author__ = "Jesus Torrado and Antony Lewis"
2-
__version__ = "3.5.7"
2+
__version__ = "3.6"
33
__obsolete__ = False
44
__year__ = "2025"
55
__url__ = "https://cobaya.readthedocs.io"

cobaya/output.py

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,6 @@ def load_collections(
347347
combined=False,
348348
name=None,
349349
extension=None,
350-
concatenate=None,
351350
check_logp_sums=True,
352351
):
353352
"""
@@ -382,15 +381,6 @@ def load_collections(
382381
)
383382
for i, filename in enumerate(filenames)
384383
]
385-
# MARKED FOR DEPRECATION IN v3.4
386-
if concatenate is not None:
387-
print(
388-
"*WARNING*: Argument 'concatenate' will be deprecated soon. "
389-
"Please use 'combined' instead."
390-
)
391-
# BEHAVIOUR TO BE REPLACED BY AN ERROR
392-
combined = concatenate
393-
# END OF DEPRECATION BLOCK
394384
if combined and collections:
395385
collection = collections[0]
396386
for collection_i in collections[1:]:
@@ -500,38 +490,14 @@ def is_resuming(self):
500490
def set_resuming(self, value):
501491
self._resuming = value
502492

503-
# MARKED FOR DEPRECATION IN v3.4
504-
@mpi.from_root
505-
def load_updated_info(self, cache=False, use_cache=False) -> InputDict | None:
506-
"""
507-
Returns the version of the input file updated with defaults, loading it if
508-
necessary.
509-
510-
*WARNING*: This method has been deprecated in favor of ``get_updated_info`` and
511-
``reaload_update_info``, depending on the use case (see their docstrings).
512-
"""
513-
# BEHAVIOUR TO BE REPLACED BY AN ERROR
514-
return self.reload_updated_info(cache=cache, use_cache=use_cache)
515-
# END OF DEPRECATION BLOCK
516-
517-
def reload_updated_info(self, cache=False, **kwargs) -> InputDict | None:
493+
def reload_updated_info(self, cache=False) -> InputDict | None:
518494
"""
519495
Reloads and returns the version of the input file updated with defaults.
520496
521497
If none is found, returns ``None`` without raising an error.
522498
523499
If ``cache=True``, the loaded input will be cached for future calls.
524500
"""
525-
# MARKED FOR DEPRECATION IN v3.4
526-
if kwargs.get("use_cache", None):
527-
self.log.warning(
528-
"The `use_cache` argument will be deprecated soon. If you "
529-
"want to ensure that you receive a cached version, call the "
530-
"new method ``get_updated_info(use_cache=True)`."
531-
)
532-
# BEHAVIOUR TO BE REPLACED BY AN ERROR
533-
return self.get_updated_info(use_cache=kwargs["use_cache"])
534-
# END OF DEPRECATION BLOCK
535501
loaded = None
536502
if mpi.is_main_process():
537503
loaded = super().reload_updated_info(cache=cache)

0 commit comments

Comments
 (0)