I think if we update:

Lines 141 to 145 in ba12432

    
           def _coerce_parse_result(results: Union[ParseResults, List[Any]]) -> List[Any]: 
        
               if isinstance(results, ParseResults): 
        
                   return [_coerce_parse_result(i) for i in results] 
        
               else: 
        
                   return results

... to coerce extra comparisons immediately after parsing, then that's probably the easiest way to get the value normalized (for printing, writing, etc.). Then we have to worry about comparisons, which may be in:

packaging/packaging/markers.py

Lines 189 to 201 in ba12432

    
           def _eval_op(lhs: str, op: Op, rhs: str) -> bool: 
        
               try: 
        
                   spec = Specifier("".join([op.serialize(), rhs])) 
        
               except InvalidSpecifier: 
        
                   pass 
        
               else: 
        
                   return spec.contains(lhs, prereleases=True) 
        
               oper: Optional[Operator] = _operators.get(op.serialize()) 
        
               if oper is None: 
        
                   raise UndefinedComparison(f"Undefined {op!r} on {lhs!r} and {rhs!r}.") 
        
               return oper(lhs, rhs)

... or:

packaging/packaging/markers.py

Lines 230 to 240 in ba12432

    
           elif isinstance(marker, tuple): 
        
               lhs, op, rhs = marker 
        
               if isinstance(lhs, Variable): 
        
                   lhs_value = _get_env(environment, lhs.value) 
        
                   rhs_value = rhs.value 
        
               else: 
        
                   lhs_value = lhs.value 
        
                   rhs_value = _get_env(environment, rhs.value) 
        
               groups[-1].append(_eval_op(lhs_value, op, rhs_value))

There's also separate work for requirements for the self.extras attribute:

packaging/packaging/requirements.py

Line 121 in ba12432

self.extras: Set[str] = set(req.extras.asList() if req.extras else [])

	def _coerce_parse_result(results: Union[ParseResults, List[Any]]) -> List[Any]:
	if isinstance(results, ParseResults):
	return [_coerce_parse_result(i) for i in results]
	else:
	return results

	def _eval_op(lhs: str, op: Op, rhs: str) -> bool:
	try:
	spec = Specifier("".join([op.serialize(), rhs]))
	except InvalidSpecifier:
	pass
	else:
	return spec.contains(lhs, prereleases=True)

	oper: Optional[Operator] = _operators.get(op.serialize())
	if oper is None:
	raise UndefinedComparison(f"Undefined {op!r} on {lhs!r} and {rhs!r}.")

	return oper(lhs, rhs)

	elif isinstance(marker, tuple):
	lhs, op, rhs = marker

	if isinstance(lhs, Variable):
	lhs_value = _get_env(environment, lhs.value)
	rhs_value = rhs.value
	else:
	lhs_value = lhs.value
	rhs_value = _get_env(environment, rhs.value)

	groups[-1].append(_eval_op(lhs_value, op, rhs_value))

Implement PEP 685 #526

Description

Metadata

Metadata

Assignees

Labels

Projects

Milestone

Relationships

Development

Issue actions