Skip to content

Commit 806b08f

Browse files
author
samuel.oranyeli
committed
move cond_join.py to different folder
1 parent 02b8901 commit 806b08f

File tree

4 files changed

+34
-27
lines changed

4 files changed

+34
-27
lines changed

janitor/functions/conditional_join/equi_join.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import pandas as pd
55
from pandas.core.reshape.merge import _MergeOperation
66

7-
from janitor.cython_functions import cond_join
7+
from janitor.cython_functions.source_files import cond_join
88

99
from . import helpers
1010
from .multiple_conditional_join_le_lt import _multiple_conditional_join_le_lt

janitor/functions/conditional_join/helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import numpy as np
66
import pandas as pd
77

8-
from janitor.cython_functions import cond_join
8+
from janitor.cython_functions.source_files import cond_join
99

1010

1111
class _JoinOperator(Enum):

setup.py

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
from setuptools import Extension, find_packages, setup
1010

11-
try:
12-
from Cython.Build import cythonize
11+
# try:
12+
# from Cython.Build import cythonize
1313

14-
USE_CYTHON = True
15-
except ImportError:
16-
USE_CYTHON = False
14+
# USE_CYTHON = True
15+
# except ImportError:
16+
# USE_CYTHON = False
1717

1818
HERE = os.path.abspath(os.path.dirname(__file__))
1919

@@ -122,25 +122,25 @@ def generate_long_description() -> str:
122122
return long_description
123123

124124

125-
if USE_CYTHON:
126-
ext_modules = [
127-
Extension(
128-
name="janitor.cython_functions.cond_join",
129-
sources=[
130-
"./janitor/cython_functions/cond_join.py",
131-
],
132-
)
133-
]
134-
ext_modules = cythonize(ext_modules)
135-
else:
136-
ext_modules = [
137-
Extension(
138-
name="janitor.cython_functions.cond_join",
139-
sources=[
140-
"./janitor/cython_functions/cond_join.c",
141-
],
142-
)
143-
]
125+
# if USE_CYTHON:
126+
# ext_modules = [
127+
# Extension(
128+
# name="janitor.cython_functions.cond_join",
129+
# sources=[
130+
# "./janitor/cython_functions/cond_join.py",
131+
# ],
132+
# )
133+
# ]
134+
# ext_modules = cythonize(ext_modules)
135+
# else:
136+
# ext_modules = [
137+
# Extension(
138+
# name="janitor.cython_functions.cond_join",
139+
# sources=[
140+
# "./janitor/cython_functions/cond_join.c",
141+
# ],
142+
# )
143+
# ]
144144

145145
setup(
146146
name="pyjanitor",
@@ -157,5 +157,12 @@ def generate_long_description() -> str:
157157
python_requires=">=3.9",
158158
long_description=generate_long_description(),
159159
long_description_content_type="text/markdown",
160-
ext_modules=ext_modules,
160+
ext_modules=[
161+
Extension(
162+
name="janitor.cython_functions.cond_join",
163+
sources=[
164+
"./janitor/cython_functions/cond_join.c",
165+
],
166+
)
167+
],
161168
)

0 commit comments

Comments
 (0)