diff --git a/.github/workflows/pyinstaller_win.yml b/.github/workflows/pyinstaller_win.yml index a018d369..27d8c4b5 100644 --- a/.github/workflows/pyinstaller_win.yml +++ b/.github/workflows/pyinstaller_win.yml @@ -40,11 +40,10 @@ jobs: path: "fred" - name: Download fred from the Github Release - uses: i3h/download-release-asset@v1.2.0 + uses: dsaltares/fetch-gh-release-asset@1.1.0 with: - owner: "freenet" - repo: "fred" - tag: "latest" + repo: "freenet/fred" + version: "latest" file: "freenet.jar" - name: Building the installer diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d47ab94..0b6cffbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 3.1.0.1 + +- Move docker to python-alpine for security reasons +- Add sorting options of markers (applied automatically on AnnData observations) +- Make Update View button always visible +- Minor fixes + ## 3.1 - Adding HDF5 support on the client side diff --git a/container/Dockerfile b/container/Dockerfile index 7c23f41a..f6bd927d 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -9,8 +9,9 @@ RUN apk update \ && apk upgrade RUN apk add vips hdf5 hdf5-dev -RUN pip3 install --upgrade pip setuptools wheel && \ - apk add --no-cache --virtual .build-deps gfortran openblas-dev gcc g++ zlib-dev make python3-dev jpeg-dev && \ +RUN apk add --no-cache openblas-dev && \ + pip3 install --upgrade pip setuptools wheel && \ + apk add --no-cache --virtual .build-deps gfortran gcc g++ zlib-dev make python3-dev jpeg-dev && \ pip3 install -r /requirements.txt && \ apk del .build-deps diff --git a/tissuumaps/VERSION b/tissuumaps/VERSION index 8c50098d..a9e279dd 100644 --- a/tissuumaps/VERSION +++ b/tissuumaps/VERSION @@ -1 +1 @@ -3.1 +3.1.0.1 diff --git a/tissuumaps/read_h5ad.py b/tissuumaps/read_h5ad.py index 088f0c4b..5bcbd293 100644 --- a/tissuumaps/read_h5ad.py +++ b/tissuumaps/read_h5ad.py @@ -63,7 +63,7 @@ def getPalette(adata): def getVarList(adata): var = adata.get("/var") if "_index" in var.attrs.keys(): - varIndex = adata.get("/var").attrs["_index"] + varIndex = str(adata.get("/var").attrs["_index"]) varList = [x.decode("utf-8") for x in adata.get(f"/var/{varIndex}", [])] else: # TODO @@ -361,6 +361,7 @@ def h5ad_to_tmap(basedir, path, library_id=None): "scale_check": False, "shape_col": False, "shape_fixed": True, + "sortby_check": False, "shape_gr": False, "shape_gr_dict": False, "shape_gr_rand": True,