gyp: update gyp to v0.8.0 (#2318)

PR-URL: #2318
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>

Author: cclauss

gyp/.github/workflows/Python_tests.yml

@@ -1,5 +1,4 @@
 # TODO: Enable os: windows-latest
-# TODO: Enable python-version: 3.5
 # TODO: Enable pytest --doctest-modules
 
 name: Python_tests
@@ -9,10 +8,10 @@ jobs:
 runs-on: ${{ matrix.os }}
 strategy:
 fail-fast: false
-max-parallel: 15
+max-parallel: 8
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
-python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
+python-version: [3.6, 3.7, 3.8, 3.9]
 steps:
  - uses: actions/checkout@v2
  - name: Set up Python ${{ matrix.python-version }}

gyp/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.8.0](https://www.github.com/nodejs/gyp-next/compare/v0.7.0...v0.8.0) (2021-01-15)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove support for Python 2
+
+### Bug Fixes
+
+* revert posix build job ([#86](https://www.github.com/nodejs/gyp-next/issues/86)) ([39dc34f](https://www.github.com/nodejs/gyp-next/commit/39dc34f0799c074624005fb9bbccf6e028607f9d))
+
+
+### gyp
+
+* Remove support for Python 2 ([#88](https://www.github.com/nodejs/gyp-next/issues/88)) ([22e4654](https://www.github.com/nodejs/gyp-next/commit/22e465426fd892403c95534229af819a99c3f8dc))
+
 ## [0.7.0](https://www.github.com/nodejs/gyp-next/compare/v0.6.2...v0.7.0) (2020-12-17)
 
 

gyp/gyp_main.py

@@ -8,19 +8,15 @@
 importsys
 importsubprocess
 
-PY3=bytes!=str
-
 
 defIsCygwin():
 # Function copied from pylib/gyp/common.py
 try:
 out=subprocess.Popen(
 "uname", stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
-stdout, stderr=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-return"CYGWIN"instr(stdout)
+stdout, _=out.communicate()
+return"CYGWIN"instdout.decode("utf-8")
 exceptException:
 returnFalse
 
@@ -33,9 +29,7 @@ def UnixifyPath(path):
  ["cygpath", "-u", path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
 stdout, _=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-returnstr(stdout)
+returnstdout.decode("utf-8")
 exceptException:
 returnpath
 

gyp/pylib/gyp/MSVSNew.py

@@ -11,12 +11,9 @@
 
 importgyp.common
 
-try:
-cmp
-exceptNameError:
 
-defcmp(x, y):
-return (x>y) - (x<y)
+defcmp(x, y):
+return (x>y) - (x<y)
 
 
 # Initialize random number generator
@@ -69,7 +66,7 @@ def MakeGuid(name, seed="msvs_new"):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolutionEntry(object):
+classMSVSSolutionEntry:
 def__cmp__(self, other):
 # Sort by name then guid (so things are in order on vs2008).
 returncmp((self.name, self.get_guid()), (other.name, other.get_guid()))
@@ -190,7 +187,7 @@ def set_msbuild_toolset(self, msbuild_toolset):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolution(object):
+classMSVSSolution:
 """Visual Studio solution."""
 
 def__init__(
@@ -292,14 +289,14 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ife.items:
 f.write("\tProjectSection(SolutionItems) = preProject\r\n")
 foriine.items:
-f.write("\t\t%s = %s\r\n"% (i, i))
+f.write(f"\t\t{i} = {i}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 ifisinstance(e, MSVSProject):
 ife.dependencies:
 f.write("\tProjectSection(ProjectDependencies) = postProject\r\n")
 fordine.dependencies:
-f.write("\t\t%s = %s\r\n"% (d.get_guid(), d.get_guid()))
+f.write(f"\t\t{d.get_guid()} = {d.get_guid()}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 f.write("EndProject\r\n")
@@ -310,7 +307,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 # Configurations (variants)
 f.write("\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\r\n")
 forvinself.variants:
-f.write("\t\t%s = %s\r\n"% (v, v))
+f.write(f"\t\t{v} = {v}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 # Sort config guids for easier diffing of solution changes.
@@ -362,7 +359,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ifnotisinstance(e, MSVSFolder):
 continue# Does not apply to projects, only folders
 forsubentryine.entries:
-f.write("\t\t%s = %s\r\n"% (subentry.get_guid(), e.get_guid()))
+f.write(f"\t\t{subentry.get_guid()} = {e.get_guid()}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 f.write("EndGlobal\r\n")

gyp/pylib/gyp/MSVSProject.py

@@ -9,7 +9,7 @@
 # ------------------------------------------------------------------------------
 
 
-classTool(object):
+classTool:
 """Visual Studio tool."""
 
 def__init__(self, name, attrs=None):
@@ -31,7 +31,7 @@ def _GetSpecification(self):
 return ["Tool", self._attrs]
 
 
-classFilter(object):
+classFilter:
 """Visual Studio filter - that is, a virtual folder."""
 
 def__init__(self, name, contents=None):
@@ -48,7 +48,7 @@ def __init__(self, name, contents=None):
 # ------------------------------------------------------------------------------
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML project writer."""
 
 def__init__(self, project_path, version, name, guid=None, platforms=None):

gyp/pylib/gyp/MSVSSettings.py

@@ -14,12 +14,8 @@
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
 
-from __future__ importprint_function
-
-fromgypimportstring_types
-
-importsys
 importre
+importsys
 
 # Dictionaries of settings validators. The key is the tool name, the value is
 # a dictionary mapping setting names to validation functions.
@@ -36,7 +32,7 @@
 _msbuild_name_of_tool= {}
 
 
-class_Tool(object):
+class_Tool:
 """Represents a tool used by MSVS or MSBuild.
 
  Attributes:
@@ -68,7 +64,7 @@ def _GetMSBuildToolSettings(msbuild_settings, tool):
 returnmsbuild_settings.setdefault(tool.msbuild_name, {})
 
 
-class_Type(object):
+class_Type:
 """Type of settings (Base class)."""
 
 defValidateMSVS(self, value):
@@ -110,11 +106,11 @@ class _String(_Type):
 """A setting that's just a string."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -126,11 +122,11 @@ class _StringList(_Type):
 """A settings that's a list of strings."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -195,7 +191,7 @@ class _Enumeration(_Type):
 def__init__(self, label_list, new=None):
 _Type.__init__(self)
 self._label_list=label_list
-self._msbuild_values=set(valueforvalueinlabel_listifvalueisnotNone)
+self._msbuild_values={valueforvalueinlabel_listifvalueisnotNone}
 ifnewisnotNone:
 self._msbuild_values.update(new)
 
@@ -342,7 +338,7 @@ def _Translate(value, msbuild_settings):
 ifvalue=="true":
 tool_settings=_GetMSBuildToolSettings(msbuild_settings, tool)
 if"AdditionalOptions"intool_settings:
-new_flags="%s %s"%(tool_settings["AdditionalOptions"], flag)
+new_flags="{} {}".format(tool_settings["AdditionalOptions"], flag)
 else:
 new_flags=flag
 tool_settings["AdditionalOptions"] =new_flags
@@ -536,14 +532,14 @@ def _ValidateSettings(validators, settings, stderr):
 tool_validators[setting](value)
 exceptValueErrorase:
 print(
-"Warning: for %s/%s, %s"% (tool_name, setting, e),
+f"Warning: for {tool_name}/{setting}, {e}",
 file=stderr,
  )
 else:
 _ValidateExclusionSetting(
 setting,
 tool_validators,
- ("Warning: unrecognized setting %s/%s"% (tool_name, setting)),
+ (f"Warning: unrecognized setting {tool_name}/{setting}"),
 stderr,
  )
 

gyp/pylib/gyp/MSVSSettings_test.py

@@ -9,10 +9,7 @@
 importunittest
 importgyp.MSVSSettingsasMSVSSettings
 
-try:
-fromStringIOimportStringIO# Python 2
-exceptImportError:
-fromioimportStringIO# Python 3
+fromioimportStringIO
 
 
 classTestSequenceFunctions(unittest.TestCase):

gyp/pylib/gyp/MSVSToolFile.py

@@ -7,7 +7,7 @@
 importgyp.easy_xmlaseasy_xml
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML tool file writer."""
 
 def__init__(self, tool_file_path, name):

gyp/pylib/gyp/MSVSUserFile.py

@@ -53,7 +53,7 @@ def _QuoteWin32CommandLineArgs(args):
 returnnew_args
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML user user file writer."""
 
 def__init__(self, user_file_path, version, name):
@@ -93,7 +93,7 @@ def AddDebugSettings(
 abs_command=_FindCommandInPath(command[0])
 
 ifenvironmentandisinstance(environment, dict):
-env_list= ['%s="%s"'% (key, val)for (key, val) inenvironment.items()]
+env_list= [f'{key}="{val}"'for (key, val) inenvironment.items()]
 environment=" ".join(env_list)
 else:
 environment=""

gyp/pylib/gyp/MSVSUtil.py

@@ -55,7 +55,7 @@ def _SuffixName(name, suffix):
  Target name with suffix added (foo_suffix#target)
  """
 parts=name.rsplit("#", 1)
-parts[0] ="%s_%s"%(parts[0], suffix)
+parts[0] ="{}_{}".format(parts[0], suffix)
 return"#".join(parts)
 
 
@@ -160,7 +160,7 @@ def _GetPdbPath(target_dict, config_name, vars):
 returnpdb_path
 
 pdb_base=target_dict.get("product_name", target_dict["target_name"])
-pdb_base="%s.%s.pdb"%(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
+pdb_base="{}.{}.pdb".format(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
 pdb_path=vars["PRODUCT_DIR"] +"/"+pdb_base
 
 returnpdb_path

gyp/.github/workflows/Python_tests.yml

@@ -1,5 +1,4 @@
 # TODO: Enable os: windows-latest
-# TODO: Enable python-version: 3.5
 # TODO: Enable pytest --doctest-modules
 
 name: Python_tests
@@ -9,10 +8,10 @@ jobs:
 runs-on: ${{ matrix.os }}
 strategy:
 fail-fast: false
-max-parallel: 15
+max-parallel: 8
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
-python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
+python-version: [3.6, 3.7, 3.8, 3.9]
 steps:
  - uses: actions/checkout@v2
  - name: Set up Python ${{ matrix.python-version }}

gyp/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.8.0](https://www.github.com/nodejs/gyp-next/compare/v0.7.0...v0.8.0) (2021-01-15)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove support for Python 2
+
+### Bug Fixes
+
+* revert posix build job ([#86](https://www.github.com/nodejs/gyp-next/issues/86)) ([39dc34f](https://www.github.com/nodejs/gyp-next/commit/39dc34f0799c074624005fb9bbccf6e028607f9d))
+
+
+### gyp
+
+* Remove support for Python 2 ([#88](https://www.github.com/nodejs/gyp-next/issues/88)) ([22e4654](https://www.github.com/nodejs/gyp-next/commit/22e465426fd892403c95534229af819a99c3f8dc))
+
 ## [0.7.0](https://www.github.com/nodejs/gyp-next/compare/v0.6.2...v0.7.0) (2020-12-17)
 
 

gyp/gyp_main.py

@@ -8,19 +8,15 @@
 importsys
 importsubprocess
 
-PY3=bytes!=str
-
 
 defIsCygwin():
 # Function copied from pylib/gyp/common.py
 try:
 out=subprocess.Popen(
 "uname", stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
-stdout, stderr=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-return"CYGWIN"instr(stdout)
+stdout, _=out.communicate()
+return"CYGWIN"instdout.decode("utf-8")
 exceptException:
 returnFalse
 
@@ -33,9 +29,7 @@ def UnixifyPath(path):
  ["cygpath", "-u", path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
 stdout, _=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-returnstr(stdout)
+returnstdout.decode("utf-8")
 exceptException:
 returnpath
 

gyp/pylib/gyp/MSVSNew.py

@@ -11,12 +11,9 @@
 
 importgyp.common
 
-try:
-cmp
-exceptNameError:
 
-defcmp(x, y):
-return (x>y) - (x<y)
+defcmp(x, y):
+return (x>y) - (x<y)
 
 
 # Initialize random number generator
@@ -69,7 +66,7 @@ def MakeGuid(name, seed="msvs_new"):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolutionEntry(object):
+classMSVSSolutionEntry:
 def__cmp__(self, other):
 # Sort by name then guid (so things are in order on vs2008).
 returncmp((self.name, self.get_guid()), (other.name, other.get_guid()))
@@ -190,7 +187,7 @@ def set_msbuild_toolset(self, msbuild_toolset):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolution(object):
+classMSVSSolution:
 """Visual Studio solution."""
 
 def__init__(
@@ -292,14 +289,14 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ife.items:
 f.write("\tProjectSection(SolutionItems) = preProject\r\n")
 foriine.items:
-f.write("\t\t%s = %s\r\n"% (i, i))
+f.write(f"\t\t{i} = {i}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 ifisinstance(e, MSVSProject):
 ife.dependencies:
 f.write("\tProjectSection(ProjectDependencies) = postProject\r\n")
 fordine.dependencies:
-f.write("\t\t%s = %s\r\n"% (d.get_guid(), d.get_guid()))
+f.write(f"\t\t{d.get_guid()} = {d.get_guid()}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 f.write("EndProject\r\n")
@@ -310,7 +307,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 # Configurations (variants)
 f.write("\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\r\n")
 forvinself.variants:
-f.write("\t\t%s = %s\r\n"% (v, v))
+f.write(f"\t\t{v} = {v}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 # Sort config guids for easier diffing of solution changes.
@@ -362,7 +359,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ifnotisinstance(e, MSVSFolder):
 continue# Does not apply to projects, only folders
 forsubentryine.entries:
-f.write("\t\t%s = %s\r\n"% (subentry.get_guid(), e.get_guid()))
+f.write(f"\t\t{subentry.get_guid()} = {e.get_guid()}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 f.write("EndGlobal\r\n")

gyp/pylib/gyp/MSVSProject.py

@@ -9,7 +9,7 @@
 # ------------------------------------------------------------------------------
 
 
-classTool(object):
+classTool:
 """Visual Studio tool."""
 
 def__init__(self, name, attrs=None):
@@ -31,7 +31,7 @@ def _GetSpecification(self):
 return ["Tool", self._attrs]
 
 
-classFilter(object):
+classFilter:
 """Visual Studio filter - that is, a virtual folder."""
 
 def__init__(self, name, contents=None):
@@ -48,7 +48,7 @@ def __init__(self, name, contents=None):
 # ------------------------------------------------------------------------------
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML project writer."""
 
 def__init__(self, project_path, version, name, guid=None, platforms=None):

gyp/pylib/gyp/MSVSSettings.py

@@ -14,12 +14,8 @@
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
 
-from __future__ importprint_function
-
-fromgypimportstring_types
-
-importsys
 importre
+importsys
 
 # Dictionaries of settings validators. The key is the tool name, the value is
 # a dictionary mapping setting names to validation functions.
@@ -36,7 +32,7 @@
 _msbuild_name_of_tool= {}
 
 
-class_Tool(object):
+class_Tool:
 """Represents a tool used by MSVS or MSBuild.
 
  Attributes:
@@ -68,7 +64,7 @@ def _GetMSBuildToolSettings(msbuild_settings, tool):
 returnmsbuild_settings.setdefault(tool.msbuild_name, {})
 
 
-class_Type(object):
+class_Type:
 """Type of settings (Base class)."""
 
 defValidateMSVS(self, value):
@@ -110,11 +106,11 @@ class _String(_Type):
 """A setting that's just a string."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -126,11 +122,11 @@ class _StringList(_Type):
 """A settings that's a list of strings."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -195,7 +191,7 @@ class _Enumeration(_Type):
 def__init__(self, label_list, new=None):
 _Type.__init__(self)
 self._label_list=label_list
-self._msbuild_values=set(valueforvalueinlabel_listifvalueisnotNone)
+self._msbuild_values={valueforvalueinlabel_listifvalueisnotNone}
 ifnewisnotNone:
 self._msbuild_values.update(new)
 
@@ -342,7 +338,7 @@ def _Translate(value, msbuild_settings):
 ifvalue=="true":
 tool_settings=_GetMSBuildToolSettings(msbuild_settings, tool)
 if"AdditionalOptions"intool_settings:
-new_flags="%s %s"%(tool_settings["AdditionalOptions"], flag)
+new_flags="{} {}".format(tool_settings["AdditionalOptions"], flag)
 else:
 new_flags=flag
 tool_settings["AdditionalOptions"] =new_flags
@@ -536,14 +532,14 @@ def _ValidateSettings(validators, settings, stderr):
 tool_validators[setting](value)
 exceptValueErrorase:
 print(
-"Warning: for %s/%s, %s"% (tool_name, setting, e),
+f"Warning: for {tool_name}/{setting}, {e}",
 file=stderr,
  )
 else:
 _ValidateExclusionSetting(
 setting,
 tool_validators,
- ("Warning: unrecognized setting %s/%s"% (tool_name, setting)),
+ (f"Warning: unrecognized setting {tool_name}/{setting}"),
 stderr,
  )
 

gyp/pylib/gyp/MSVSSettings_test.py

@@ -9,10 +9,7 @@
 importunittest
 importgyp.MSVSSettingsasMSVSSettings
 
-try:
-fromStringIOimportStringIO# Python 2
-exceptImportError:
-fromioimportStringIO# Python 3
+fromioimportStringIO
 
 
 classTestSequenceFunctions(unittest.TestCase):

gyp/pylib/gyp/MSVSToolFile.py

@@ -7,7 +7,7 @@
 importgyp.easy_xmlaseasy_xml
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML tool file writer."""
 
 def__init__(self, tool_file_path, name):

gyp/pylib/gyp/MSVSUserFile.py

@@ -53,7 +53,7 @@ def _QuoteWin32CommandLineArgs(args):
 returnnew_args
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML user user file writer."""
 
 def__init__(self, user_file_path, version, name):
@@ -93,7 +93,7 @@ def AddDebugSettings(
 abs_command=_FindCommandInPath(command[0])
 
 ifenvironmentandisinstance(environment, dict):
-env_list= ['%s="%s"'% (key, val)for (key, val) inenvironment.items()]
+env_list= [f'{key}="{val}"'for (key, val) inenvironment.items()]
 environment=" ".join(env_list)
 else:
 environment=""

gyp/pylib/gyp/MSVSUtil.py

@@ -55,7 +55,7 @@ def _SuffixName(name, suffix):
  Target name with suffix added (foo_suffix#target)
  """
 parts=name.rsplit("#", 1)
-parts[0] ="%s_%s"%(parts[0], suffix)
+parts[0] ="{}_{}".format(parts[0], suffix)
 return"#".join(parts)
 
 
@@ -160,7 +160,7 @@ def _GetPdbPath(target_dict, config_name, vars):
 returnpdb_path
 
 pdb_base=target_dict.get("product_name", target_dict["target_name"])
-pdb_base="%s.%s.pdb"%(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
+pdb_base="{}.{}.pdb".format(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
 pdb_path=vars["PRODUCT_DIR"] +"/"+pdb_base
 
 returnpdb_path

gyp/.github/workflows/Python_tests.yml

@@ -1,5 +1,4 @@
 # TODO: Enable os: windows-latest
-# TODO: Enable python-version: 3.5
 # TODO: Enable pytest --doctest-modules
 
 name: Python_tests
@@ -9,10 +8,10 @@ jobs:
 runs-on: ${{ matrix.os }}
 strategy:
 fail-fast: false
-max-parallel: 15
+max-parallel: 8
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
-python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
+python-version: [3.6, 3.7, 3.8, 3.9]
 steps:
  - uses: actions/checkout@v2
  - name: Set up Python ${{ matrix.python-version }}

gyp/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.8.0](https://www.github.com/nodejs/gyp-next/compare/v0.7.0...v0.8.0) (2021-01-15)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove support for Python 2
+
+### Bug Fixes
+
+* revert posix build job ([#86](https://www.github.com/nodejs/gyp-next/issues/86)) ([39dc34f](https://www.github.com/nodejs/gyp-next/commit/39dc34f0799c074624005fb9bbccf6e028607f9d))
+
+
+### gyp
+
+* Remove support for Python 2 ([#88](https://www.github.com/nodejs/gyp-next/issues/88)) ([22e4654](https://www.github.com/nodejs/gyp-next/commit/22e465426fd892403c95534229af819a99c3f8dc))
+
 ## [0.7.0](https://www.github.com/nodejs/gyp-next/compare/v0.6.2...v0.7.0) (2020-12-17)
 
 

gyp/gyp_main.py

@@ -8,19 +8,15 @@
 importsys
 importsubprocess
 
-PY3=bytes!=str
-
 
 defIsCygwin():
 # Function copied from pylib/gyp/common.py
 try:
 out=subprocess.Popen(
 "uname", stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
-stdout, stderr=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-return"CYGWIN"instr(stdout)
+stdout, _=out.communicate()
+return"CYGWIN"instdout.decode("utf-8")
 exceptException:
 returnFalse
 
@@ -33,9 +29,7 @@ def UnixifyPath(path):
  ["cygpath", "-u", path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
 stdout, _=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-returnstr(stdout)
+returnstdout.decode("utf-8")
 exceptException:
 returnpath
 

gyp/pylib/gyp/MSVSNew.py

@@ -11,12 +11,9 @@
 
 importgyp.common
 
-try:
-cmp
-exceptNameError:
 
-defcmp(x, y):
-return (x>y) - (x<y)
+defcmp(x, y):
+return (x>y) - (x<y)
 
 
 # Initialize random number generator
@@ -69,7 +66,7 @@ def MakeGuid(name, seed="msvs_new"):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolutionEntry(object):
+classMSVSSolutionEntry:
 def__cmp__(self, other):
 # Sort by name then guid (so things are in order on vs2008).
 returncmp((self.name, self.get_guid()), (other.name, other.get_guid()))
@@ -190,7 +187,7 @@ def set_msbuild_toolset(self, msbuild_toolset):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolution(object):
+classMSVSSolution:
 """Visual Studio solution."""
 
 def__init__(
@@ -292,14 +289,14 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ife.items:
 f.write("\tProjectSection(SolutionItems) = preProject\r\n")
 foriine.items:
-f.write("\t\t%s = %s\r\n"% (i, i))
+f.write(f"\t\t{i} = {i}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 ifisinstance(e, MSVSProject):
 ife.dependencies:
 f.write("\tProjectSection(ProjectDependencies) = postProject\r\n")
 fordine.dependencies:
-f.write("\t\t%s = %s\r\n"% (d.get_guid(), d.get_guid()))
+f.write(f"\t\t{d.get_guid()} = {d.get_guid()}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 f.write("EndProject\r\n")
@@ -310,7 +307,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 # Configurations (variants)
 f.write("\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\r\n")
 forvinself.variants:
-f.write("\t\t%s = %s\r\n"% (v, v))
+f.write(f"\t\t{v} = {v}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 # Sort config guids for easier diffing of solution changes.
@@ -362,7 +359,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ifnotisinstance(e, MSVSFolder):
 continue# Does not apply to projects, only folders
 forsubentryine.entries:
-f.write("\t\t%s = %s\r\n"% (subentry.get_guid(), e.get_guid()))
+f.write(f"\t\t{subentry.get_guid()} = {e.get_guid()}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 f.write("EndGlobal\r\n")

gyp/pylib/gyp/MSVSProject.py

@@ -9,7 +9,7 @@
 # ------------------------------------------------------------------------------
 
 
-classTool(object):
+classTool:
 """Visual Studio tool."""
 
 def__init__(self, name, attrs=None):
@@ -31,7 +31,7 @@ def _GetSpecification(self):
 return ["Tool", self._attrs]
 
 
-classFilter(object):
+classFilter:
 """Visual Studio filter - that is, a virtual folder."""
 
 def__init__(self, name, contents=None):
@@ -48,7 +48,7 @@ def __init__(self, name, contents=None):
 # ------------------------------------------------------------------------------
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML project writer."""
 
 def__init__(self, project_path, version, name, guid=None, platforms=None):

gyp/pylib/gyp/MSVSSettings.py

@@ -14,12 +14,8 @@
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
 
-from __future__ importprint_function
-
-fromgypimportstring_types
-
-importsys
 importre
+importsys
 
 # Dictionaries of settings validators. The key is the tool name, the value is
 # a dictionary mapping setting names to validation functions.
@@ -36,7 +32,7 @@
 _msbuild_name_of_tool= {}
 
 
-class_Tool(object):
+class_Tool:
 """Represents a tool used by MSVS or MSBuild.
 
  Attributes:
@@ -68,7 +64,7 @@ def _GetMSBuildToolSettings(msbuild_settings, tool):
 returnmsbuild_settings.setdefault(tool.msbuild_name, {})
 
 
-class_Type(object):
+class_Type:
 """Type of settings (Base class)."""
 
 defValidateMSVS(self, value):
@@ -110,11 +106,11 @@ class _String(_Type):
 """A setting that's just a string."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -126,11 +122,11 @@ class _StringList(_Type):
 """A settings that's a list of strings."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -195,7 +191,7 @@ class _Enumeration(_Type):
 def__init__(self, label_list, new=None):
 _Type.__init__(self)
 self._label_list=label_list
-self._msbuild_values=set(valueforvalueinlabel_listifvalueisnotNone)
+self._msbuild_values={valueforvalueinlabel_listifvalueisnotNone}
 ifnewisnotNone:
 self._msbuild_values.update(new)
 
@@ -342,7 +338,7 @@ def _Translate(value, msbuild_settings):
 ifvalue=="true":
 tool_settings=_GetMSBuildToolSettings(msbuild_settings, tool)
 if"AdditionalOptions"intool_settings:
-new_flags="%s %s"%(tool_settings["AdditionalOptions"], flag)
+new_flags="{} {}".format(tool_settings["AdditionalOptions"], flag)
 else:
 new_flags=flag
 tool_settings["AdditionalOptions"] =new_flags
@@ -536,14 +532,14 @@ def _ValidateSettings(validators, settings, stderr):
 tool_validators[setting](value)
 exceptValueErrorase:
 print(
-"Warning: for %s/%s, %s"% (tool_name, setting, e),
+f"Warning: for {tool_name}/{setting}, {e}",
 file=stderr,
  )
 else:
 _ValidateExclusionSetting(
 setting,
 tool_validators,
- ("Warning: unrecognized setting %s/%s"% (tool_name, setting)),
+ (f"Warning: unrecognized setting {tool_name}/{setting}"),
 stderr,
  )
 

gyp/pylib/gyp/MSVSSettings_test.py

@@ -9,10 +9,7 @@
 importunittest
 importgyp.MSVSSettingsasMSVSSettings
 
-try:
-fromStringIOimportStringIO# Python 2
-exceptImportError:
-fromioimportStringIO# Python 3
+fromioimportStringIO
 
 
 classTestSequenceFunctions(unittest.TestCase):

gyp/pylib/gyp/MSVSToolFile.py

@@ -7,7 +7,7 @@
 importgyp.easy_xmlaseasy_xml
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML tool file writer."""
 
 def__init__(self, tool_file_path, name):

gyp/pylib/gyp/MSVSUserFile.py

@@ -53,7 +53,7 @@ def _QuoteWin32CommandLineArgs(args):
 returnnew_args
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML user user file writer."""
 
 def__init__(self, user_file_path, version, name):
@@ -93,7 +93,7 @@ def AddDebugSettings(
 abs_command=_FindCommandInPath(command[0])
 
 ifenvironmentandisinstance(environment, dict):
-env_list= ['%s="%s"'% (key, val)for (key, val) inenvironment.items()]
+env_list= [f'{key}="{val}"'for (key, val) inenvironment.items()]
 environment=" ".join(env_list)
 else:
 environment=""

gyp/pylib/gyp/MSVSUtil.py

@@ -55,7 +55,7 @@ def _SuffixName(name, suffix):
  Target name with suffix added (foo_suffix#target)
  """
 parts=name.rsplit("#", 1)
-parts[0] ="%s_%s"%(parts[0], suffix)
+parts[0] ="{}_{}".format(parts[0], suffix)
 return"#".join(parts)
 
 
@@ -160,7 +160,7 @@ def _GetPdbPath(target_dict, config_name, vars):
 returnpdb_path
 
 pdb_base=target_dict.get("product_name", target_dict["target_name"])
-pdb_base="%s.%s.pdb"%(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
+pdb_base="{}.{}.pdb".format(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
 pdb_path=vars["PRODUCT_DIR"] +"/"+pdb_base
 
 returnpdb_path

gyp/.github/workflows/Python_tests.yml

@@ -1,5 +1,4 @@
 # TODO: Enable os: windows-latest
-# TODO: Enable python-version: 3.5
 # TODO: Enable pytest --doctest-modules
 
 name: Python_tests
@@ -9,10 +8,10 @@ jobs:
 runs-on: ${{ matrix.os }}
 strategy:
 fail-fast: false
-max-parallel: 15
+max-parallel: 8
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
-python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
+python-version: [3.6, 3.7, 3.8, 3.9]
 steps:
  - uses: actions/checkout@v2
  - name: Set up Python ${{ matrix.python-version }}

gyp/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.8.0](https://www.github.com/nodejs/gyp-next/compare/v0.7.0...v0.8.0) (2021-01-15)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove support for Python 2
+
+### Bug Fixes
+
+* revert posix build job ([#86](https://www.github.com/nodejs/gyp-next/issues/86)) ([39dc34f](https://www.github.com/nodejs/gyp-next/commit/39dc34f0799c074624005fb9bbccf6e028607f9d))
+
+
+### gyp
+
+* Remove support for Python 2 ([#88](https://www.github.com/nodejs/gyp-next/issues/88)) ([22e4654](https://www.github.com/nodejs/gyp-next/commit/22e465426fd892403c95534229af819a99c3f8dc))
+
 ## [0.7.0](https://www.github.com/nodejs/gyp-next/compare/v0.6.2...v0.7.0) (2020-12-17)
 
 

gyp/gyp_main.py

@@ -8,19 +8,15 @@
 importsys
 importsubprocess
 
-PY3=bytes!=str
-
 
 defIsCygwin():
 # Function copied from pylib/gyp/common.py
 try:
 out=subprocess.Popen(
 "uname", stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
-stdout, stderr=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-return"CYGWIN"instr(stdout)
+stdout, _=out.communicate()
+return"CYGWIN"instdout.decode("utf-8")
 exceptException:
 returnFalse
 
@@ -33,9 +29,7 @@ def UnixifyPath(path):
  ["cygpath", "-u", path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
 stdout, _=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-returnstr(stdout)
+returnstdout.decode("utf-8")
 exceptException:
 returnpath
 

gyp/pylib/gyp/MSVSNew.py

@@ -11,12 +11,9 @@
 
 importgyp.common
 
-try:
-cmp
-exceptNameError:
 
-defcmp(x, y):
-return (x>y) - (x<y)
+defcmp(x, y):
+return (x>y) - (x<y)
 
 
 # Initialize random number generator
@@ -69,7 +66,7 @@ def MakeGuid(name, seed="msvs_new"):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolutionEntry(object):
+classMSVSSolutionEntry:
 def__cmp__(self, other):
 # Sort by name then guid (so things are in order on vs2008).
 returncmp((self.name, self.get_guid()), (other.name, other.get_guid()))
@@ -190,7 +187,7 @@ def set_msbuild_toolset(self, msbuild_toolset):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolution(object):
+classMSVSSolution:
 """Visual Studio solution."""
 
 def__init__(
@@ -292,14 +289,14 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ife.items:
 f.write("\tProjectSection(SolutionItems) = preProject\r\n")
 foriine.items:
-f.write("\t\t%s = %s\r\n"% (i, i))
+f.write(f"\t\t{i} = {i}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 ifisinstance(e, MSVSProject):
 ife.dependencies:
 f.write("\tProjectSection(ProjectDependencies) = postProject\r\n")
 fordine.dependencies:
-f.write("\t\t%s = %s\r\n"% (d.get_guid(), d.get_guid()))
+f.write(f"\t\t{d.get_guid()} = {d.get_guid()}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 f.write("EndProject\r\n")
@@ -310,7 +307,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 # Configurations (variants)
 f.write("\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\r\n")
 forvinself.variants:
-f.write("\t\t%s = %s\r\n"% (v, v))
+f.write(f"\t\t{v} = {v}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 # Sort config guids for easier diffing of solution changes.
@@ -362,7 +359,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ifnotisinstance(e, MSVSFolder):
 continue# Does not apply to projects, only folders
 forsubentryine.entries:
-f.write("\t\t%s = %s\r\n"% (subentry.get_guid(), e.get_guid()))
+f.write(f"\t\t{subentry.get_guid()} = {e.get_guid()}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 f.write("EndGlobal\r\n")

gyp/pylib/gyp/MSVSProject.py

@@ -9,7 +9,7 @@
 # ------------------------------------------------------------------------------
 
 
-classTool(object):
+classTool:
 """Visual Studio tool."""
 
 def__init__(self, name, attrs=None):
@@ -31,7 +31,7 @@ def _GetSpecification(self):
 return ["Tool", self._attrs]
 
 
-classFilter(object):
+classFilter:
 """Visual Studio filter - that is, a virtual folder."""
 
 def__init__(self, name, contents=None):
@@ -48,7 +48,7 @@ def __init__(self, name, contents=None):
 # ------------------------------------------------------------------------------
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML project writer."""
 
 def__init__(self, project_path, version, name, guid=None, platforms=None):

gyp/pylib/gyp/MSVSSettings.py

@@ -14,12 +14,8 @@
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
 
-from __future__ importprint_function
-
-fromgypimportstring_types
-
-importsys
 importre
+importsys
 
 # Dictionaries of settings validators. The key is the tool name, the value is
 # a dictionary mapping setting names to validation functions.
@@ -36,7 +32,7 @@
 _msbuild_name_of_tool= {}
 
 
-class_Tool(object):
+class_Tool:
 """Represents a tool used by MSVS or MSBuild.
 
  Attributes:
@@ -68,7 +64,7 @@ def _GetMSBuildToolSettings(msbuild_settings, tool):
 returnmsbuild_settings.setdefault(tool.msbuild_name, {})
 
 
-class_Type(object):
+class_Type:
 """Type of settings (Base class)."""
 
 defValidateMSVS(self, value):
@@ -110,11 +106,11 @@ class _String(_Type):
 """A setting that's just a string."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -126,11 +122,11 @@ class _StringList(_Type):
 """A settings that's a list of strings."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -195,7 +191,7 @@ class _Enumeration(_Type):
 def__init__(self, label_list, new=None):
 _Type.__init__(self)
 self._label_list=label_list
-self._msbuild_values=set(valueforvalueinlabel_listifvalueisnotNone)
+self._msbuild_values={valueforvalueinlabel_listifvalueisnotNone}
 ifnewisnotNone:
 self._msbuild_values.update(new)
 
@@ -342,7 +338,7 @@ def _Translate(value, msbuild_settings):
 ifvalue=="true":
 tool_settings=_GetMSBuildToolSettings(msbuild_settings, tool)
 if"AdditionalOptions"intool_settings:
-new_flags="%s %s"%(tool_settings["AdditionalOptions"], flag)
+new_flags="{} {}".format(tool_settings["AdditionalOptions"], flag)
 else:
 new_flags=flag
 tool_settings["AdditionalOptions"] =new_flags
@@ -536,14 +532,14 @@ def _ValidateSettings(validators, settings, stderr):
 tool_validators[setting](value)
 exceptValueErrorase:
 print(
-"Warning: for %s/%s, %s"% (tool_name, setting, e),
+f"Warning: for {tool_name}/{setting}, {e}",
 file=stderr,
  )
 else:
 _ValidateExclusionSetting(
 setting,
 tool_validators,
- ("Warning: unrecognized setting %s/%s"% (tool_name, setting)),
+ (f"Warning: unrecognized setting {tool_name}/{setting}"),
 stderr,
  )
 

gyp/pylib/gyp/MSVSSettings_test.py

@@ -9,10 +9,7 @@
 importunittest
 importgyp.MSVSSettingsasMSVSSettings
 
-try:
-fromStringIOimportStringIO# Python 2
-exceptImportError:
-fromioimportStringIO# Python 3
+fromioimportStringIO
 
 
 classTestSequenceFunctions(unittest.TestCase):

gyp/pylib/gyp/MSVSToolFile.py

@@ -7,7 +7,7 @@
 importgyp.easy_xmlaseasy_xml
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML tool file writer."""
 
 def__init__(self, tool_file_path, name):

gyp/pylib/gyp/MSVSUserFile.py

@@ -53,7 +53,7 @@ def _QuoteWin32CommandLineArgs(args):
 returnnew_args
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML user user file writer."""
 
 def__init__(self, user_file_path, version, name):
@@ -93,7 +93,7 @@ def AddDebugSettings(
 abs_command=_FindCommandInPath(command[0])
 
 ifenvironmentandisinstance(environment, dict):
-env_list= ['%s="%s"'% (key, val)for (key, val) inenvironment.items()]
+env_list= [f'{key}="{val}"'for (key, val) inenvironment.items()]
 environment=" ".join(env_list)
 else:
 environment=""

gyp/pylib/gyp/MSVSUtil.py

@@ -55,7 +55,7 @@ def _SuffixName(name, suffix):
  Target name with suffix added (foo_suffix#target)
  """
 parts=name.rsplit("#", 1)
-parts[0] ="%s_%s"%(parts[0], suffix)
+parts[0] ="{}_{}".format(parts[0], suffix)
 return"#".join(parts)
 
 
@@ -160,7 +160,7 @@ def _GetPdbPath(target_dict, config_name, vars):
 returnpdb_path
 
 pdb_base=target_dict.get("product_name", target_dict["target_name"])
-pdb_base="%s.%s.pdb"%(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
+pdb_base="{}.{}.pdb".format(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
 pdb_path=vars["PRODUCT_DIR"] +"/"+pdb_base
 
 returnpdb_path

gyp/.github/workflows/Python_tests.yml

@@ -1,5 +1,4 @@
 # TODO: Enable os: windows-latest
-# TODO: Enable python-version: 3.5
 # TODO: Enable pytest --doctest-modules
 
 name: Python_tests
@@ -9,10 +8,10 @@ jobs:
 runs-on: ${{ matrix.os }}
 strategy:
 fail-fast: false
-max-parallel: 15
+max-parallel: 8
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
-python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
+python-version: [3.6, 3.7, 3.8, 3.9]
 steps:
  - uses: actions/checkout@v2
  - name: Set up Python ${{ matrix.python-version }}

gyp/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.8.0](https://www.github.com/nodejs/gyp-next/compare/v0.7.0...v0.8.0) (2021-01-15)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove support for Python 2
+
+### Bug Fixes
+
+* revert posix build job ([#86](https://www.github.com/nodejs/gyp-next/issues/86)) ([39dc34f](https://www.github.com/nodejs/gyp-next/commit/39dc34f0799c074624005fb9bbccf6e028607f9d))
+
+
+### gyp
+
+* Remove support for Python 2 ([#88](https://www.github.com/nodejs/gyp-next/issues/88)) ([22e4654](https://www.github.com/nodejs/gyp-next/commit/22e465426fd892403c95534229af819a99c3f8dc))
+
 ## [0.7.0](https://www.github.com/nodejs/gyp-next/compare/v0.6.2...v0.7.0) (2020-12-17)
 
 

gyp/gyp_main.py

@@ -8,19 +8,15 @@
 importsys
 importsubprocess
 
-PY3=bytes!=str
-
 
 defIsCygwin():
 # Function copied from pylib/gyp/common.py
 try:
 out=subprocess.Popen(
 "uname", stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
-stdout, stderr=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-return"CYGWIN"instr(stdout)
+stdout, _=out.communicate()
+return"CYGWIN"instdout.decode("utf-8")
 exceptException:
 returnFalse
 
@@ -33,9 +29,7 @@ def UnixifyPath(path):
  ["cygpath", "-u", path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
 stdout, _=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-returnstr(stdout)
+returnstdout.decode("utf-8")
 exceptException:
 returnpath
 

gyp/pylib/gyp/MSVSNew.py

@@ -11,12 +11,9 @@
 
 importgyp.common
 
-try:
-cmp
-exceptNameError:
 
-defcmp(x, y):
-return (x>y) - (x<y)
+defcmp(x, y):
+return (x>y) - (x<y)
 
 
 # Initialize random number generator
@@ -69,7 +66,7 @@ def MakeGuid(name, seed="msvs_new"):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolutionEntry(object):
+classMSVSSolutionEntry:
 def__cmp__(self, other):
 # Sort by name then guid (so things are in order on vs2008).
 returncmp((self.name, self.get_guid()), (other.name, other.get_guid()))
@@ -190,7 +187,7 @@ def set_msbuild_toolset(self, msbuild_toolset):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolution(object):
+classMSVSSolution:
 """Visual Studio solution."""
 
 def__init__(
@@ -292,14 +289,14 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ife.items:
 f.write("\tProjectSection(SolutionItems) = preProject\r\n")
 foriine.items:
-f.write("\t\t%s = %s\r\n"% (i, i))
+f.write(f"\t\t{i} = {i}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 ifisinstance(e, MSVSProject):
 ife.dependencies:
 f.write("\tProjectSection(ProjectDependencies) = postProject\r\n")
 fordine.dependencies:
-f.write("\t\t%s = %s\r\n"% (d.get_guid(), d.get_guid()))
+f.write(f"\t\t{d.get_guid()} = {d.get_guid()}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 f.write("EndProject\r\n")
@@ -310,7 +307,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 # Configurations (variants)
 f.write("\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\r\n")
 forvinself.variants:
-f.write("\t\t%s = %s\r\n"% (v, v))
+f.write(f"\t\t{v} = {v}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 # Sort config guids for easier diffing of solution changes.
@@ -362,7 +359,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ifnotisinstance(e, MSVSFolder):
 continue# Does not apply to projects, only folders
 forsubentryine.entries:
-f.write("\t\t%s = %s\r\n"% (subentry.get_guid(), e.get_guid()))
+f.write(f"\t\t{subentry.get_guid()} = {e.get_guid()}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 f.write("EndGlobal\r\n")

gyp/pylib/gyp/MSVSProject.py

@@ -9,7 +9,7 @@
 # ------------------------------------------------------------------------------
 
 
-classTool(object):
+classTool:
 """Visual Studio tool."""
 
 def__init__(self, name, attrs=None):
@@ -31,7 +31,7 @@ def _GetSpecification(self):
 return ["Tool", self._attrs]
 
 
-classFilter(object):
+classFilter:
 """Visual Studio filter - that is, a virtual folder."""
 
 def__init__(self, name, contents=None):
@@ -48,7 +48,7 @@ def __init__(self, name, contents=None):
 # ------------------------------------------------------------------------------
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML project writer."""
 
 def__init__(self, project_path, version, name, guid=None, platforms=None):

gyp/pylib/gyp/MSVSSettings.py

@@ -14,12 +14,8 @@
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
 
-from __future__ importprint_function
-
-fromgypimportstring_types
-
-importsys
 importre
+importsys
 
 # Dictionaries of settings validators. The key is the tool name, the value is
 # a dictionary mapping setting names to validation functions.
@@ -36,7 +32,7 @@
 _msbuild_name_of_tool= {}
 
 
-class_Tool(object):
+class_Tool:
 """Represents a tool used by MSVS or MSBuild.
 
  Attributes:
@@ -68,7 +64,7 @@ def _GetMSBuildToolSettings(msbuild_settings, tool):
 returnmsbuild_settings.setdefault(tool.msbuild_name, {})
 
 
-class_Type(object):
+class_Type:
 """Type of settings (Base class)."""
 
 defValidateMSVS(self, value):
@@ -110,11 +106,11 @@ class _String(_Type):
 """A setting that's just a string."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -126,11 +122,11 @@ class _StringList(_Type):
 """A settings that's a list of strings."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -195,7 +191,7 @@ class _Enumeration(_Type):
 def__init__(self, label_list, new=None):
 _Type.__init__(self)
 self._label_list=label_list
-self._msbuild_values=set(valueforvalueinlabel_listifvalueisnotNone)
+self._msbuild_values={valueforvalueinlabel_listifvalueisnotNone}
 ifnewisnotNone:
 self._msbuild_values.update(new)
 
@@ -342,7 +338,7 @@ def _Translate(value, msbuild_settings):
 ifvalue=="true":
 tool_settings=_GetMSBuildToolSettings(msbuild_settings, tool)
 if"AdditionalOptions"intool_settings:
-new_flags="%s %s"%(tool_settings["AdditionalOptions"], flag)
+new_flags="{} {}".format(tool_settings["AdditionalOptions"], flag)
 else:
 new_flags=flag
 tool_settings["AdditionalOptions"] =new_flags
@@ -536,14 +532,14 @@ def _ValidateSettings(validators, settings, stderr):
 tool_validators[setting](value)
 exceptValueErrorase:
 print(
-"Warning: for %s/%s, %s"% (tool_name, setting, e),
+f"Warning: for {tool_name}/{setting}, {e}",
 file=stderr,
  )
 else:
 _ValidateExclusionSetting(
 setting,
 tool_validators,
- ("Warning: unrecognized setting %s/%s"% (tool_name, setting)),
+ (f"Warning: unrecognized setting {tool_name}/{setting}"),
 stderr,
  )
 

gyp/pylib/gyp/MSVSSettings_test.py

@@ -9,10 +9,7 @@
 importunittest
 importgyp.MSVSSettingsasMSVSSettings
 
-try:
-fromStringIOimportStringIO# Python 2
-exceptImportError:
-fromioimportStringIO# Python 3
+fromioimportStringIO
 
 
 classTestSequenceFunctions(unittest.TestCase):

gyp/pylib/gyp/MSVSToolFile.py

@@ -7,7 +7,7 @@
 importgyp.easy_xmlaseasy_xml
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML tool file writer."""
 
 def__init__(self, tool_file_path, name):

gyp/pylib/gyp/MSVSUserFile.py

@@ -53,7 +53,7 @@ def _QuoteWin32CommandLineArgs(args):
 returnnew_args
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML user user file writer."""
 
 def__init__(self, user_file_path, version, name):
@@ -93,7 +93,7 @@ def AddDebugSettings(
 abs_command=_FindCommandInPath(command[0])
 
 ifenvironmentandisinstance(environment, dict):
-env_list= ['%s="%s"'% (key, val)for (key, val) inenvironment.items()]
+env_list= [f'{key}="{val}"'for (key, val) inenvironment.items()]
 environment=" ".join(env_list)
 else:
 environment=""

gyp/pylib/gyp/MSVSUtil.py

@@ -55,7 +55,7 @@ def _SuffixName(name, suffix):
  Target name with suffix added (foo_suffix#target)
  """
 parts=name.rsplit("#", 1)
-parts[0] ="%s_%s"%(parts[0], suffix)
+parts[0] ="{}_{}".format(parts[0], suffix)
 return"#".join(parts)
 
 
@@ -160,7 +160,7 @@ def _GetPdbPath(target_dict, config_name, vars):
 returnpdb_path
 
 pdb_base=target_dict.get("product_name", target_dict["target_name"])
-pdb_base="%s.%s.pdb"%(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
+pdb_base="{}.{}.pdb".format(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
 pdb_path=vars["PRODUCT_DIR"] +"/"+pdb_base
 
 returnpdb_path

gyp/.github/workflows/Python_tests.yml

@@ -1,5 +1,4 @@
 # TODO: Enable os: windows-latest
-# TODO: Enable python-version: 3.5
 # TODO: Enable pytest --doctest-modules
 
 name: Python_tests
@@ -9,10 +8,10 @@ jobs:
 runs-on: ${{ matrix.os }}
 strategy:
 fail-fast: false
-max-parallel: 15
+max-parallel: 8
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
-python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
+python-version: [3.6, 3.7, 3.8, 3.9]
 steps:
  - uses: actions/checkout@v2
  - name: Set up Python ${{ matrix.python-version }}

gyp/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.8.0](https://www.github.com/nodejs/gyp-next/compare/v0.7.0...v0.8.0) (2021-01-15)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove support for Python 2
+
+### Bug Fixes
+
+* revert posix build job ([#86](https://www.github.com/nodejs/gyp-next/issues/86)) ([39dc34f](https://www.github.com/nodejs/gyp-next/commit/39dc34f0799c074624005fb9bbccf6e028607f9d))
+
+
+### gyp
+
+* Remove support for Python 2 ([#88](https://www.github.com/nodejs/gyp-next/issues/88)) ([22e4654](https://www.github.com/nodejs/gyp-next/commit/22e465426fd892403c95534229af819a99c3f8dc))
+
 ## [0.7.0](https://www.github.com/nodejs/gyp-next/compare/v0.6.2...v0.7.0) (2020-12-17)
 
 

gyp/gyp_main.py

@@ -8,19 +8,15 @@
 importsys
 importsubprocess
 
-PY3=bytes!=str
-
 
 defIsCygwin():
 # Function copied from pylib/gyp/common.py
 try:
 out=subprocess.Popen(
 "uname", stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
-stdout, stderr=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-return"CYGWIN"instr(stdout)
+stdout, _=out.communicate()
+return"CYGWIN"instdout.decode("utf-8")
 exceptException:
 returnFalse
 
@@ -33,9 +29,7 @@ def UnixifyPath(path):
  ["cygpath", "-u", path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
 stdout, _=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-returnstr(stdout)
+returnstdout.decode("utf-8")
 exceptException:
 returnpath
 

gyp/pylib/gyp/MSVSNew.py

@@ -11,12 +11,9 @@
 
 importgyp.common
 
-try:
-cmp
-exceptNameError:
 
-defcmp(x, y):
-return (x>y) - (x<y)
+defcmp(x, y):
+return (x>y) - (x<y)
 
 
 # Initialize random number generator
@@ -69,7 +66,7 @@ def MakeGuid(name, seed="msvs_new"):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolutionEntry(object):
+classMSVSSolutionEntry:
 def__cmp__(self, other):
 # Sort by name then guid (so things are in order on vs2008).
 returncmp((self.name, self.get_guid()), (other.name, other.get_guid()))
@@ -190,7 +187,7 @@ def set_msbuild_toolset(self, msbuild_toolset):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolution(object):
+classMSVSSolution:
 """Visual Studio solution."""
 
 def__init__(
@@ -292,14 +289,14 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ife.items:
 f.write("\tProjectSection(SolutionItems) = preProject\r\n")
 foriine.items:
-f.write("\t\t%s = %s\r\n"% (i, i))
+f.write(f"\t\t{i} = {i}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 ifisinstance(e, MSVSProject):
 ife.dependencies:
 f.write("\tProjectSection(ProjectDependencies) = postProject\r\n")
 fordine.dependencies:
-f.write("\t\t%s = %s\r\n"% (d.get_guid(), d.get_guid()))
+f.write(f"\t\t{d.get_guid()} = {d.get_guid()}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 f.write("EndProject\r\n")
@@ -310,7 +307,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 # Configurations (variants)
 f.write("\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\r\n")
 forvinself.variants:
-f.write("\t\t%s = %s\r\n"% (v, v))
+f.write(f"\t\t{v} = {v}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 # Sort config guids for easier diffing of solution changes.
@@ -362,7 +359,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ifnotisinstance(e, MSVSFolder):
 continue# Does not apply to projects, only folders
 forsubentryine.entries:
-f.write("\t\t%s = %s\r\n"% (subentry.get_guid(), e.get_guid()))
+f.write(f"\t\t{subentry.get_guid()} = {e.get_guid()}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 f.write("EndGlobal\r\n")

gyp/pylib/gyp/MSVSProject.py

@@ -9,7 +9,7 @@
 # ------------------------------------------------------------------------------
 
 
-classTool(object):
+classTool:
 """Visual Studio tool."""
 
 def__init__(self, name, attrs=None):
@@ -31,7 +31,7 @@ def _GetSpecification(self):
 return ["Tool", self._attrs]
 
 
-classFilter(object):
+classFilter:
 """Visual Studio filter - that is, a virtual folder."""
 
 def__init__(self, name, contents=None):
@@ -48,7 +48,7 @@ def __init__(self, name, contents=None):
 # ------------------------------------------------------------------------------
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML project writer."""
 
 def__init__(self, project_path, version, name, guid=None, platforms=None):

gyp/pylib/gyp/MSVSSettings.py

@@ -14,12 +14,8 @@
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
 
-from __future__ importprint_function
-
-fromgypimportstring_types
-
-importsys
 importre
+importsys
 
 # Dictionaries of settings validators. The key is the tool name, the value is
 # a dictionary mapping setting names to validation functions.
@@ -36,7 +32,7 @@
 _msbuild_name_of_tool= {}
 
 
-class_Tool(object):
+class_Tool:
 """Represents a tool used by MSVS or MSBuild.
 
  Attributes:
@@ -68,7 +64,7 @@ def _GetMSBuildToolSettings(msbuild_settings, tool):
 returnmsbuild_settings.setdefault(tool.msbuild_name, {})
 
 
-class_Type(object):
+class_Type:
 """Type of settings (Base class)."""
 
 defValidateMSVS(self, value):
@@ -110,11 +106,11 @@ class _String(_Type):
 """A setting that's just a string."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -126,11 +122,11 @@ class _StringList(_Type):
 """A settings that's a list of strings."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -195,7 +191,7 @@ class _Enumeration(_Type):
 def__init__(self, label_list, new=None):
 _Type.__init__(self)
 self._label_list=label_list
-self._msbuild_values=set(valueforvalueinlabel_listifvalueisnotNone)
+self._msbuild_values={valueforvalueinlabel_listifvalueisnotNone}
 ifnewisnotNone:
 self._msbuild_values.update(new)
 
@@ -342,7 +338,7 @@ def _Translate(value, msbuild_settings):
 ifvalue=="true":
 tool_settings=_GetMSBuildToolSettings(msbuild_settings, tool)
 if"AdditionalOptions"intool_settings:
-new_flags="%s %s"%(tool_settings["AdditionalOptions"], flag)
+new_flags="{} {}".format(tool_settings["AdditionalOptions"], flag)
 else:
 new_flags=flag
 tool_settings["AdditionalOptions"] =new_flags
@@ -536,14 +532,14 @@ def _ValidateSettings(validators, settings, stderr):
 tool_validators[setting](value)
 exceptValueErrorase:
 print(
-"Warning: for %s/%s, %s"% (tool_name, setting, e),
+f"Warning: for {tool_name}/{setting}, {e}",
 file=stderr,
  )
 else:
 _ValidateExclusionSetting(
 setting,
 tool_validators,
- ("Warning: unrecognized setting %s/%s"% (tool_name, setting)),
+ (f"Warning: unrecognized setting {tool_name}/{setting}"),
 stderr,
  )
 

gyp/pylib/gyp/MSVSSettings_test.py

@@ -9,10 +9,7 @@
 importunittest
 importgyp.MSVSSettingsasMSVSSettings
 
-try:
-fromStringIOimportStringIO# Python 2
-exceptImportError:
-fromioimportStringIO# Python 3
+fromioimportStringIO
 
 
 classTestSequenceFunctions(unittest.TestCase):

gyp/pylib/gyp/MSVSToolFile.py

@@ -7,7 +7,7 @@
 importgyp.easy_xmlaseasy_xml
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML tool file writer."""
 
 def__init__(self, tool_file_path, name):

gyp/pylib/gyp/MSVSUserFile.py

@@ -53,7 +53,7 @@ def _QuoteWin32CommandLineArgs(args):
 returnnew_args
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML user user file writer."""
 
 def__init__(self, user_file_path, version, name):
@@ -93,7 +93,7 @@ def AddDebugSettings(
 abs_command=_FindCommandInPath(command[0])
 
 ifenvironmentandisinstance(environment, dict):
-env_list= ['%s="%s"'% (key, val)for (key, val) inenvironment.items()]
+env_list= [f'{key}="{val}"'for (key, val) inenvironment.items()]
 environment=" ".join(env_list)
 else:
 environment=""

gyp/pylib/gyp/MSVSUtil.py

@@ -55,7 +55,7 @@ def _SuffixName(name, suffix):
  Target name with suffix added (foo_suffix#target)
  """
 parts=name.rsplit("#", 1)
-parts[0] ="%s_%s"%(parts[0], suffix)
+parts[0] ="{}_{}".format(parts[0], suffix)
 return"#".join(parts)
 
 
@@ -160,7 +160,7 @@ def _GetPdbPath(target_dict, config_name, vars):
 returnpdb_path
 
 pdb_base=target_dict.get("product_name", target_dict["target_name"])
-pdb_base="%s.%s.pdb"%(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
+pdb_base="{}.{}.pdb".format(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
 pdb_path=vars["PRODUCT_DIR"] +"/"+pdb_base
 
 returnpdb_path

gyp/.github/workflows/Python_tests.yml

@@ -1,5 +1,4 @@
 # TODO: Enable os: windows-latest
-# TODO: Enable python-version: 3.5
 # TODO: Enable pytest --doctest-modules
 
 name: Python_tests
@@ -9,10 +8,10 @@ jobs:
 runs-on: ${{ matrix.os }}
 strategy:
 fail-fast: false
-max-parallel: 15
+max-parallel: 8
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
-python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
+python-version: [3.6, 3.7, 3.8, 3.9]
 steps:
  - uses: actions/checkout@v2
  - name: Set up Python ${{ matrix.python-version }}

gyp/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.8.0](https://www.github.com/nodejs/gyp-next/compare/v0.7.0...v0.8.0) (2021-01-15)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove support for Python 2
+
+### Bug Fixes
+
+* revert posix build job ([#86](https://www.github.com/nodejs/gyp-next/issues/86)) ([39dc34f](https://www.github.com/nodejs/gyp-next/commit/39dc34f0799c074624005fb9bbccf6e028607f9d))
+
+
+### gyp
+
+* Remove support for Python 2 ([#88](https://www.github.com/nodejs/gyp-next/issues/88)) ([22e4654](https://www.github.com/nodejs/gyp-next/commit/22e465426fd892403c95534229af819a99c3f8dc))
+
 ## [0.7.0](https://www.github.com/nodejs/gyp-next/compare/v0.6.2...v0.7.0) (2020-12-17)
 
 

gyp/gyp_main.py

@@ -8,19 +8,15 @@
 importsys
 importsubprocess
 
-PY3=bytes!=str
-
 
 defIsCygwin():
 # Function copied from pylib/gyp/common.py
 try:
 out=subprocess.Popen(
 "uname", stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
-stdout, stderr=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-return"CYGWIN"instr(stdout)
+stdout, _=out.communicate()
+return"CYGWIN"instdout.decode("utf-8")
 exceptException:
 returnFalse
 
@@ -33,9 +29,7 @@ def UnixifyPath(path):
  ["cygpath", "-u", path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
 stdout, _=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-returnstr(stdout)
+returnstdout.decode("utf-8")
 exceptException:
 returnpath
 

gyp/pylib/gyp/MSVSNew.py

@@ -11,12 +11,9 @@
 
 importgyp.common
 
-try:
-cmp
-exceptNameError:
 
-defcmp(x, y):
-return (x>y) - (x<y)
+defcmp(x, y):
+return (x>y) - (x<y)
 
 
 # Initialize random number generator
@@ -69,7 +66,7 @@ def MakeGuid(name, seed="msvs_new"):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolutionEntry(object):
+classMSVSSolutionEntry:
 def__cmp__(self, other):
 # Sort by name then guid (so things are in order on vs2008).
 returncmp((self.name, self.get_guid()), (other.name, other.get_guid()))
@@ -190,7 +187,7 @@ def set_msbuild_toolset(self, msbuild_toolset):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolution(object):
+classMSVSSolution:
 """Visual Studio solution."""
 
 def__init__(
@@ -292,14 +289,14 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ife.items:
 f.write("\tProjectSection(SolutionItems) = preProject\r\n")
 foriine.items:
-f.write("\t\t%s = %s\r\n"% (i, i))
+f.write(f"\t\t{i} = {i}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 ifisinstance(e, MSVSProject):
 ife.dependencies:
 f.write("\tProjectSection(ProjectDependencies) = postProject\r\n")
 fordine.dependencies:
-f.write("\t\t%s = %s\r\n"% (d.get_guid(), d.get_guid()))
+f.write(f"\t\t{d.get_guid()} = {d.get_guid()}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 f.write("EndProject\r\n")
@@ -310,7 +307,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 # Configurations (variants)
 f.write("\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\r\n")
 forvinself.variants:
-f.write("\t\t%s = %s\r\n"% (v, v))
+f.write(f"\t\t{v} = {v}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 # Sort config guids for easier diffing of solution changes.
@@ -362,7 +359,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ifnotisinstance(e, MSVSFolder):
 continue# Does not apply to projects, only folders
 forsubentryine.entries:
-f.write("\t\t%s = %s\r\n"% (subentry.get_guid(), e.get_guid()))
+f.write(f"\t\t{subentry.get_guid()} = {e.get_guid()}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 f.write("EndGlobal\r\n")

gyp/pylib/gyp/MSVSProject.py

@@ -9,7 +9,7 @@
 # ------------------------------------------------------------------------------
 
 
-classTool(object):
+classTool:
 """Visual Studio tool."""
 
 def__init__(self, name, attrs=None):
@@ -31,7 +31,7 @@ def _GetSpecification(self):
 return ["Tool", self._attrs]
 
 
-classFilter(object):
+classFilter:
 """Visual Studio filter - that is, a virtual folder."""
 
 def__init__(self, name, contents=None):
@@ -48,7 +48,7 @@ def __init__(self, name, contents=None):
 # ------------------------------------------------------------------------------
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML project writer."""
 
 def__init__(self, project_path, version, name, guid=None, platforms=None):

gyp/pylib/gyp/MSVSSettings.py

@@ -14,12 +14,8 @@
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
 
-from __future__ importprint_function
-
-fromgypimportstring_types
-
-importsys
 importre
+importsys
 
 # Dictionaries of settings validators. The key is the tool name, the value is
 # a dictionary mapping setting names to validation functions.
@@ -36,7 +32,7 @@
 _msbuild_name_of_tool= {}
 
 
-class_Tool(object):
+class_Tool:
 """Represents a tool used by MSVS or MSBuild.
 
  Attributes:
@@ -68,7 +64,7 @@ def _GetMSBuildToolSettings(msbuild_settings, tool):
 returnmsbuild_settings.setdefault(tool.msbuild_name, {})
 
 
-class_Type(object):
+class_Type:
 """Type of settings (Base class)."""
 
 defValidateMSVS(self, value):
@@ -110,11 +106,11 @@ class _String(_Type):
 """A setting that's just a string."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -126,11 +122,11 @@ class _StringList(_Type):
 """A settings that's a list of strings."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -195,7 +191,7 @@ class _Enumeration(_Type):
 def__init__(self, label_list, new=None):
 _Type.__init__(self)
 self._label_list=label_list
-self._msbuild_values=set(valueforvalueinlabel_listifvalueisnotNone)
+self._msbuild_values={valueforvalueinlabel_listifvalueisnotNone}
 ifnewisnotNone:
 self._msbuild_values.update(new)
 
@@ -342,7 +338,7 @@ def _Translate(value, msbuild_settings):
 ifvalue=="true":
 tool_settings=_GetMSBuildToolSettings(msbuild_settings, tool)
 if"AdditionalOptions"intool_settings:
-new_flags="%s %s"%(tool_settings["AdditionalOptions"], flag)
+new_flags="{} {}".format(tool_settings["AdditionalOptions"], flag)
 else:
 new_flags=flag
 tool_settings["AdditionalOptions"] =new_flags
@@ -536,14 +532,14 @@ def _ValidateSettings(validators, settings, stderr):
 tool_validators[setting](value)
 exceptValueErrorase:
 print(
-"Warning: for %s/%s, %s"% (tool_name, setting, e),
+f"Warning: for {tool_name}/{setting}, {e}",
 file=stderr,
  )
 else:
 _ValidateExclusionSetting(
 setting,
 tool_validators,
- ("Warning: unrecognized setting %s/%s"% (tool_name, setting)),
+ (f"Warning: unrecognized setting {tool_name}/{setting}"),
 stderr,
  )
 

gyp/pylib/gyp/MSVSSettings_test.py

@@ -9,10 +9,7 @@
 importunittest
 importgyp.MSVSSettingsasMSVSSettings
 
-try:
-fromStringIOimportStringIO# Python 2
-exceptImportError:
-fromioimportStringIO# Python 3
+fromioimportStringIO
 
 
 classTestSequenceFunctions(unittest.TestCase):

gyp/pylib/gyp/MSVSToolFile.py

@@ -7,7 +7,7 @@
 importgyp.easy_xmlaseasy_xml
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML tool file writer."""
 
 def__init__(self, tool_file_path, name):

gyp/pylib/gyp/MSVSUserFile.py

@@ -53,7 +53,7 @@ def _QuoteWin32CommandLineArgs(args):
 returnnew_args
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML user user file writer."""
 
 def__init__(self, user_file_path, version, name):
@@ -93,7 +93,7 @@ def AddDebugSettings(
 abs_command=_FindCommandInPath(command[0])
 
 ifenvironmentandisinstance(environment, dict):
-env_list= ['%s="%s"'% (key, val)for (key, val) inenvironment.items()]
+env_list= [f'{key}="{val}"'for (key, val) inenvironment.items()]
 environment=" ".join(env_list)
 else:
 environment=""

gyp/pylib/gyp/MSVSUtil.py

@@ -55,7 +55,7 @@ def _SuffixName(name, suffix):
  Target name with suffix added (foo_suffix#target)
  """
 parts=name.rsplit("#", 1)
-parts[0] ="%s_%s"%(parts[0], suffix)
+parts[0] ="{}_{}".format(parts[0], suffix)
 return"#".join(parts)
 
 
@@ -160,7 +160,7 @@ def _GetPdbPath(target_dict, config_name, vars):
 returnpdb_path
 
 pdb_base=target_dict.get("product_name", target_dict["target_name"])
-pdb_base="%s.%s.pdb"%(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
+pdb_base="{}.{}.pdb".format(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
 pdb_path=vars["PRODUCT_DIR"] +"/"+pdb_base
 
 returnpdb_path

gyp/.github/workflows/Python_tests.yml

@@ -1,5 +1,4 @@
 # TODO: Enable os: windows-latest
-# TODO: Enable python-version: 3.5
 # TODO: Enable pytest --doctest-modules
 
 name: Python_tests
@@ -9,10 +8,10 @@ jobs:
 runs-on: ${{ matrix.os }}
 strategy:
 fail-fast: false
-max-parallel: 15
+max-parallel: 8
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
-python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
+python-version: [3.6, 3.7, 3.8, 3.9]
 steps:
  - uses: actions/checkout@v2
  - name: Set up Python ${{ matrix.python-version }}

gyp/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.8.0](https://www.github.com/nodejs/gyp-next/compare/v0.7.0...v0.8.0) (2021-01-15)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove support for Python 2
+
+### Bug Fixes
+
+* revert posix build job ([#86](https://www.github.com/nodejs/gyp-next/issues/86)) ([39dc34f](https://www.github.com/nodejs/gyp-next/commit/39dc34f0799c074624005fb9bbccf6e028607f9d))
+
+
+### gyp
+
+* Remove support for Python 2 ([#88](https://www.github.com/nodejs/gyp-next/issues/88)) ([22e4654](https://www.github.com/nodejs/gyp-next/commit/22e465426fd892403c95534229af819a99c3f8dc))
+
 ## [0.7.0](https://www.github.com/nodejs/gyp-next/compare/v0.6.2...v0.7.0) (2020-12-17)
 
 

gyp/gyp_main.py

@@ -8,19 +8,15 @@
 importsys
 importsubprocess
 
-PY3=bytes!=str
-
 
 defIsCygwin():
 # Function copied from pylib/gyp/common.py
 try:
 out=subprocess.Popen(
 "uname", stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
-stdout, stderr=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-return"CYGWIN"instr(stdout)
+stdout, _=out.communicate()
+return"CYGWIN"instdout.decode("utf-8")
 exceptException:
 returnFalse
 
@@ -33,9 +29,7 @@ def UnixifyPath(path):
  ["cygpath", "-u", path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT
  )
 stdout, _=out.communicate()
-ifPY3:
-stdout=stdout.decode("utf-8")
-returnstr(stdout)
+returnstdout.decode("utf-8")
 exceptException:
 returnpath
 

gyp/pylib/gyp/MSVSNew.py

@@ -11,12 +11,9 @@
 
 importgyp.common
 
-try:
-cmp
-exceptNameError:
 
-defcmp(x, y):
-return (x>y) - (x<y)
+defcmp(x, y):
+return (x>y) - (x<y)
 
 
 # Initialize random number generator
@@ -69,7 +66,7 @@ def MakeGuid(name, seed="msvs_new"):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolutionEntry(object):
+classMSVSSolutionEntry:
 def__cmp__(self, other):
 # Sort by name then guid (so things are in order on vs2008).
 returncmp((self.name, self.get_guid()), (other.name, other.get_guid()))
@@ -190,7 +187,7 @@ def set_msbuild_toolset(self, msbuild_toolset):
 # ------------------------------------------------------------------------------
 
 
-classMSVSSolution(object):
+classMSVSSolution:
 """Visual Studio solution."""
 
 def__init__(
@@ -292,14 +289,14 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ife.items:
 f.write("\tProjectSection(SolutionItems) = preProject\r\n")
 foriine.items:
-f.write("\t\t%s = %s\r\n"% (i, i))
+f.write(f"\t\t{i} = {i}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 ifisinstance(e, MSVSProject):
 ife.dependencies:
 f.write("\tProjectSection(ProjectDependencies) = postProject\r\n")
 fordine.dependencies:
-f.write("\t\t%s = %s\r\n"% (d.get_guid(), d.get_guid()))
+f.write(f"\t\t{d.get_guid()} = {d.get_guid()}\r\n")
 f.write("\tEndProjectSection\r\n")
 
 f.write("EndProject\r\n")
@@ -310,7 +307,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 # Configurations (variants)
 f.write("\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\r\n")
 forvinself.variants:
-f.write("\t\t%s = %s\r\n"% (v, v))
+f.write(f"\t\t{v} = {v}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 # Sort config guids for easier diffing of solution changes.
@@ -362,7 +359,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
 ifnotisinstance(e, MSVSFolder):
 continue# Does not apply to projects, only folders
 forsubentryine.entries:
-f.write("\t\t%s = %s\r\n"% (subentry.get_guid(), e.get_guid()))
+f.write(f"\t\t{subentry.get_guid()} = {e.get_guid()}\r\n")
 f.write("\tEndGlobalSection\r\n")
 
 f.write("EndGlobal\r\n")

gyp/pylib/gyp/MSVSProject.py

@@ -9,7 +9,7 @@
 # ------------------------------------------------------------------------------
 
 
-classTool(object):
+classTool:
 """Visual Studio tool."""
 
 def__init__(self, name, attrs=None):
@@ -31,7 +31,7 @@ def _GetSpecification(self):
 return ["Tool", self._attrs]
 
 
-classFilter(object):
+classFilter:
 """Visual Studio filter - that is, a virtual folder."""
 
 def__init__(self, name, contents=None):
@@ -48,7 +48,7 @@ def __init__(self, name, contents=None):
 # ------------------------------------------------------------------------------
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML project writer."""
 
 def__init__(self, project_path, version, name, guid=None, platforms=None):

gyp/pylib/gyp/MSVSSettings.py

@@ -14,12 +14,8 @@
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
 
-from __future__ importprint_function
-
-fromgypimportstring_types
-
-importsys
 importre
+importsys
 
 # Dictionaries of settings validators. The key is the tool name, the value is
 # a dictionary mapping setting names to validation functions.
@@ -36,7 +32,7 @@
 _msbuild_name_of_tool= {}
 
 
-class_Tool(object):
+class_Tool:
 """Represents a tool used by MSVS or MSBuild.
 
  Attributes:
@@ -68,7 +64,7 @@ def _GetMSBuildToolSettings(msbuild_settings, tool):
 returnmsbuild_settings.setdefault(tool.msbuild_name, {})
 
 
-class_Type(object):
+class_Type:
 """Type of settings (Base class)."""
 
 defValidateMSVS(self, value):
@@ -110,11 +106,11 @@ class _String(_Type):
 """A setting that's just a string."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types):
+ifnotisinstance(value, str):
 raiseValueError("expected string; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -126,11 +122,11 @@ class _StringList(_Type):
 """A settings that's a list of strings."""
 
 defValidateMSVS(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defValidateMSBuild(self, value):
-ifnotisinstance(value, string_types) andnotisinstance(value, list):
+ifnotisinstance(value, (list, str)):
 raiseValueError("expected string list; got %r"%value)
 
 defConvertToMSBuild(self, value):
@@ -195,7 +191,7 @@ class _Enumeration(_Type):
 def__init__(self, label_list, new=None):
 _Type.__init__(self)
 self._label_list=label_list
-self._msbuild_values=set(valueforvalueinlabel_listifvalueisnotNone)
+self._msbuild_values={valueforvalueinlabel_listifvalueisnotNone}
 ifnewisnotNone:
 self._msbuild_values.update(new)
 
@@ -342,7 +338,7 @@ def _Translate(value, msbuild_settings):
 ifvalue=="true":
 tool_settings=_GetMSBuildToolSettings(msbuild_settings, tool)
 if"AdditionalOptions"intool_settings:
-new_flags="%s %s"%(tool_settings["AdditionalOptions"], flag)
+new_flags="{} {}".format(tool_settings["AdditionalOptions"], flag)
 else:
 new_flags=flag
 tool_settings["AdditionalOptions"] =new_flags
@@ -536,14 +532,14 @@ def _ValidateSettings(validators, settings, stderr):
 tool_validators[setting](value)
 exceptValueErrorase:
 print(
-"Warning: for %s/%s, %s"% (tool_name, setting, e),
+f"Warning: for {tool_name}/{setting}, {e}",
 file=stderr,
  )
 else:
 _ValidateExclusionSetting(
 setting,
 tool_validators,
- ("Warning: unrecognized setting %s/%s"% (tool_name, setting)),
+ (f"Warning: unrecognized setting {tool_name}/{setting}"),
 stderr,
  )
 

gyp/pylib/gyp/MSVSSettings_test.py

@@ -9,10 +9,7 @@
 importunittest
 importgyp.MSVSSettingsasMSVSSettings
 
-try:
-fromStringIOimportStringIO# Python 2
-exceptImportError:
-fromioimportStringIO# Python 3
+fromioimportStringIO
 
 
 classTestSequenceFunctions(unittest.TestCase):

gyp/pylib/gyp/MSVSToolFile.py

@@ -7,7 +7,7 @@
 importgyp.easy_xmlaseasy_xml
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML tool file writer."""
 
 def__init__(self, tool_file_path, name):

gyp/pylib/gyp/MSVSUserFile.py

@@ -53,7 +53,7 @@ def _QuoteWin32CommandLineArgs(args):
 returnnew_args
 
 
-classWriter(object):
+classWriter:
 """Visual Studio XML user user file writer."""
 
 def__init__(self, user_file_path, version, name):
@@ -93,7 +93,7 @@ def AddDebugSettings(
 abs_command=_FindCommandInPath(command[0])
 
 ifenvironmentandisinstance(environment, dict):
-env_list= ['%s="%s"'% (key, val)for (key, val) inenvironment.items()]
+env_list= [f'{key}="{val}"'for (key, val) inenvironment.items()]
 environment=" ".join(env_list)
 else:
 environment=""

gyp/pylib/gyp/MSVSUtil.py

@@ -55,7 +55,7 @@ def _SuffixName(name, suffix):
  Target name with suffix added (foo_suffix#target)
  """
 parts=name.rsplit("#", 1)
-parts[0] ="%s_%s"%(parts[0], suffix)
+parts[0] ="{}_{}".format(parts[0], suffix)
 return"#".join(parts)
 
 
@@ -160,7 +160,7 @@ def _GetPdbPath(target_dict, config_name, vars):
 returnpdb_path
 
 pdb_base=target_dict.get("product_name", target_dict["target_name"])
-pdb_base="%s.%s.pdb"%(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
+pdb_base="{}.{}.pdb".format(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
 pdb_path=vars["PRODUCT_DIR"] +"/"+pdb_base
 
 returnpdb_path