Skip to content

Commit fdbaad3

Browse files
authored
Conda upd for python 3.8 (#95)
* Update to p.q logic for handling sys.argv * reintroduction of old logic * addition of initial sys argv and embedpy version check * Update to allow install on python 3.8 * update to py.h to account for python 3.8 api update, change to conda-recipe to account unavailability of appropriate tensorflow on windows 3.8
1 parent f74d7db commit fdbaad3

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

conda-recipe/prep_requirements.q

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/ exclude packages from tests/requirements.txt based on python major minor version
22
\l p.q
3-
pexclude:select py37:enlist"tensorflow*" from (0#`)!()
3+
pexclude:select py37:enlist"tensorflow*",py38:enlist"tensorflow*" from (0#`)!()
44
pver:`$"py",raze string .p.import[`sys;`:version_info][;`]each`:major`:minor
55
`:tests/requirements_filtered.txt 0:u where not any(u:read0`:tests/requirements.txt)like/:pexclude pver
66
\\

py.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ typedef struct _p _p,*P;struct _p{L r;P t;L n;union{P*p;P v[1];};};typedef struc
5555
X(P,Py_CompileString,(S,S,I))\
5656
X(P,PyCapsule_New,(V*,S,V*))\
5757
X(V*,PyCapsule_GetPointer,(P,S))\
58-
X(P,PyCFunction_New,(D*,P))\
58+
X(P,PyCFunction_NewEx,(D*,P,P))\
5959
X(_p,_Py_TrueStruct,)\
6060
X(_p,_Py_FalseStruct,)\
6161
X(_p,_Py_NoneStruct,)\
@@ -86,6 +86,8 @@ typedef struct _p _p,*P;struct _p{L r;P t;L n;union{P*p;P v[1];};};typedef struc
8686
X(P,PyDict_Values,(P))\
8787

8888
//https://docs.scipy.org/doc/numpy/reference/c-api.html https://github.com/numpy/numpy/blob/master/numpy/core/code_generators/numpy_api.py
89+
#undef PyCFunction_New
90+
#define PyCFunction_New(x,y) PyCFunction_NewEx(x,y,NULL)
8991
#define NF \
9092
X(_p,PyArray_Type,,2)\
9193
X(_p,PyGenericArrType_Type,,10)\

0 commit comments

Comments
 (0)