Version 3.4.0 (#1601)

slozier · BCSharp · web-flow · commit cc8d9f9a3b8b · 2022-12-09T20:43:26.000-05:00
* Version 3.4.0 * Add chocolatey ignore files for stdlib * Add missing assembly to installer * Bump minimum framework version in installer * Fix listdir issue * Include .0 in version in MSI * Backport #1511 * Disable failing test * Disable some tests failing on mono/macOS Co-authored-by: Pavel Koneski <pavel.koneski@gmail.com>
diff --git a/CurrentVersion.props b/CurrentVersion.props
@@ -4,8 +4,8 @@
     <MajorVersion>3</MajorVersion>
     <MinorVersion>4</MinorVersion>
     <MicroVersion>0</MicroVersion>
-    <ReleaseLevel>beta</ReleaseLevel>
-    <ReleaseSerial>1</ReleaseSerial><!-- this should only be 0 when final -->
+    <ReleaseLevel>final</ReleaseLevel>
+    <ReleaseSerial>0</ReleaseSerial><!-- this should only be 0 when final -->
 
     <AssemblyRevision>0</AssemblyRevision>
   </PropertyGroup>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -40,9 +40,8 @@
     <ShortReleaseLevel Condition="'$(ReleaseLevel)' == 'candidate'">rc</ShortReleaseLevel>
     <ShortReleaseLevel Condition="'$(ReleaseLevel)' == 'final'">f</ShortReleaseLevel>
 
-    <DisplayVersion Condition="'$(ReleaseLevel)' == 'final' and '$(MicroVersion)' == '0'">$(MajorVersion).$(MinorVersion)</DisplayVersion>
-    <DisplayVersion Condition="'$(ReleaseLevel)' == 'final' and '$(MicroVersion)' != '0'">$(MajorVersion).$(MinorVersion).$(MicroVersion)</DisplayVersion>
-    <DisplayVersion Condition="'$(ReleaseLevel)' != 'final'">$(MajorVersion).$(MinorVersion).$(MicroVersion)$(ShortReleaseLevel)$(ReleaseSerial)</DisplayVersion>
+    <DisplayVersion>$(MajorVersion).$(MinorVersion).$(MicroVersion)</DisplayVersion>
+    <DisplayVersion Condition="'$(ReleaseLevel)' != 'final'">$(DisplayVersion)$(ShortReleaseLevel)$(ReleaseSerial)</DisplayVersion>
   </PropertyGroup>
 
   <!-- Deterministic build -->
diff --git a/Package/choco/IronPython.nuspec b/Package/choco/IronPython.nuspec
@@ -26,5 +26,6 @@
     <file src="$STAGEDIR$\LICENSE" />
     <file src="README.md" />
     <file src="tools\*" target="tools" />
+    <file src="ignores\**\*" />
   </files>
 </package>
diff --git a/Package/choco/ignores/lib/distutils/command/wininst-10.0-amd64.exe.ignore b/Package/choco/ignores/lib/distutils/command/wininst-10.0-amd64.exe.ignore
diff --git a/Package/choco/ignores/lib/distutils/command/wininst-10.0.exe.ignore b/Package/choco/ignores/lib/distutils/command/wininst-10.0.exe.ignore
diff --git a/Package/choco/ignores/lib/distutils/command/wininst-6.0.exe.ignore b/Package/choco/ignores/lib/distutils/command/wininst-6.0.exe.ignore
diff --git a/Package/choco/ignores/lib/distutils/command/wininst-7.1.exe.ignore b/Package/choco/ignores/lib/distutils/command/wininst-7.1.exe.ignore
diff --git a/Package/choco/ignores/lib/distutils/command/wininst-8.0.exe.ignore b/Package/choco/ignores/lib/distutils/command/wininst-8.0.exe.ignore
diff --git a/Package/choco/ignores/lib/distutils/command/wininst-9.0-amd64.exe.ignore b/Package/choco/ignores/lib/distutils/command/wininst-9.0-amd64.exe.ignore
diff --git a/Package/choco/ignores/lib/distutils/command/wininst-9.0.exe.ignore b/Package/choco/ignores/lib/distutils/command/wininst-9.0.exe.ignore
diff --git a/Package/msi/IronPython.wxs b/Package/msi/IronPython.wxs
@@ -58,6 +58,9 @@
       <Component>
         <File Source="$(var.PlatformDir)\System.Memory.dll" />
       </Component>
+      <Component>
+        <File Source="$(var.PlatformDir)\System.Numerics.Vectors.dll" />
+      </Component>
       <Component>
         <File Source="$(var.PlatformDir)\System.Runtime.CompilerServices.Unsafe.dll" />
       </Component>
@@ -138,6 +141,7 @@
       <ComponentRef Id="README.md" />
       <ComponentRef Id="System.Buffers.dll" />
       <ComponentRef Id="System.Memory.dll" />
+      <ComponentRef Id="System.Numerics.Vectors.dll" />
       <ComponentRef Id="System.Runtime.CompilerServices.Unsafe.dll" />
       <ComponentRef Id="LICENSE" />
       <ComponentRef Id="InstallationKey" />
diff --git a/Package/msi/Product.wxs b/Package/msi/Product.wxs
@@ -31,7 +31,7 @@ WHEN PERFORMING MAJOR IP UPGRADES (e.g., 2.5 => 2.6):
       <UpgradeVersion Minimum="0.0.0.0" IncludeMinimum="yes" Maximum="$(var.ProductVersion)" IncludeMaximum="yes" Property="OLDERVERSIONBEINGUPGRADED" OnlyDetect="no" />
     </Upgrade>
 
-    <PropertyRef Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" />
+    <PropertyRef Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED" />
 
     <!-- Properties -->
     <Property Id="ARPPRODUCTICON" Value="ipy.ico" />
@@ -53,7 +53,7 @@ WHEN PERFORMING MAJOR IP UPGRADES (e.g., 2.5 => 2.6):
 
     <!-- Launch conditions -->
     <Condition Message="An administrator must approve or install [ProductName]."><![CDATA[Privileged]]></Condition>
-    <Condition Message="[ProductName] requires .NET Framework 4.6 or later."><![CDATA[Installed OR WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED]]></Condition>
+    <Condition Message="[ProductName] requires .NET Framework 4.6.2 or later."><![CDATA[Installed OR WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED]]></Condition>
 
     <!-- Root directories -->
     <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/Package/nuget/IronPython.StdLib.nuspec b/Package/nuget/IronPython.StdLib.nuspec
@@ -14,7 +14,7 @@
     <language>en-US</language>
     <tags>ironpython python dynamic dlr standard library</tags>
     <dependencies>
-      <dependency id="IronPython" version="[3.4.0-beta1,3.5)" />
+      <dependency id="IronPython" version="[3.4.0,3.5)" />
     </dependencies>
     <contentFiles>
       <files include="**\*" buildAction="None" copyToOutput="true" />
diff --git a/Package/nuget/IronPython.nuspec b/Package/nuget/IronPython.nuspec
@@ -19,23 +19,23 @@ This package contains the IronPython interpreter engine.</description>
     <tags>ironpython python dynamic dlr</tags>
     <dependencies>
       <group targetFramework="net462">
-        <dependency id="DynamicLanguageRuntime" version="1.3.2" />
+        <dependency id="DynamicLanguageRuntime" version="1.3.3" />
         <dependency id="System.Memory" version="4.5.5" />
       </group>
       <group targetFramework="netstandard2.0">
-        <dependency id="DynamicLanguageRuntime" version="1.3.2" />
+        <dependency id="DynamicLanguageRuntime" version="1.3.3" />
         <dependency id="System.Memory" version="4.5.5" />
         <dependency id="System.Text.Encoding.CodePages" version="4.6.0" />
         <dependency id="Microsoft.Win32.Registry" version="4.5.0" />
         <dependency id="Mono.Unix" version="7.1.0-final.1.21458.1" />
       </group>
       <group targetFramework="netcoreapp3.1">
-        <dependency id="DynamicLanguageRuntime" version="1.3.2" />
+        <dependency id="DynamicLanguageRuntime" version="1.3.3" />
         <dependency id="Microsoft.Win32.Registry" version="4.7.0" />
         <dependency id="Mono.Unix" version="7.1.0-final.1.21458.1" />
       </group>
       <group targetFramework="net6.0">
-        <dependency id="DynamicLanguageRuntime" version="1.3.2" />
+        <dependency id="DynamicLanguageRuntime" version="1.3.3" />
         <dependency id="Mono.Unix" version="7.1.0-final.1.21458.1" />
       </group>
     </dependencies>
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ IronPython 3 targets Python 3, including the re-organized standard library, Unic
 | **What?** | **Where?** |
 | --------: | :------------: |
 | **Windows/Linux/macOS Builds** | [![Build status](https://dotnet.visualstudio.com/IronLanguages/_apis/build/status/ironpython3)](https://dotnet.visualstudio.com/IronLanguages/_build/latest?definitionId=43) [![Github build status](https://github.com/IronLanguages/ironpython3/workflows/CI/badge.svg)](https://github.com/IronLanguages/ironpython3/actions?workflow=CI) |
-| **Downloads** | [![NuGet](https://img.shields.io/nuget/vpre/IronPython.svg)](https://www.nuget.org/packages/IronPython/3.4.0-beta1) [![Release](https://img.shields.io/github/release/IronLanguages/ironpython3.svg?include_prereleases)](https://github.com/IronLanguages/ironpython3/releases/latest)|
+| **Downloads** | [![NuGet](https://img.shields.io/nuget/vpre/IronPython.svg)](https://www.nuget.org/packages/IronPython/3.4.0) [![Release](https://img.shields.io/github/release/IronLanguages/ironpython3.svg?include_prereleases)](https://github.com/IronLanguages/ironpython3/releases/latest)|
 | **Help** | [![Gitter chat](https://badges.gitter.im/IronLanguages/ironpython.svg)](https://gitter.im/IronLanguages/ironpython) [![StackExchange](https://img.shields.io/badge/stack%20overflow-ironpython-informational?logo=stack-overflow&logoColor=white)](https://stackoverflow.com/questions/tagged/ironpython) |
 
 
@@ -80,7 +80,7 @@ While compatibility with CPython is one of our main goals with IronPython 3, the
 See the [Package compatibility](Documentation/package-compatibility.md) document for information on compatibility with popular packages.
 
 ## Installation
-Binaries of IronPython 3 can be downloaded from the [release page](https://github.com/IronLanguages/ironpython3/releases/latest), available in various formats: `.msi`, `.zip`, `.deb`, `.pkg`. The IronPython package is also available on [NuGet](https://www.nuget.org/packages/IronPython/3.4.0-beta1).
+Binaries of IronPython 3 can be downloaded from the [release page](https://github.com/IronLanguages/ironpython3/releases/latest), available in various formats: `.msi`, `.zip`, `.deb`, `.pkg`. The IronPython package is also available on [NuGet](https://www.nuget.org/packages/IronPython/3.4.0).
 
 ## Build
 See the [building document](Documentation/building.md). Since the main development is on Windows, bugs on other platforms may inadvertently be introduced - please report them!
diff --git a/Src/DLR b/Src/DLR
@@ -1 +1 @@
-Subproject commit b4b30196c78cee29d92dc870245f83f6e07a75a6
+Subproject commit 4d4dc82e39b5076c384c400773e4d4a1b09b4c15
diff --git a/Src/IronPython.Modules/_ssl.cs b/Src/IronPython.Modules/_ssl.cs
@@ -404,7 +404,11 @@ internal bool CertValidationCallbackRequired(object sender, X509Certificate cert
             }
 
             private void ValidateCertificate(X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors) {
-                Debug.Assert(chain.ChainStatus.Length > 0);
+                if (chain.ChainStatus.Length == 0) {
+                    ValidationError(sslPolicyErrors);
+                    return;
+                }
+
                 foreach (var elem in chain.ChainStatus) {
                     if (elem.Status == X509ChainStatusFlags.UntrustedRoot) {
                         bool isOk = false;
@@ -451,7 +455,12 @@ public void do_handshake() {
                         }
                         _sslStream.AuthenticateAsServer(_cert, _certsMode == PythonSsl.CERT_REQUIRED, enabledSslProtocols, false);
                     } else {
-                        _sslStream.AuthenticateAsClient(server_hostname ?? _socket._hostName ?? string.Empty, context._cert_store, enabledSslProtocols, false);
+                        string hostname = server_hostname ?? _socket._hostName ?? _socket._socket.RemoteEndPoint switch {
+                            System.Net.IPEndPoint ipEP => ipEP.Address.ToString(),
+                            System.Net.DnsEndPoint dnsEP => dnsEP.Host,
+                            _ => string.Empty,
+                        };
+                        _sslStream.AuthenticateAsClient(hostname, context._cert_store, enabledSslProtocols, false);
                     }
                 } catch (AuthenticationException e) {
                     ((IDisposable)_socket._socket).Dispose();
diff --git a/Src/Scripts/Install-IronPython.ps1 b/Src/Scripts/Install-IronPython.ps1
@@ -12,18 +12,18 @@
 
 .EXAMPLE
 
-    PS>Invoke-WebRequest -Uri https://github.com/IronLanguages/ironpython3/releases/download/v3.4.0-beta1/IronPython.3.4.0-beta1.zip -OutFile IronPython.3.4.0-beta1.zip
-    PS>Expand-Archive -Path IronPython.3.4.0-beta1.zip -DestinationPath IronPython-unzipped
-    PS>./IronPython-unzipped/scripts/Install-IronPython -Path ~/ipyenv/v3.4.0-beta1
+    PS>Invoke-WebRequest -Uri https://github.com/IronLanguages/ironpython3/releases/download/v3.4.0/IronPython.3.4.0.zip -OutFile IronPython.3.4.0.zip
+    PS>Expand-Archive -Path IronPython.3.4.0.zip -DestinationPath IronPython-unzipped
+    PS>./IronPython-unzipped/scripts/Install-IronPython -Path ~/ipyenv/v3.4.0
 
-    The official binaries are downloaded from GitHub to the current directory, unzipped, and then the installation proceeds using the script from the unzipped directory. IronPython is installed into ~/ipyenv/v3.4.0-beta1.
+    The official binaries are downloaded from GitHub to the current directory, unzipped, and then the installation proceeds using the script from the unzipped directory. IronPython is installed into ~/ipyenv/v3.4.0.
 
 .EXAMPLE
 
-    PS>Invoke-WebRequest -Uri https://github.com/IronLanguages/ironpython3/releases/download/v3.4.0-beta1/IronPython.3.4.0-beta1.zip -OutFile IronPython.3.4.0-beta1.zip
-    PS>Install-IronPython -Path ~/ipyenv/v3.4.0-beta1 -ZipFile IronPython.3.4.0-beta1.zip -Framework net462 -Force
+    PS>Invoke-WebRequest -Uri https://github.com/IronLanguages/ironpython3/releases/download/v3.4.0/IronPython.3.4.0.zip -OutFile IronPython.3.4.0.zip
+    PS>Install-IronPython -Path ~/ipyenv/v3.4.0 -ZipFile IronPython.3.4.0.zip -Framework net462 -Force
 
-    The official binaries are downloaded from GitHub to the current directory and then the installation proceeds using the downloaded zip file. IronPython is installed into ~/ipyenv/v3.4.0-beta1, overwriting any previous installation in that location. IronPython binaries running on .NET Framework 4.6.2 are used during the installation.
+    The official binaries are downloaded from GitHub to the current directory and then the installation proceeds using the downloaded zip file. IronPython is installed into ~/ipyenv/v3.4.0, overwriting any previous installation in that location. IronPython binaries running on .NET Framework 4.6.2 are used during the installation.
     This example assumes that the installation script is in a directory on the search path ($env:PATH).
 
 .EXAMPLE
diff --git a/Tests/modules/system_related/test_nt.py b/Tests/modules/system_related/test_nt.py
@@ -1007,6 +1007,14 @@ def test_fsync(self):
         nt.close(w)
         nt.close(r)
 
+    def test_ipy3_gh1601_listdir(self):
+        cwd = nt.getcwd()
+        try:
+            nt.chdir("\\")
+            nt.listdir(".")
+        finally:
+            nt.chdir(cwd)
+
 #------------------------------------------------------------------------------
 try:
     run_test(__name__)
diff --git a/Tests/test_httplib_stdlib.py b/Tests/test_httplib_stdlib.py
@@ -9,7 +9,7 @@
 import unittest
 import sys
 
-from iptest import run_test
+from iptest import is_mono, is_osx, run_test
 
 import test.test_httplib
 
@@ -59,7 +59,10 @@ def load_tests(loader, standard_tests, pattern):
         #suite.addTest(test.test_httplib.HTTPSTest('test_local_unknown_cert')) # StackOverflowException
         suite.addTest(unittest.expectedFailure(test.test_httplib.HTTPSTest('test_networked'))) # AttributeError: 'SSLError' object has no attribute 'reason'
         suite.addTest(unittest.expectedFailure(test.test_httplib.HTTPSTest('test_networked_bad_cert'))) # AttributeError: 'SSLError' object has no attribute 'reason'
-        suite.addTest(test.test_httplib.HTTPSTest('test_networked_good_cert'))
+        if is_mono and is_osx:
+            suite.addTest(unittest.expectedFailure(test.test_httplib.HTTPSTest('test_networked_good_cert'))) # https://github.com/IronLanguages/ironpython3/issues/1523
+        else:
+            suite.addTest(test.test_httplib.HTTPSTest('test_networked_good_cert'))
         suite.addTest(test.test_httplib.HTTPSTest('test_networked_noverification'))
         suite.addTest(test.test_httplib.HTTPSTest('test_networked_trusted_by_default_cert'))
         suite.addTest(test.test_httplib.HeaderTests('test_auto_headers'))
diff --git a/Tests/test_ssl_stdlib.py b/Tests/test_ssl_stdlib.py
@@ -68,14 +68,23 @@ def load_tests(loader, standard_tests, pattern):
         suite.addTest(test.test_ssl.NetworkedTests('test_algorithms'))
         suite.addTest(unittest.expectedFailure(test.test_ssl.NetworkedTests('test_ciphers'))) # AssertionError: SSLError not raised
         suite.addTest(unittest.expectedFailure(test.test_ssl.NetworkedTests('test_connect'))) # AssertionError: {} != None
-        suite.addTest(test.test_ssl.NetworkedTests('test_connect_cadata'))
+        if is_mono and is_osx:
+            suite.addTest(unittest.expectedFailure(test.test_ssl.NetworkedTests('test_connect_cadata'))) # # https://github.com/IronLanguages/ironpython3/issues/1523
+        else:
+            suite.addTest(test.test_ssl.NetworkedTests('test_connect_cadata'))
         suite.addTest(unittest.expectedFailure(test.test_ssl.NetworkedTests('test_connect_capath'))) # ssl.SSLError: [Errno 'errors while validating certificate chain: '] RemoteCertificateChainErrors
-        suite.addTest(test.test_ssl.NetworkedTests('test_connect_ex'))
+        if is_mono and is_osx:
+            suite.addTest(unittest.expectedFailure(test.test_ssl.NetworkedTests('test_connect_ex'))) # https://github.com/IronLanguages/ironpython3/issues/1523
+        else:
+            suite.addTest(test.test_ssl.NetworkedTests('test_connect_ex'))
         #suite.addTest(test.test_ssl.NetworkedTests('test_connect_ex_error')) # slow
         suite.addTest(unittest.expectedFailure(test.test_ssl.NetworkedTests('test_connect_with_context'))) # AssertionError: {} != None
         suite.addTest(unittest.expectedFailure(test.test_ssl.NetworkedTests('test_context_setget'))) # AttributeError: can't assign to read-only property context of type '_SSLSocket'
         suite.addTest(unittest.expectedFailure(test.test_ssl.NetworkedTests('test_get_ca_certs_capath'))) # AttributeError: 'SSLContext' object has no attribute 'get_ca_certs'
-        suite.addTest(unittest.expectedFailure(test.test_ssl.NetworkedTests('test_get_server_certificate'))) # ssl.SSLError: [Errno 'errors while validating certificate chain: '] RemoteCertificateNameMismatch, RemoteCertificateChainErrors
+        if is_mono and is_osx:
+            suite.addTest(unittest.expectedFailure(test.test_ssl.NetworkedTests('test_get_server_certificate'))) # https://github.com/IronLanguages/ironpython3/issues/1523
+        else:
+            suite.addTest(test.test_ssl.NetworkedTests('test_get_server_certificate'))
         if is_posix:
             suite.addTest(unittest.expectedFailure(test.test_ssl.NetworkedTests('test_makefile_close'))) # OSError: [Errno 9] Bad file descriptor
         else:
