Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, ubuntu-22.04, macos-13]
python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
os: [windows-latest, ubuntu-22.04, macos-14]
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
steps:
- name: Checkout repo
uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:

- name: Install bftools
run: |
wget http://downloads.openmicroscopy.org/latest/bio-formats5.6/artifacts/bftools.zip
wget https://downloads.openmicroscopy.org/bio-formats/6.14.0/artifacts/bftools.zip
unzip bftools.zip

- name: Download test data
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ To run the tool, you need to configure bftools and vips. To do that, follow the

### [Ubuntu](https://github.com/andreped/vsi2tif#ubuntu)</summary>

1. Download bftools (click [here](http://downloads.openmicroscopy.org/latest/bio-formats5.6/artifacts/bftools.zip))
1. Download bftools (click [here](https://downloads.openmicroscopy.org/bio-formats/6.14.0/artifacts/bftools.zip))

2. Install vips and JDK
```
Expand All @@ -44,7 +44,7 @@ sudo apt install libvips-tools

### [macOS](https://github.com/andreped/vsi2tif#macos)</summary>

1. Download bftools (click [here](http://downloads.openmicroscopy.org/latest/bio-formats5.6/artifacts/bftools.zip))
1. Download bftools (click [here](https://downloads.openmicroscopy.org/bio-formats/6.14.0/artifacts/bftools.zip))

2. Install vips and JDK
```
Expand All @@ -61,7 +61,7 @@ brew install vips

To install bftools and vips, I recommend using Powershell as much as possible to automate the installation steps.

1. Download bftools (click [here](http://downloads.openmicroscopy.org/latest/bio-formats5.6/artifacts/bftools.zip))
1. Download bftools (click [here](https://downloads.openmicroscopy.org/bio-formats/6.14.0/artifacts/bftools.zip))

2. Download vips binary from Windows from [here](https://github.com/libvips/build-win64-mxe/releases) or use wget or similar
```
Expand Down
28 changes: 14 additions & 14 deletions notebooks/conversion_tutorial_macos.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
"name": "stdout",
"output_type": "stream",
"text": [
"\u001b[34m==>\u001b[0m \u001b[1mDownloading https://formulae.brew.sh/api/cask.jws.json\u001b[0m\n",
"\u001B[34m==>\u001B[0m \u001B[1mDownloading https://formulae.brew.sh/api/cask.jws.json\u001B[0m\n",
"#=#=# \n",
"\u001b[33mWarning:\u001b[0m Not upgrading zulu@8, the latest version is already installed\n",
"\u001b[34m==>\u001b[0m \u001b[1mDownloading https://formulae.brew.sh/api/formula.jws.json\u001b[0m\n",
"\u001B[33mWarning:\u001B[0m Not upgrading zulu@8, the latest version is already installed\n",
"\u001B[34m==>\u001B[0m \u001B[1mDownloading https://formulae.brew.sh/api/formula.jws.json\u001B[0m\n",
"#=#=# \n",
"\u001b[33mWarning:\u001b[0m vips 8.15.3 is already installed and up-to-date.\n",
"\u001B[33mWarning:\u001B[0m vips 8.15.3 is already installed and up-to-date.\n",
"To reinstall 8.15.3, run:\n",
" brew reinstall vips\n"
]
Expand Down Expand Up @@ -100,7 +100,7 @@
],
"source": [
"# Configure bftools\n",
"!wget http://downloads.openmicroscopy.org/latest/bio-formats5.6/artifacts/bftools.zip\n",
"!wget https://downloads.openmicroscopy.org/bio-formats/6.14.0/artifacts/bftools.zip\n",
"!unzip bftools.zip"
]
},
Expand All @@ -117,12 +117,12 @@
" Cloning https://github.com/andreped/vsi2tif to /private/var/folders/k0/9nz8fj4d1dx9g7ywxfnr8c5h0000gq/T/pip-req-build-e6bn_gg6\n",
" Running command git clone --filter=blob:none --quiet https://github.com/andreped/vsi2tif /private/var/folders/k0/9nz8fj4d1dx9g7ywxfnr8c5h0000gq/T/pip-req-build-e6bn_gg6\n",
" Resolved https://github.com/andreped/vsi2tif to commit ea364b628e1e12dd25a0123bef48b09251ba2e7a\n",
" Preparing metadata (setup.py) ... \u001b[?25ldone\n",
"\u001b[?25hRequirement already satisfied: tqdm in /Users/andreped/workspace/vsi2tif/venv/lib/python3.10/site-packages (from vsi2tif==0.1.0) (4.66.5)\n",
" Preparing metadata (setup.py) ... \u001B[?25ldone\n",
"\u001B[?25hRequirement already satisfied: tqdm in /Users/andreped/workspace/vsi2tif/venv/lib/python3.10/site-packages (from vsi2tif==0.1.0) (4.66.5)\n",
"Requirement already satisfied: numpy in /Users/andreped/workspace/vsi2tif/venv/lib/python3.10/site-packages (from vsi2tif==0.1.0) (2.1.0)\n",
"\n",
"\u001b[1m[\u001b[0m\u001b[34;49mnotice\u001b[0m\u001b[1;39;49m]\u001b[0m\u001b[39;49m A new release of pip is available: \u001b[0m\u001b[31;49m23.0.1\u001b[0m\u001b[39;49m -> \u001b[0m\u001b[32;49m24.2\u001b[0m\n",
"\u001b[1m[\u001b[0m\u001b[34;49mnotice\u001b[0m\u001b[1;39;49m]\u001b[0m\u001b[39;49m To update, run: \u001b[0m\u001b[32;49mpip install --upgrade pip\u001b[0m\n"
"\u001B[1m[\u001B[0m\u001B[34;49mnotice\u001B[0m\u001B[1;39;49m]\u001B[0m\u001B[39;49m A new release of pip is available: \u001B[0m\u001B[31;49m23.0.1\u001B[0m\u001B[39;49m -> \u001B[0m\u001B[32;49m24.2\u001B[0m\n",
"\u001B[1m[\u001B[0m\u001B[34;49mnotice\u001B[0m\u001B[1;39;49m]\u001B[0m\u001B[39;49m To update, run: \u001B[0m\u001B[32;49mpip install --upgrade pip\u001B[0m\n"
]
}
],
Expand Down Expand Up @@ -244,13 +244,13 @@
"name": "stdout",
"output_type": "stream",
"text": [
"\u001b[33mWarning:\u001b[0m openslide 4.0.0 is already installed and up-to-date.\n",
"\u001B[33mWarning:\u001B[0m openslide 4.0.0 is already installed and up-to-date.\n",
"To reinstall 4.0.0, run:\n",
" brew reinstall openslide\n",
"Requirement already satisfied: openslide-bin in /Users/andreped/workspace/vsi2tif/venv/lib/python3.10/site-packages (4.0.0.4)\n",
"\n",
"\u001b[1m[\u001b[0m\u001b[34;49mnotice\u001b[0m\u001b[1;39;49m]\u001b[0m\u001b[39;49m A new release of pip is available: \u001b[0m\u001b[31;49m23.0.1\u001b[0m\u001b[39;49m -> \u001b[0m\u001b[32;49m24.2\u001b[0m\n",
"\u001b[1m[\u001b[0m\u001b[34;49mnotice\u001b[0m\u001b[1;39;49m]\u001b[0m\u001b[39;49m To update, run: \u001b[0m\u001b[32;49mpip install --upgrade pip\u001b[0m\n"
"\u001B[1m[\u001B[0m\u001B[34;49mnotice\u001B[0m\u001B[1;39;49m]\u001B[0m\u001B[39;49m A new release of pip is available: \u001B[0m\u001B[31;49m23.0.1\u001B[0m\u001B[39;49m -> \u001B[0m\u001B[32;49m24.2\u001B[0m\n",
"\u001B[1m[\u001B[0m\u001B[34;49mnotice\u001B[0m\u001B[1;39;49m]\u001B[0m\u001B[39;49m To update, run: \u001B[0m\u001B[32;49mpip install --upgrade pip\u001B[0m\n"
]
}
],
Expand Down Expand Up @@ -282,8 +282,8 @@
"Requirement already satisfied: pyparsing>=2.3.1 in /Users/andreped/workspace/vsi2tif/venv/lib/python3.10/site-packages (from matplotlib) (3.1.4)\n",
"Requirement already satisfied: six>=1.5 in /Users/andreped/workspace/vsi2tif/venv/lib/python3.10/site-packages (from python-dateutil>=2.7->matplotlib) (1.16.0)\n",
"\n",
"\u001b[1m[\u001b[0m\u001b[34;49mnotice\u001b[0m\u001b[1;39;49m]\u001b[0m\u001b[39;49m A new release of pip is available: \u001b[0m\u001b[31;49m23.0.1\u001b[0m\u001b[39;49m -> \u001b[0m\u001b[32;49m24.2\u001b[0m\n",
"\u001b[1m[\u001b[0m\u001b[34;49mnotice\u001b[0m\u001b[1;39;49m]\u001b[0m\u001b[39;49m To update, run: \u001b[0m\u001b[32;49mpip install --upgrade pip\u001b[0m\n"
"\u001B[1m[\u001B[0m\u001B[34;49mnotice\u001B[0m\u001B[1;39;49m]\u001B[0m\u001B[39;49m A new release of pip is available: \u001B[0m\u001B[31;49m23.0.1\u001B[0m\u001B[39;49m -> \u001B[0m\u001B[32;49m24.2\u001B[0m\n",
"\u001B[1m[\u001B[0m\u001B[34;49mnotice\u001B[0m\u001B[1;39;49m]\u001B[0m\u001B[39;49m To update, run: \u001B[0m\u001B[32;49mpip install --upgrade pip\u001B[0m\n"
]
}
],
Expand Down
Loading
Loading