MNT: make enums use python Enum class and updated Q_ENUM (no 's')

MNT: make enums use python Enum class and updated Q_ENUM (no 's') #660