Skip to content

Commit

Permalink
Merge branch 'main' into release/0.52
Browse files Browse the repository at this point in the history
  • Loading branch information
akaszynski committed May 7, 2023
2 parents 03f21c3 + ee6d3e1 commit 62e1e99
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/testing-and-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ jobs:
- uses: actions/checkout@v3

- name: Build wheels
uses: pypa/[email protected].1
uses: pypa/[email protected].3
with:
python-version: 3.7 - 3.11

Expand Down
20 changes: 10 additions & 10 deletions ansys/mapdl/reader/cython/_archive.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,16 @@ def py_write_nblock_float(filename, const int [::1] node_id, int max_node_id,


def py_write_eblock(filename,
int [::1] elem_id,
int [::1] etype,
int [::1] mtype,
int [::1] rcon,
int [::1] elem_nnodes,
int64_t [::1] cells,
int64_t [::1] offset,
uint8_t [::1] celltypes,
int [::1] typenum,
int [::1] nodenum,
const int [::1] elem_id,
const int [::1] etype,
const int [::1] mtype,
const int [::1] rcon,
const int [::1] elem_nnodes,
const int64_t [::1] cells,
const int64_t [::1] offset,
const uint8_t [::1] celltypes,
const int [::1] typenum,
const int [::1] nodenum,
mode='w'):
cdef FILE* cfile = fopen(filename.encode(), mode.encode())
write_eblock(cfile,
Expand Down
2 changes: 1 addition & 1 deletion ansys/mapdl/reader/cython/_binary_reader.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ cdef np.ndarray wrap_array(void* c_ptr, int size, int type_flag, int prec_flag):
ndarray = np.array(array_wrapper, copy=False)

# Assign our object to the 'base' of the ndarray object
ndarray.base = <PyObject*> array_wrapper
np.PyArray_SetBaseObject(ndarray, array_wrapper)

# Increment the reference count, as the above assignment was done in
# C, and Python does not know that there is this additional reference
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build-system]
build-backend = "setuptools.build_meta"
requires = [
"cython<3.0.0",
"cython==3.0.0b2",
"oldest-supported-numpy",
"setuptools>=45.0",
"wheel>=0.37.0",
Expand Down
7 changes: 4 additions & 3 deletions requirements/requirements_docs.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
Sphinx<6
ansys-sphinx-theme==0.9.7
Sphinx<7
ansys-sphinx-theme==0.9.8
imageio==2.28.1
notfound==1.0.2
pypandoc==1.11
pyvista==0.38.5
pyvista==0.39.0
sphinx-copybutton==0.5.2
sphinx-gallery==0.13.0
sphinx-notfound-page==0.8.3
Expand Down

0 comments on commit 62e1e99

Please sign in to comment.