@@ -656,9 +656,6 @@ def extract_archive(fname, targetdir=None, verbose=False):
656
656
obj .extractall (path = targetdir )
657
657
return targetdir
658
658
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
-
662
659
# SOURCE_PATTERN defines what an acceptable source package name is
663
660
# As of 2014-09-08 :
664
661
# - the wheel package format is accepte in source directory
@@ -687,7 +684,6 @@ def buildflit_wininst(
687
684
root ,
688
685
python_exe = None ,
689
686
copy_to = None ,
690
- architecture = None , # shall be unused
691
687
verbose = False ,
692
688
):
693
689
"""Build Wheel from Python package located in *root*
@@ -696,10 +692,7 @@ def buildflit_wininst(
696
692
python_exe = sys .executable
697
693
assert Path (python_exe ).is_file ()
698
694
cmd = [python_exe , '-m' ,'flit' , 'build' ]
699
- if architecture is not None :
700
- archstr = (
701
- 'win32' if architecture == 32 else 'win-amd64'
702
- )
695
+
703
696
# root = a tmp dir in windows\tmp,
704
697
if verbose :
705
698
subprocess .call (cmd , cwd = root )
@@ -724,13 +717,8 @@ def buildflit_wininst(
724
717
"2. Change working directory to the appropriate folder\n "
725
718
"3. Type `python -m filt build`"
726
719
)
727
- pattern = WININST_PATTERN .replace (
728
- r'(win32|win\-amd64)' , archstr
729
- )
720
+
730
721
for distname in os .listdir (distdir ):
731
- match = re .match (pattern , distname )
732
- if match is not None :
733
- break
734
722
# for wheels (winpython here)
735
723
match = re .match (SOURCE_PATTERN , distname )
736
724
if match is not None :
0 commit comments