ENH: Drop Py2 (#150)

Author: gerrymanoim

.github/workflows/main.yml

@@ -16,14 +16,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-18.04, macos-10.15]
-        python-version: [2.7, 3.5, 3.6, 3.8]
+        python-version: [3.5, 3.6, 3.8]
         compiler: [gcc, clang]
         exclude:
           - os: macos-10.15
             compiler: gcc
         include:
-          - python-version: 2.7
-            numpy: 1.11.3
           - python-version: 3.5
             numpy: 1.11.3
           - python-version: 3.6

include/libpy/any.h

@@ -587,7 +587,6 @@ struct to_object<py::any_cref> {
 };
 }  // namespace dispatch
 
-
 namespace detail {
 template<std::size_t max_size, typename T>
 struct make_string_vtable_impl;
@@ -601,7 +600,7 @@ struct make_string_vtable_impl<max_size, std::index_sequence<head, tail...>> {
         default:
             return make_string_vtable_impl<max_size, std::index_sequence<tail...>>::f(
                 size);
-    }
+        }
     }
 };
 
@@ -626,8 +625,7 @@ inline any_vtable make_string_vtable(int size) {
     @param dtype The runtime numpy dtype.
     @return The any_vtable that corresponds to the given dtype.
  */
-inline any_vtable
-dtype_to_vtable(py::borrowed_ref<PyArray_Descr> dtype) {
+inline any_vtable dtype_to_vtable(py::borrowed_ref<PyArray_Descr> dtype) {
     switch (dtype->type_num) {
     case NPY_BOOL:
         return any_vtable::make<py_bool>();

include/libpy/any_vector.h

@@ -155,8 +155,8 @@ class any_vector {
         std::byte* addr = buf + pos_to_index(ix);
         using raw = py::meta::remove_cvref<T>;
         if constexpr (std::is_same_v<raw, any_ref> || std::is_same_v<raw, any_cref>) {
-                construct(addr, value.addr());
-            }
+            construct(addr, value.addr());
+        }
         else {
             construct(addr, std::addressof(value));
         }
@@ -302,8 +302,7 @@ class any_vector {
         : m_vtable(vtable),
           m_storage(vtable.default_construct_alloc(count)),
           m_size(count),
-          m_capacity(count) {
-    }
+          m_capacity(count) {}
 
 private:
     template<typename T>
@@ -611,7 +610,6 @@ class any_vector {
     }
 };
 
-
 inline owned_ref<> move_to_numpy_array(py::any_vector&& values) {
 
     auto descr = values.vtable().new_dtype();

include/libpy/autoclass.h

@@ -11,7 +11,6 @@
 #include "libpy/demangle.h"
 #include "libpy/detail/autoclass_cache.h"
 #include "libpy/detail/autoclass_object.h"
-#include "libpy/detail/autoclass_py2.h"
 #include "libpy/detail/python.h"
 #include "libpy/meta.h"
 #include "libpy/scope_guard.h"
@@ -32,6 +31,7 @@ constexpr void zero_non_pyobject_base(T* b) {
 }
 
 namespace detail {
+
 template<typename T>
 constexpr void nop_clear_base(T*) {}
 }  // namespace detail
@@ -320,7 +320,7 @@ class autoclass_impl {
         @return The `tp_flags` to use for this autoclass generated type.
      */
     static unsigned int flags(int extra_flags, py::borrowed_ref<PyTypeObject> base_type) {
-        unsigned int out = detail::autoclass_base_flags;
+        unsigned int out = Py_TPFLAGS_DEFAULT;
         out |= extra_flags;
         if (base_type && base_type->tp_flags & Py_TPFLAGS_HAVE_GC) {
             out |= Py_TPFLAGS_HAVE_GC;
@@ -1237,11 +1237,8 @@ class autoclass_impl {
                 std::stringstream s;
                 s << unbox(self);
                 std::string data = s.str();
-#if PY_MAJOR_VERSION == 2
-                return PyString_FromStringAndSize(data.data(), data.size());
-#else
+
                 return PyUnicode_FromStringAndSize(data.data(), data.size());
-#endif
             }
             catch (const std::exception& e) {
                 return raise_from_cxx_exception(e);
@@ -1265,11 +1262,8 @@ class autoclass_impl {
             try {
                 auto res = std::invoke(impl, unbox(self));
                 std::string data(std::begin(res), std::end(res));
-#if PY_MAJOR_VERSION == 2
-                return PyString_FromStringAndSize(data.data(), data.size());
-#else
+
                 return PyUnicode_FromStringAndSize(data.data(), data.size());
-#endif
             }
             catch (const std::exception& e) {
                 return raise_from_cxx_exception(e);

include/libpy/datetime64.h

@@ -423,8 +423,7 @@ write(char* data, char* end, std::ptrdiff_t& ix, char c, std::int64_t count) {
     return {};
 }
 
-inline no_discard_errc
-write(char* data, char* end, std::ptrdiff_t& ix, std::int64_t v) {
+inline no_discard_errc write(char* data, char* end, std::ptrdiff_t& ix, std::int64_t v) {
 #if defined(_LIBCPP_VERSION)
     // XXX: workaround for a bug in libc++ which adds unnecessary leading 0s to
     // 64 bit integers with 9, 10, or 11 digits.
@@ -498,7 +497,8 @@ to_chars(char* first, char* last, const datetime64<unit>& dt, bool compress = fa
         return detail::formatting::write(first, last, ix, args...);
     };
 
-    auto zero_pad = [&](int expected_digits, std::int64_t value) -> detail::no_discard_errc {
+    auto zero_pad = [&](int expected_digits,
+                        std::int64_t value) -> detail::no_discard_errc {
         std::int64_t digits = std::floor(std::log10(value));
         digits += 1;
         if (expected_digits > digits) {
@@ -596,8 +596,7 @@ to_chars(char* first, char* last, const datetime64<unit>& dt, bool compress = fa
             return finalize(ec);
         }
         std::int64_t expected_digits = std::log10(unit::period::den);
-        if (auto ec = zero_pad(expected_digits, fractional_seconds);
-            ec != std::errc{}) {
+        if (auto ec = zero_pad(expected_digits, fractional_seconds); ec != std::errc{}) {
             return finalize(ec);
         }
         if (auto ec = write(fractional_seconds); ec != std::errc{}) {

include/libpy/detail/autoclass_py2.h

@@ -53,5 +53,5 @@
 #endif
 #endif
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#include "libpy/detail/python.h"  // include this before numpy to silence warnings in py2
+#include "libpy/detail/python.h"
 #include <numpy/arrayobject.h>

include/libpy/detail/numpy.h

@@ -1,9 +1,6 @@
 #pragma once
 
-// This triggers a warning in Python 2, add a standard place to find this header that
-// doesn't trigger this warning.
-#if PY_MAJOR_VERSION == 2
-#undef _POSIX_C_SOURCE
-#undef _XOPEN_SOURCE
-#endif
+// NOTE: This is a relic of supporting both py2 and py3, but this provides
+// A standard place to find this header and make python version dependent
+// modifications if necessary.
 #include <Python.h>

include/libpy/detail/python.h

@@ -143,8 +143,7 @@ struct nwise_nddevirtualize {
     template<typename F, typename E>
     void for_each_with_ix_helper(F&& f, const std::vector<E>& entries) const {
         for (const auto& [views, ix] : entries) {
-          std::apply([&, &ix = ix](const auto &... args) { f(ix, args...); },
-                     views);
+            std::apply([&, &ix = ix](const auto&... args) { f(ix, args...); }, views);
         }
     }
 

include/libpy/devirtualize.h

@@ -304,27 +304,13 @@ struct int_from_object {
     static T f(py::borrowed_ref<> value) {
         wide_type wide;
 
-#if PY_MAJOR_VERSION == 2
-        if (PyInt_Check(value.get())) {
-            if constexpr (std::is_signed_v<T>) {
-                wide = PyInt_AS_LONG(value.get());
-            }
-            else {
-                wide = static_cast<wide_type>(PyInt_AS_LONG(value.get()));
-            }
+        // convert the object to the widest type for the given signedness
+        if constexpr (std::is_signed_v<T>) {
+            wide = PyLong_AsLongLong(value.get());
         }
         else {
-#endif
-            // convert the object to the widest type for the given signedness
-            if constexpr (std::is_signed_v<T>) {
-                wide = PyLong_AsLongLong(value.get());
-            }
-            else {
-                wide = PyLong_AsUnsignedLongLong(value.get());
-            }
-#if PY_MAJOR_VERSION == 2
+            wide = PyLong_AsUnsignedLongLong(value.get());
         }
-#endif
 
         // check if `value` would overflow `wide_type`
         if (PyErr_Occurred()) {