8000 remove dead old practice · winpython/winpython@894cff3 · GitHub
[go: up one dir, main page]

Skip to content

Commit 894cff3

Browse files
committed
remove dead old practice
1 parent 639c02d commit 894cff3

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

make.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1801,7 +1801,6 @@ def rebuild_winpython(basedir, targetdir, architecture=64, verbose=False):
18011801
utils.buildflit_wininst(
18021802
str(Path(__file__).resolve().parent),
18031803
copy_to=packdir,
1804-
architecture=architecture,
18051804
verbose=verbose,
18061805
)
18071806

winpython/utils.py

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -656,9 +656,6 @@ def extract_archive(fname, targetdir=None, verbose=False):
656656
obj.extractall(path=targetdir)
657657
return targetdir
658658

659-
660-
WININST_PATTERN = r'([a-zA-Z0-9\-\_]*|[a-zA-Z\-\_\.]*)-([0-9\.\-]*[a-z]*[0-9]?)(-Qt-([0-9\.]+))?.(win32|win\-amd64)(-py([0-9\.]+))?(-setup)?\.exe'
661-
662659
# SOURCE_PATTERN defines what an acceptable source package name is
663660
# As of 2014-09-08 :
664661
# - the wheel package format is accepte in source directory
@@ -687,7 +684,6 @@ def buildflit_wininst(
687684
root,
688685
python_exe=None,
689686
copy_to=None,
690-
architecture=None, # shall be unused
691687
verbose=False,
692688
):
693689
"""Build Wheel from Python package located in *root*
@@ -696,10 +692,7 @@ def buildflit_wininst(
696692
python_exe = sys.executable
697693
assert Path(python_exe).is_file()
698694
cmd = [python_exe, '-m' ,'flit', 'build']
699-
if architecture is not None:
700-
archstr = (
701-
'win32' if architecture == 32 else 'win-amd64'
702-
)
695+
703696
# root = a tmp dir in windows\tmp,
704697
if verbose:
705698
subprocess.call(cmd, cwd=root)
@@ -724,13 +717,8 @@ def buildflit_wininst(
724717
"2. Change working directory to the appropriate folder\n"
725718
"3. Type `python -m filt build`"
726719
)
727-
pattern = WININST_PATTERN.replace(
728-
r'(win32|win\-amd64)', archstr
729-
)
720+
730721
for distname in os.listdir(distdir):
731-
match = re.match(pattern, distname)
732-
if match is not None:
733-
break
734722
# for wheels (winpython here)
735723
match = re.match(SOURCE_PATTERN, distname)
736724
if match is not None:

0 commit comments

Comments
 (0)
0