Merge pull request #2334 from NNPDF/remove_deprecated_and_dead_functions

Remove a bunch of deprecated functions and options

Author: scarlehoff

deprecated_functions.py

@@ -141,7 +141,7 @@ specification" (something typically containing metadata information
 such as paths, which are necessary to load the final commondata or fktable)
 
 In the case of the positivity set, this is entirely given in terms of
-existing check functions:
+existing check functions
 
 .. code:: python
 
@@ -151,9 +151,6 @@ existing check functions:
 	    th =  self.check_theoryID(theiryID)
 	    return PositivitySetSpec(cd, fk, postlambda, th)
 
-	def get_posset(self, theoryID, setname, postlambda):
-	    return self.check_posset(theiryID, setname, postlambda).load()
-
 
 A more complicated example should raise the appropriate loader
 errors (see the other examples in the class).

doc/sphinx/source/vp/custom_pipelines.rst

@@ -106,11 +106,6 @@ def construct_evolven3fit_parser(subparsers):
     return parser
 
 
-def evolven3fit_new():
-    _logger.warning("`evolven3fit_new` is deprecated. Please use `evolven3fit` instead.")
-    main()
-
-
 def main():
     parser = ArgumentParser(description="evolven3fit - a script with tools to evolve PDF fits")
     parser.add_argument(

n3fit/src/n3fit/scripts/evolven3fit.py

@@ -40,8 +40,6 @@ n3fit = "n3fit.scripts.n3fit_exec:main"
 validphys = "validphys.scripts.main:main"
 # Fitting scripts
 evolven3fit = "n3fit.scripts.evolven3fit:main"
-# Keep the `new` suffix so people's scripts don't break
-evolven3fit_new = "n3fit.scripts.evolven3fit:evolven3fit_new"
 vp-setupfit = "n3fit.scripts.vp_setupfit:main"
 postfit = "validphys.scripts.postfit:main"
 # validphys helpers and scripts
@@ -158,7 +156,6 @@ log_cli_level = "WARNING"
 omit = [
     "*/local*",
     "*/rule*",
-    "deprecated_functions.py",
     "*/nnpdf_data/commondata/*",
     "*/nnpdf_data/filter_utils/*",
     "*test_*.py"

pyproject.toml

@@ -419,9 +419,7 @@ def parse_dataset_input(self, dataset: Mapping, allow_legacy_names: bool = True)
             custom_group: str
                 custom group to apply to the dataset
 
-        Note that the `sys` key is deprecated and allowed only for old-format dataset.
-
-        Old-format commondata will be translated to the new version in this function.
+        Old-format names-sys will be translated to the new version in this function.
         """
         accepted_keys = {"dataset", "sys", "cfac", "frac", "weight", "custom_group", "variant"}
         try:
@@ -476,7 +474,9 @@ def parse_dataset_input(self, dataset: Mapping, allow_legacy_names: bool = True)
                 variant = map_variant
 
             if sysnum is not None:
-                log.warning("The key 'sys' is deprecated and will soon be removed")
+                log.warning(
+                    f"The key 'sys' is deprecated and only used for variant discovery: {variant}"
+                )
 
         return DataSetInput(
             name=name,
@@ -485,7 +485,6 @@ def parse_dataset_input(self, dataset: Mapping, allow_legacy_names: bool = True)
             weight=weight,
             custom_group=custom_group,
             variant=variant,
-            sys=sysnum,
         )
 
     def parse_inconsistent_data_settings(self, settings):
@@ -536,11 +535,9 @@ def produce_commondata(self, *, dataset_input, use_fitcommondata=False, fit=None
         """Produce a CommondataSpec from a dataset input"""
 
         name = dataset_input.name
-        sysnum = dataset_input.sys
         try:
             return self.loader.check_commondata(
                 setname=name,
-                sysnum=sysnum,
                 use_fitcommondata=use_fitcommondata,
                 fit=fit,
                 variant=dataset_input.variant,
@@ -687,15 +684,13 @@ def produce_dataset(
         True, attempt to lod and check the PLOTTING files
         (note this may cause a noticeable slowdown in general)."""
         name = dataset_input.name
-        sysnum = dataset_input.sys
         cfac = dataset_input.cfac
         frac = dataset_input.frac
         weight = dataset_input.weight
         variant = dataset_input.variant
         try:
             ds = self.loader.check_dataset(
                 name=name,
-                sysnum=sysnum,
                 theoryid=theoryid,
                 cfac=cfac,
                 cuts=cuts,

validphys2/src/validphys/config.py

@@ -264,44 +264,14 @@ class CommonDataSpec(TupleComp):
     and only to be used with ``legacy=True``
     """
 
-    def __init__(self, name, metadata, legacy=False, datafile=None, sysfile=None, plotfiles=None):
-        self.legacy = legacy
+    def __init__(self, name, metadata, datafile=None):
         self._metadata = metadata
-
-        # Some checks
-        if legacy:
-            # TODO: this will start raising an error soon
-            if datafile is None or sysfile is None or plotfiles is None:
-                raise ValueError(
-                    "Legacy CommonDataSpec need datafile, sysfile and plotfiles arguments"
-                )
-        else:
-            if sysfile is not None:
-                raise ValueError("New CommonDataSpec don't need sysfile input")
-            if plotfiles is not None:
-                raise ValueError("New CommonDataSpec don't need plotfile input")
-
         self.datafile = datafile
-        self.sysfile = sysfile
-        if legacy:
-            self.plotfiles = tuple(plotfiles)
-            super().__init__(datafile, sysfile, self.plotfiles)
-        else:
-            self.plotfiles = False
-            super().__init__(name, self.metadata)
+        self.plotfiles = False
+        super().__init__(name, self.metadata)
 
     def with_modified_data(self, central_data_file, uncertainties_file=None):
         """Returns a copy of this instance with a new data file in the metadata"""
-        if self.legacy:
-            return self.__class__(
-                self.name,
-                self.metadata,
-                legacy=True,
-                datafile=central_data_file,
-                sysfile=self.sysfile,
-                plotfiles=self.plotfiles,
-            )
-
         modified_args = {"data_central": central_data_file}
 
         if uncertainties_file is not None:
@@ -316,11 +286,7 @@ def name(self):
 
     @functools.cached_property
     def nsys(self):
-        if self.legacy:
-            return self.metadata.nsys
-        else:
-            cd = self.load()
-            return cd.nsys
+        return self.load().nsys
 
     @property
     def ndata(self):
@@ -340,8 +306,6 @@ def legacy_names(self):
 
     @property
     def theory_metadata(self):
-        if self.legacy:
-            return None
         return self.metadata.theory
 
     def __str__(self):
@@ -376,13 +340,10 @@ class DataSetInput(TupleComp):
         extra weight to apply to the dataset (default: 1.0)
     variant: str or tuple[str]
         variant or variants to apply (default: None)
-    sysnum: int
-        deprecated, systematic file to load for the dataset
     """
 
-    def __init__(self, *, name, cfac, frac, weight, custom_group, variant, sys=None):
+    def __init__(self, *, name, cfac, frac, weight, custom_group, variant):
         self.name = name
-        self.sys = sys
         self.cfac = cfac
         self.frac = frac
         self.weight = weight
@@ -396,7 +357,7 @@ def __init__(self, *, name, cfac, frac, weight, custom_group, variant, sys=None)
         if isinstance(variant, list):
             variant = tuple(variant)
         self.variant = variant
-        super().__init__(name, cfac, frac, weight, custom_group, variant, sys)
+        super().__init__(name, cfac, frac, weight, custom_group, variant)
 
     def __str__(self):
         return self.name
@@ -529,8 +490,6 @@ def __init__(
         self.frac = frac
 
         # If OP is None, check whether the commondata is setting an operation
-        # TODO: eventually the operation will _always_ be set from the commondata, but for legacy
-        # compatibility it will be also controllable as an input argument
         if op is None:
             if commondata.theory_metadata is None:
                 op = 'NULL'

validphys2/src/validphys/core.py

@@ -639,13 +639,10 @@ def __init__(
             except LoaderError as e:
                 raise RuleProcessingError(f"Could not find dataset {self.dataset}") from e
 
-            if cd.legacy:
+            if cd.metadata.is_ported_dataset:
                 self.variables = _get_kinlabel_process_type(cd.process_type)
             else:
-                if cd.metadata.is_ported_dataset:
-                    self.variables = _get_kinlabel_process_type(cd.process_type)
-                else:
-                    self.variables = cd.metadata.kinematic_coverage
+                self.variables = cd.metadata.kinematic_coverage
         else:
             self.variables = _get_kinlabel_process_type(self.process_type)
             # TODO: for now this will be a string within this class