Skip to content
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

remove direct imports of numpy in setup.py #20

Closed
wants to merge 3 commits into from
Closed

remove direct imports of numpy in setup.py #20

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
395de1c
remove direct imports of numpy in setup.py
Jul 20, 2022
389c5d4
bdist_wheel build fails with Python 3.0
ecederstrand Aug 15, 2023
2983ff1
Merge pull request #1 from ecederstrand/patch-1-1
EmiliaW Aug 15, 2023
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
16 changes: 5 additions & 11 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ def ext_modules():
if java_home is None:
raise Exception("JVM not found")
jdk_home = find_jdk()
from numpy import get_include
include_dirs = [get_include()] + get_jvm_include_dirs()
libraries = None
library_dirs = None
javabridge_sources = ['_javabridge.c']
Expand Down Expand Up @@ -146,7 +144,6 @@ def ext_modules():
sources=javabridge_sources,
libraries=libraries,
library_dirs=library_dirs,
include_dirs=include_dirs,
extra_link_args=extra_link_args)
if not is_win:
extension_kwargs["runtime_library_dirs"] =library_dirs
Expand Down Expand Up @@ -178,14 +175,11 @@ class build_ext(_build_ext):
java2cpython_sources = ["java/org_cellprofiler_javabridge_CPython.c"]

def initialize_options(self):
from numpy import get_include
_build_ext.initialize_options(self)
if self.include_dirs is None:
self.include_dirs = get_include()
else:
self.include_dirs += get_include()

def run(self, *args, **kwargs):
from numpy import get_include
self.include_dirs += ([get_include()] + get_jvm_include_dirs())
self.build_java()
result = build_cython()
if self.inplace:
Expand Down Expand Up @@ -389,6 +383,7 @@ def get_version():
high-level API. Python-javabridge was developed for and is used by the
cell image analysis software CellProfiler (cellprofiler.org).''',
url="http://github.com/CellProfiler/python-javabridge/",
cmdclass={'build_ext': build_ext},
packages=['javabridge', 'javabridge.tests'],
classifiers=['Development Status :: 5 - Production/Stable',
'License :: OSI Approved :: BSD License',
Expand All @@ -398,7 +393,7 @@ def get_version():
],
license='BSD License',
setup_requires=[
'Cython>=0.29.16',
'Cython>=0.29.16,<3.0',
'numpy>=1.20.1',
],
install_requires=[
Expand All @@ -409,7 +404,6 @@ def get_version():
'javabridge = javabridge.noseplugin:JavabridgePlugin'
]},
test_suite="nose.collector",
ext_modules=ext_modules(),
package_data={"javabridge": [
'jars/*.jar', 'jars/*%s' % SO, 'VERSION']},
cmdclass={'build_ext': build_ext})
ext_modules=ext_modules())