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

Jump to bottom

Fixed build for Python 3.12 and added to CI #126

Closed
wants to merge 1 commit into from
Closed

Fixed build for Python 3.12 and added to CI #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 23 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ jobs:
# used by .ci/build-deps.sh for Make builds
BRBASE: ${{ matrix.base }}
BRPVXS: ${{ matrix.pvxs }}
# cf. https://github.com/numpy/numpy/issues/22623
SETUPTOOLS_USE_DISTUTILS: stdlib
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -113,6 +111,14 @@ jobs:
cython: Cython==0.29.35
skip_cothread: yes

- name: linux 3.12 amd64
os: ubuntu-latest
pyver: cp312-cp312
piparch: manylinux2014_x86_64
numpy: numpy==1.26.1
cython: Cython==0.29.36
skip_cothread: yes

# Linux py builds x64
- name: linux 2.7 i686
os: ubuntu-latest
Expand Down Expand Up @@ -216,6 +222,14 @@ jobs:
cython: Cython==0.29.35
skip_cothread: yes

- name: osx 3.12 intel
os: macos-latest
python: "3.12"
piparch: macosx_10_9_intel
numpy: numpy==1.26.1
cython: Cython==0.29.36
skip_cothread: yes

# Windows py builds

## missing Microsoft Visual C++ 9.0
Expand Down Expand Up @@ -272,6 +286,13 @@ jobs:
profile: latest
skip_cothread: yes

- name: win64 3.12
os: windows-latest
python: "3.12"
piparch: win_amd64
profile: latest
skip_cothread: yes

steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -360,7 +381,6 @@ jobs:
python -m pip install p4p*.whl
python -m ci_core_dumper exec python -m nose2 -v p4p


- name: Docker PY build
if: matrix.pyver && !matrix.base && !matrix.source
run: |
Expand All @@ -372,7 +392,6 @@ jobs:
[ -d dist ]
ls dist/*
export PATH="/opt/python/${{ matrix.pyver }}/bin:\$PATH"
export SETUPTOOLS_USE_DISTUTILS=stdlib
which python
python -m pip install -U pip
python -m pip install setuptools wheel nose2
Expand Down
11 changes: 8 additions & 3 deletions makehelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,16 @@

have_np='NO'
try:
from numpy.distutils.misc_util import get_numpy_include_dirs
incdirs = get_numpy_include_dirs()+incdirs
from numpy import get_include
incdirs.append(get_include())
have_np='YES'
except ImportError:
pass
try:
from numpy.distutils.misc_util import get_numpy_include_dirs
incdirs = get_numpy_include_dirs()+incdirs
have_np='YES'
except ImportError:
pass

print('TARGET_CFLAGS +=',get_config_var('BASECFLAGS'), file=out)
print('TARGET_CXXFLAGS +=',get_config_var('BASECFLAGS'), file=out)
Expand Down
16 changes: 13 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,17 @@
from setuptools_dso import Extension, setup, cythonize

import numpy
from numpy.distutils.misc_util import get_numpy_include_dirs

numpy_include_dirs = []
try:
# For numpy >1.23.0 in python 3.12
from numpy import get_include
numpy_include_dirs = [get_include()]
except ImportError:
from numpy.distutils.misc_util import get_numpy_include_dirs
numpy_include_dirs = get_numpy_include_dirs()



import epicscorelibs.path
import epicscorelibs.version
Expand Down Expand Up @@ -56,7 +66,7 @@
"src/pvxs_type.cpp",
"src/pvxs_value.cpp",
],
include_dirs = get_numpy_include_dirs()+[epicscorelibs.path.include_path, pvxslibs.path.include_path, 'src', 'src/p4p'],
include_dirs = numpy_include_dirs + [epicscorelibs.path.include_path, pvxslibs.path.include_path, 'src', 'src/p4p'],
define_macros = cppflags + [
('PY_ARRAY_UNIQUE_SYMBOL', 'PVXS_PyArray_API'),
('PVXS_ENABLE_EXPERT_API', None),
Expand All @@ -75,7 +85,7 @@
'src/pvxs_gw.cpp',
'src/pvxs_odometer.cpp'
],
include_dirs = get_numpy_include_dirs()+[epicscorelibs.path.include_path, pvxslibs.path.include_path, 'src', 'src/p4p'],
include_dirs = numpy_include_dirs + [epicscorelibs.path.include_path, pvxslibs.path.include_path, 'src', 'src/p4p'],
define_macros = cppflags + [('PVXS_ENABLE_EXPERT_API', None)],
extra_compile_args = get_config_var('CXXFLAGS')+cxxflags,
extra_link_args = get_config_var('LDFLAGS')+ldflags,
Expand Down