From 23a4d2a273f70b9412e04cdf2ecfb3c3f3f8ccca Mon Sep 17 00:00:00 2001 From: Denis Akhiyarov Date: Mon, 11 Jun 2018 23:59:51 -0500 Subject: [PATCH 1/4] Update .travis.yml --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 025229d04..900e207a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,10 +22,6 @@ matrix: - dotnet-hostfxr-2.0.0 - dotnet-runtime-2.0.0 - dotnet-sdk-2.0.0 - - python: 3.3 - env: *xplat-env - addons: *xplat-addons - - python: 3.4 env: *xplat-env addons: *xplat-addons @@ -47,9 +43,6 @@ matrix: - BUILD_OPTS= - NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe - - python: 3.3 - env: *classic-env - - python: 3.4 env: *classic-env From 9735f3b77429baaefe30ac76fe4f2e591e039e5b Mon Sep 17 00:00:00 2001 From: Denis Akhiyarov Date: Tue, 12 Jun 2018 00:02:57 -0500 Subject: [PATCH 2/4] Update appveyor.yml --- appveyor.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9fd2b1f0e..6bebef490 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,8 +17,6 @@ environment: matrix: - PYTHON_VERSION: 2.7 BUILD_OPTS: --xplat - - PYTHON_VERSION: 3.3 - BUILD_OPTS: --xplat - PYTHON_VERSION: 3.4 BUILD_OPTS: --xplat - PYTHON_VERSION: 3.5 @@ -26,7 +24,6 @@ environment: - PYTHON_VERSION: 3.6 BUILD_OPTS: --xplat - PYTHON_VERSION: 2.7 - - PYTHON_VERSION: 3.3 - PYTHON_VERSION: 3.4 - PYTHON_VERSION: 3.5 - PYTHON_VERSION: 3.6 From db0d6346115c330aeea8622cb8e793194df1eca5 Mon Sep 17 00:00:00 2001 From: Denis Akhiyarov Date: Tue, 12 Jun 2018 00:07:28 -0500 Subject: [PATCH 3/4] Delete interop33.cs --- src/runtime/interop33.cs | 143 --------------------------------------- 1 file changed, 143 deletions(-) delete mode 100644 src/runtime/interop33.cs diff --git a/src/runtime/interop33.cs b/src/runtime/interop33.cs deleted file mode 100644 index f684df6c6..000000000 --- a/src/runtime/interop33.cs +++ /dev/null @@ -1,143 +0,0 @@ -// Auto-generated by geninterop.py. -// DO NOT MODIFIY BY HAND. - - -#if PYTHON33 -using System; -using System.Collections; -using System.Collections.Specialized; -using System.Runtime.InteropServices; -using System.Reflection; -using System.Text; - -namespace Python.Runtime -{ - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - internal class TypeOffset - { - static TypeOffset() - { - Type type = typeof(TypeOffset); - FieldInfo[] fi = type.GetFields(); - int size = IntPtr.Size; - for (int i = 0; i < fi.Length; i++) - { - fi[i].SetValue(null, i * size); - } - } - - public static int magic() - { - return ob_size; - } - - // Auto-generated from PyHeapTypeObject in Python.h - public static int ob_refcnt = 0; - public static int ob_type = 0; - public static int ob_size = 0; - public static int tp_name = 0; - public static int tp_basicsize = 0; - public static int tp_itemsize = 0; - public static int tp_dealloc = 0; - public static int tp_print = 0; - public static int tp_getattr = 0; - public static int tp_setattr = 0; - public static int tp_reserved = 0; - public static int tp_repr = 0; - public static int tp_as_number = 0; - public static int tp_as_sequence = 0; - public static int tp_as_mapping = 0; - public static int tp_hash = 0; - public static int tp_call = 0; - public static int tp_str = 0; - public static int tp_getattro = 0; - public static int tp_setattro = 0; - public static int tp_as_buffer = 0; - public static int tp_flags = 0; - public static int tp_doc = 0; - public static int tp_traverse = 0; - public static int tp_clear = 0; - public static int tp_richcompare = 0; - public static int tp_weaklistoffset = 0; - public static int tp_iter = 0; - public static int tp_iternext = 0; - public static int tp_methods = 0; - public static int tp_members = 0; - public static int tp_getset = 0; - public static int tp_base = 0; - public static int tp_dict = 0; - public static int tp_descr_get = 0; - public static int tp_descr_set = 0; - public static int tp_dictoffset = 0; - public static int tp_init = 0; - public static int tp_alloc = 0; - public static int tp_new = 0; - public static int tp_free = 0; - public static int tp_is_gc = 0; - public static int tp_bases = 0; - public static int tp_mro = 0; - public static int tp_cache = 0; - public static int tp_subclasses = 0; - public static int tp_weaklist = 0; - public static int tp_del = 0; - public static int tp_version_tag = 0; - public static int nb_add = 0; - public static int nb_subtract = 0; - public static int nb_multiply = 0; - public static int nb_remainder = 0; - public static int nb_divmod = 0; - public static int nb_power = 0; - public static int nb_negative = 0; - public static int nb_positive = 0; - public static int nb_absolute = 0; - public static int nb_bool = 0; - public static int nb_invert = 0; - public static int nb_lshift = 0; - public static int nb_rshift = 0; - public static int nb_and = 0; - public static int nb_xor = 0; - public static int nb_or = 0; - public static int nb_int = 0; - public static int nb_reserved = 0; - public static int nb_float = 0; - public static int nb_inplace_add = 0; - public static int nb_inplace_subtract = 0; - public static int nb_inplace_multiply = 0; - public static int nb_inplace_remainder = 0; - public static int nb_inplace_power = 0; - public static int nb_inplace_lshift = 0; - public static int nb_inplace_rshift = 0; - public static int nb_inplace_and = 0; - public static int nb_inplace_xor = 0; - public static int nb_inplace_or = 0; - public static int nb_floor_divide = 0; - public static int nb_true_divide = 0; - public static int nb_inplace_floor_divide = 0; - public static int nb_inplace_true_divide = 0; - public static int nb_index = 0; - public static int mp_length = 0; - public static int mp_subscript = 0; - public static int mp_ass_subscript = 0; - public static int sq_length = 0; - public static int sq_concat = 0; - public static int sq_repeat = 0; - public static int sq_item = 0; - public static int was_sq_slice = 0; - public static int sq_ass_item = 0; - public static int was_sq_ass_slice = 0; - public static int sq_contains = 0; - public static int sq_inplace_concat = 0; - public static int sq_inplace_repeat = 0; - public static int bf_getbuffer = 0; - public static int bf_releasebuffer = 0; - public static int name = 0; - public static int ht_slots = 0; - public static int qualname = 0; - public static int ht_cached_keys = 0; - - /* here are optional user slots, followed by the members. */ - public static int members = 0; - } -} - -#endif From 94af5509958cf3a3545d27942f2f4d2ce594fec7 Mon Sep 17 00:00:00 2001 From: Denis Akhiyarov Date: Tue, 12 Jun 2018 00:09:37 -0500 Subject: [PATCH 4/4] Update runtime.cs --- src/runtime/runtime.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs index abd0661a4..b08a56622 100644 --- a/src/runtime/runtime.cs +++ b/src/runtime/runtime.cs @@ -139,9 +139,6 @@ public class Runtime #if PYTHON27 internal const string _pyversion = "2.7"; internal const string _pyver = "27"; -#elif PYTHON33 - internal const string _pyversion = "3.3"; - internal const string _pyver = "33"; #elif PYTHON34 internal const string _pyversion = "3.4"; internal const string _pyver = "34"; @@ -155,7 +152,7 @@ public class Runtime internal const string _pyversion = "3.7"; internal const string _pyver = "37"; #else -#error You must define one of PYTHON33 to PYTHON37 or PYTHON27 +#error You must define one of PYTHON34 to PYTHON37 or PYTHON27 #endif #if MONO_LINUX || MONO_OSX // Linux/macOS use dotted version string