dcicutils 7.4.2.1b10__py3-none-any.whl → 7.4.2.1b12__py3-none-any.whl

dcicutils/project_utils.py

@@ -65,7 +65,8 @@ class ProjectRegistry:
     REQUIRED_PROJECT_ATTRS = ['NAME']
 
     NON_INHERITED_PROJECT_ATTRS = [
-        'REPO_NAME', 'PYPI_NAME', 'PACKAGE_NAME', 'PRETTY_NAME', 'APP_NAME', 'APP_PRETTY_NAME'
+        # PYPROJECT_NAME and PACKAGE_NAME are also in this set but handled by special case.
+        'REPO_NAME', 'PYPI_NAME', 'PRETTY_NAME', 'APP_NAME', 'APP_PRETTY_NAME'
     ]
 
     @classmethod
@@ -81,6 +82,10 @@ class ProjectRegistry:
 
         Since fourfront and cgap-portal don't occupy the same space, no confusion should result.
         """
+
+        protected_project_bindings = [('PYPROJECT_NAME', '_PYPROJECT_NAME', pyproject_name, False),
+                                      ('PACKAGE_NAME', '_PACKAGE_NAME', None, True)]
+
         def _wrap_class(the_class):
             the_class_name = the_class.__name__
             if not issubclass(the_class, Project):
@@ -88,16 +93,19 @@ class ProjectRegistry:
 
             explicit_attrs = the_class.__dict__
 
-            explicit_pyproject_name = explicit_attrs.get('PYPROJECT_NAME')
-            if explicit_pyproject_name:
-                message = f"Explicit {the_class_name}.PYPROJECT_NAME={explicit_pyproject_name!r} is not permitted."
-                if explicit_pyproject_name != pyproject_name:
-                    message += f" An assignment to {pyproject_name!r} is intended to be managed implicitly."
+            for public_attr, private_attr, default_val, assign_ok in protected_project_bindings:
+                if private_attr in explicit_attrs:
+                    raise ValueError(f"{private_attr} is an internally managed variable. You must not set it.")
+                if public_attr in explicit_attrs:
+                    explicit_val = explicit_attrs[public_attr]
+                    if assign_ok:
+                        setattr(the_class, public_attr, getattr(Project, public_attr))
+                        setattr(the_class, private_attr, explicit_val)
+                    else:
+                        raise ValueError(f"Explicit {the_class_name}.{public_attr}={explicit_val!r} is not permitted."
+                                         f" This assignment is intended to be managed implicitly.")
                 else:
-                    message += " This assignment is intended to be managed implicitly."
-                raise ValueError(message)
-            else:
-                the_class._PYPROJECT_NAME = pyproject_name  # no need for the caller to say this redundantly
+                    setattr(the_class, private_attr, default_val)
 
             for attr in cls.REQUIRED_PROJECT_ATTRS:
                 if attr not in explicit_attrs:
@@ -105,7 +113,7 @@ class ProjectRegistry:
 
             for attr in cls.NON_INHERITED_PROJECT_ATTRS:
                 if attr not in explicit_attrs:
-                    setattr(cls, attr, Project.__dict__[attr])
+                    delattr(the_class, attr)
 
             lower_registry_name = pyproject_name.lower()
             for x in ['cgap-portal', 'fourfront', 'smaht']:
@@ -260,7 +268,7 @@ class Project:
             # Other exported dirs, such as scripts or tests should be in later entries.
             package_name = poetry_data['packages'][0]['include']
         else:
-            package_name = cls.PYPROJECT_NAME
+            package_name = cls.PYPI_NAME or cls.PYPROJECT_NAME
         cls._PACKAGE_NAME = package_name
         return package_name
 
@@ -277,7 +285,7 @@ class Project:
 
     @classproperty
     def APP_NAME(cls):  # noQA - PyCharm wants the variable name to be self
-        return cls.PACKAGE_NAME.replace('-portal', '').replace('encoded-', '')
+        return cls.REPO_NAME.replace('-portal', '').replace('encoded-', '')
 
     @classproperty
     def APP_PRETTY_NAME(cls):  # noQA - PyCharm wants the variable name to be self

{dcicutils-7.4.2.1b10.dist-info → dcicutils-7.4.2.1b12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 7.4.2.1b10
+Version: 7.4.2.1b12
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-7.4.2.1b10.dist-info → dcicutils-7.4.2.1b12.dist-info}/RECORD

@@ -32,7 +32,7 @@ dcicutils/log_utils.py,sha256=7pWMc6vyrorUZQf-V-M3YC6zrPgNhuV_fzm9xqTPph0,10883
 dcicutils/misc_utils.py,sha256=s_6_6X1It5dklv6UOd4XfZdtbw8xWwpOysWbclUdYNA,90749
 dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmjw,5963
 dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
-dcicutils/project_utils.py,sha256=LaDoM0gRtEv7OvtSZiZGbXsxReg3SpVSTMoVIpxigTs,14795
+dcicutils/project_utils.py,sha256=foVjezP7iTX8BXSpWiMfAuJaOZYB4N9TxtsBrJu2nqs,15271
 dcicutils/qa_checkers.py,sha256=Pd40yGTxMsae1IZP86qWExBQ9kFiEMQIrsi5sWA55WE,20234
 dcicutils/qa_utils.py,sha256=r_vpLlxnsN8FDM_X_XO1KPotuZYAjptICcY4HJurj5Q,154684
 dcicutils/redis_tools.py,sha256=rqGtnVUjNjTlCdL1EMKuEhEMAgRJMiXZJkrKuX255QA,6509
@@ -44,8 +44,8 @@ dcicutils/snapshot_utils.py,sha256=ymP7PXH6-yEiXAt75w0ldQFciGNqWBClNxC5gfX2FnY,2
 dcicutils/ssl_certificate_utils.py,sha256=F0ifz_wnRRN9dfrfsz7aCp4UDLgHEY8LaK7PjnNvrAQ,9707
 dcicutils/task_utils.py,sha256=MF8ujmTD6-O2AC2gRGPHyGdUrVKgtr8epT5XU8WtNjk,8082
 dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
-dcicutils-7.4.2.1b10.dist-info/LICENSE.txt,sha256=_lknlhA5bbBFtUCrhmOtUogQuvKDYd_AkLCRcjPoMBc,1098
-dcicutils-7.4.2.1b10.dist-info/METADATA,sha256=Q0l0X3qwAwQ6UTKkZmb1q37xlUpiFi3EkeclzHU8Q8E,3003
-dcicutils-7.4.2.1b10.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-dcicutils-7.4.2.1b10.dist-info/entry_points.txt,sha256=xUFTG_l0IJJFMY-WLeijpjCzTv3_3cdmXVqClOeuIGs,74
-dcicutils-7.4.2.1b10.dist-info/RECORD,,
+dcicutils-7.4.2.1b12.dist-info/LICENSE.txt,sha256=_lknlhA5bbBFtUCrhmOtUogQuvKDYd_AkLCRcjPoMBc,1098
+dcicutils-7.4.2.1b12.dist-info/METADATA,sha256=jeFslfCBl-o1kt2NhoKeGKexQqs-QYp_q_M22zjNrWM,3003
+dcicutils-7.4.2.1b12.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+dcicutils-7.4.2.1b12.dist-info/entry_points.txt,sha256=xUFTG_l0IJJFMY-WLeijpjCzTv3_3cdmXVqClOeuIGs,74
+dcicutils-7.4.2.1b12.dist-info/RECORD,,