Skip to content

[#217,#218] Remove Python 2 support code, implement proper thread state handling (4-3-stable) #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alanking merged 2 commits into from
Aug 22, 2024
Merged

[#217,#218] Remove Python 2 support code, implement proper thread state handling (4-3-stable) #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4670d26
[#217] Remove Python 2 support code
SwooshyCueb Aug 12, 2024
94fbb04
[#218] Proper python multithreading
SwooshyCueb Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,11 @@ if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
message(STATUS "Setting unspecified CMAKE_BUILD_TYPE to '${CMAKE_BUILD_TYPE}'")
endif()

if (NOT IRODS_PYTHON_VERSION)
set(IRODS_PYTHON_VERSION "3" CACHE STRING "The version of python to link against" FORCE)
message(STATUS "Setting unspecified IRODS_PYTHON_VERSION to '${IRODS_PYTHON_VERSION}'. This is the correct setting for normal builds.")
endif()

find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL)
find_package(nlohmann_json "3.6.1" REQUIRED)
find_package(fmt "8.1.1"
HINTS "${IRODS_EXTERNALS_FULLPATH_FMT}")
find_package(Python "${IRODS_PYTHON_VERSION}" REQUIRED COMPONENTS Development)
find_package(Python 3 REQUIRED COMPONENTS Development)

set(
PLUGIN
Expand Down
7 changes: 1 addition & 6 deletions include/irods/private/re/python/irods_errors.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@
// include this first to fix macro redef warnings
#include <pyconfig.h>

#include <patchlevel.h>
#include <Python.h>

#if PY_VERSION_HEX < 0x03000000
extern "C" void initirods_errors();
#else
# include <Python.h>
extern "C" PyObject* PyInit_irods_errors();
#endif

#endif // RE_PYTHON_IRODS_ERRORS_HPP
7 changes: 2 additions & 5 deletions include/irods/private/re/python/irods_types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,9 @@

#include "irods/private/re/python/types/type_sequence.hpp"

#if PY_VERSION_HEX < 0x03000000
extern "C" void initirods_types();
#else
# include <Python.h>
#include <Python.h>

extern "C" PyObject* PyInit_irods_types();
#endif

void init_irods_types();

Expand Down
Loading