Skip to content

Commit

Permalink
Updated minimal version of py_tools_ds which fixes #49 (Deadlock in M…
Browse files Browse the repository at this point in the history
…ultiprocessing on Linux, in case GDAL 3.2.1 is installed.).

Signed-off-by: Daniel Scheffler <[email protected]>
  • Loading branch information
danschef committed Jun 22, 2021
1 parent 3f6ab5d commit ce1c92a
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion arosics/Tie_Point_Grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ def get_CoRegPoints_table(self):
bar.print_progress(percent=numberDone / len(GDF) * 100)
if results.ready():
# <= this is the line where multiprocessing can freeze if an exception appears within
# COREG ans is not raised
# COREG and is not raised
results = results.get()
break

Expand Down
4 changes: 2 additions & 2 deletions arosics/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
# with this program. If not, see <http://www.gnu.org/licenses/>.


__version__ = '1.4.5'
__versionalias__ = '2021-05-21_01'
__version__ = '1.4.6'
__versionalias__ = '2021-05-22_01'
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ plotly
pyfftw
pykrige
pyproj>2.2.0
py_tools_ds>=0.17.0
py_tools_ds>=0.17.2
scikit-image>=0.16.0
shapely
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
'pyfftw',
'pykrige',
'pyproj>2.2.0',
'py_tools_ds>=0.17.0',
'py_tools_ds>=0.17.2',
'scikit-image>=0.16.0',
'shapely',
]
Expand Down
2 changes: 1 addition & 1 deletion tests/CI_docker/context/environment_arosics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies:
- pyfftw
- pykrige
- pyproj>2.2.0
- py-tools-ds>=0.17.0
- py-tools-ds>=0.17.2
- scikit-image>=0.16.0
- shapely

Expand Down

0 comments on commit ce1c92a

Please sign in to comment.