Skip to content

Commit

Permalink
Merge branch 'main' into agoose77/perf-improve-array-init
Browse files Browse the repository at this point in the history
  • Loading branch information
jpivarski authored Sep 14, 2022
2 parents aeee1f3 + 77b06b3 commit 241cb2e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ jobs:
with:
submodules: true

- uses: pypa/cibuildwheel@v2.9.0
- uses: pypa/cibuildwheel@v2.10.0
env:
CIBW_ARCHS_MACOS: universal2
CIBW_BUILD: cp39-win_amd64 cp37-manylinux_x86_64 cp38-macosx_universal2

- uses: pypa/cibuildwheel@v2.9.0
- uses: pypa/cibuildwheel@v2.10.0
if: matrix.os == 'ubuntu-latest'
env:
CIBW_BUILD: cp311-manylinux_x86_64
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
with:
submodules: true

- uses: pypa/cibuildwheel@v2.9.0
- uses: pypa/cibuildwheel@v2.10.0
env:
CIBW_BUILD: ${{ matrix.build }}
CIBW_ARCHS: ${{ matrix.arch }}
Expand All @@ -79,7 +79,7 @@ jobs:

- uses: docker/[email protected]

- uses: pypa/cibuildwheel@v2.9.0
- uses: pypa/cibuildwheel@v2.10.0
env:
CIBW_BUILD: cp${{ matrix.python }}-*
CIBW_ARCHS: ${{ matrix.arch }}
Expand Down
6 changes: 4 additions & 2 deletions src/awkward/_v2/highlevel.py
Original file line number Diff line number Diff line change
Expand Up @@ -1423,7 +1423,8 @@ def __copy__(self):

def __deepcopy__(self, memo):
return Array(
copy.deepcopy(self._layout, memo), behavior=copy.deepcopy(self._behavior)
copy.deepcopy(self._layout, memo),
behavior=copy.deepcopy(self._behavior, memo),
)

def __bool__(self):
Expand Down Expand Up @@ -2053,7 +2054,8 @@ def __copy__(self):

def __deepcopy__(self, memo):
return Record(
copy.deepcopy(self._layout, memo), behavior=copy.deepcopy(self._behavior)
copy.deepcopy(self._layout, memo),
behavior=copy.deepcopy(self._behavior, memo),
)

def __bool__(self):
Expand Down

0 comments on commit 241cb2e

Please sign in to comment.