##// END OF EJS Templates
manifest: delay import of `typing.ByteString` for py 3.14 support (issue6940)...
manifest: delay import of `typing.ByteString` for py 3.14 support (issue6940) Since Python 2.7 and 3.5, `typing.ByteString` was defined as an alias for `bytes | bytearray | memoryview`, and `bytes` was also accepted as a shorthand for this, so we have `bytes` sprinkled all over the codebase. But then PEP-688 reversed all of that by deprecating `typing.ByteString` and its successor `collections.abc.ByteString` in Python 3.12 (as well as the `bytes` shorthand)[1], and removing it completely in Python 3.14. That leaves us with a couple of problems, namely defining something useful that spans py3.8-py3.13 and keeps pytype happy, and finding all of the instances where `bytes` doesn't really mean `bytes`. The current successor to all of this is `collections.abc.Buffer` in Python 3.12 (or `typing_extensions.Buffer` in previous versions). However, the current CI does type checking using Python 3.11 (so the former is not avaiable), and pytype has issues with importing `typing_extensions.Buffer`[2]. The good news is we don't need to deal with this mess immediately, since the type annotation evaluation is delayed to the type checking phase, and we're making no effort at supporting it in all supported versions of Python. So by delaying the import of this particular symbol, we can still use it for type checking purposes, but can start assessing Python 3.14 problems without doing a lot of extra work. Putting this on stable will allow people interested in 3.14 to work on it 4-5 extra months earlier (and apparently there's some interest). [1] https://peps.python.org/pep-0688/#no-special-meaning-for-bytes [2] https://github.com/google/pytype/issues/1772

File last commit:

r49730:6000f5b2 default
r53224:0851d94b stable
Show More
genosxversion.py
140 lines | 4.2 KiB | text/x-python | PythonLexer
Augie Fackler
osx: new script for generating OS X package versions...
r33595 #!/usr/bin/env python2
import argparse
import os
import subprocess
import sys
Augie Fackler
genosxversion: don't give up if we can't find a path to hg libraries...
r45960 try:
# Always load hg libraries from the hg we can find on $PATH.
hglib = subprocess.check_output(['hg', 'debuginstall', '-T', '{hgmodules}'])
sys.path.insert(0, os.path.dirname(hglib))
except subprocess.CalledProcessError:
# We're probably running with a PyOxidized Mercurial, so just
# proceed and hope it works out okay.
pass
Augie Fackler
osx: new script for generating OS X package versions...
r33595
from mercurial import util
ap = argparse.ArgumentParser()
Augie Fackler
formatting: blacken the codebase...
r43346 ap.add_argument(
'--paranoid',
action='store_true',
help=(
"Be paranoid about how version numbers compare and "
"produce something that's more likely to sort "
"reasonably."
),
)
Augie Fackler
osx: new script for generating OS X package versions...
r33595 ap.add_argument('--selftest', action='store_true', help='Run self-tests.')
ap.add_argument('versionfile', help='Path to a valid mercurial __version__.py')
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
osx: new script for generating OS X package versions...
r33595 def paranoidver(ver):
"""Given an hg version produce something that distutils can sort.
Some Mac package management systems use distutils code in order to
figure out upgrades, which makes life difficult. The test case is
a reduced version of code in the Munki tool used by some large
organizations to centrally manage OS X packages, which is what
inspired this kludge.
>>> paranoidver('3.4')
'3.4.0'
>>> paranoidver('3.4.2')
'3.4.2'
>>> paranoidver('3.0-rc+10')
'2.9.9999-rc+10'
>>> paranoidver('4.2+483-5d44d7d4076e')
'4.2.0+483-5d44d7d4076e'
>>> paranoidver('4.2.1+598-48d1e1214d8c')
'4.2.1+598-48d1e1214d8c'
>>> paranoidver('4.3-rc')
'4.2.9999-rc'
>>> paranoidver('4.3')
'4.3.0'
>>> from distutils import version
>>> class LossyPaddedVersion(version.LooseVersion):
... '''Subclass version.LooseVersion to compare things like
... "10.6" and "10.6.0" as equal'''
... def __init__(self, s):
... self.parse(s)
...
... def _pad(self, version_list, max_length):
... 'Pad a version list by adding extra 0 components to the end'
... # copy the version_list so we don't modify it
... cmp_list = list(version_list)
... while len(cmp_list) < max_length:
... cmp_list.append(0)
... return cmp_list
...
... def __cmp__(self, other):
... if isinstance(other, str):
... other = MunkiLooseVersion(other)
... max_length = max(len(self.version), len(other.version))
... self_cmp_version = self._pad(self.version, max_length)
... other_cmp_version = self._pad(other.version, max_length)
... return cmp(self_cmp_version, other_cmp_version)
>>> def testver(older, newer):
... o = LossyPaddedVersion(paranoidver(older))
... n = LossyPaddedVersion(paranoidver(newer))
... return o < n
>>> testver('3.4', '3.5')
True
>>> testver('3.4.0', '3.5-rc')
True
>>> testver('3.4-rc', '3.5')
True
>>> testver('3.4-rc+10-deadbeef', '3.5')
True
>>> testver('3.4.2', '3.5-rc')
True
>>> testver('3.4.2', '3.5-rc+10-deadbeef')
True
>>> testver('4.2+483-5d44d7d4076e', '4.2.1+598-48d1e1214d8c')
True
>>> testver('4.3-rc', '4.3')
True
>>> testver('4.3', '4.3-rc')
False
"""
major, minor, micro, extra = util.versiontuple(ver, n=4)
if micro is None:
micro = 0
if extra:
if extra.startswith('rc'):
if minor == 0:
major -= 1
minor = 9
else:
minor -= 1
micro = 9999
extra = '-' + extra
else:
extra = '+' + extra
else:
extra = ''
return '%d.%d.%d%s' % (major, minor, micro, extra)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
osx: new script for generating OS X package versions...
r33595 def main(argv):
opts = ap.parse_args(argv[1:])
if opts.selftest:
import doctest
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
osx: new script for generating OS X package versions...
r33595 doctest.testmod()
return
with open(opts.versionfile) as f:
for l in f:
Rodrigo Damazio
macosx: fixing macOS version generation after db9d1dd01bf0...
r38757 if l.startswith('version = b'):
Augie Fackler
osx: new script for generating OS X package versions...
r33595 # version number is entire line minus the quotes
Augie Fackler
formatting: blacken the codebase...
r43346 ver = l[len('version = b') + 1 : -2]
Augie Fackler
osx: new script for generating OS X package versions...
r33595 break
if opts.paranoid:
print(paranoidver(ver))
else:
print(ver)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
osx: new script for generating OS X package versions...
r33595 if __name__ == '__main__':
main(sys.argv)