Skip to content

Commit

Permalink
Bugfix
Browse files Browse the repository at this point in the history
* removed .travis.yml since we don't use them anymore
* added ilastik.IlastikHeader class, which was implied but absent >:(
* fixed github workflow by removing py27 and py35 and quote py3.10
* version bump: v0.6.0.dev1
  • Loading branch information
paulkorir committed Sep 2, 2022
1 parent f424e29 commit 3a44c9d
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9, 3.10]
python-version: [3.6, 3.7, 3.8, 3.9, '3.10']

steps:
- uses: actions/checkout@v2
Expand Down
33 changes: 0 additions & 33 deletions .travis.yml

This file was deleted.

8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
#Changes by release

## [0.6.0.dev1] - 2022-09-02

Bugfixes

* removed .travis.yml since we don't use them anymore
* added ilastik.IlastikHeader class, which was implied but absent >:(
* fixed github workflow by removing py27 and py35 and quote py3.10

## [0.6.0.dev0] - 2022-09-01

* dropped support for Python2.7; requires Python3.6+
Expand Down
2 changes: 1 addition & 1 deletion sfftk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

BASE_DIR = os.path.dirname(__file__)

SFFTK_VERSION = 'v0.6.0.dev0'
SFFTK_VERSION = 'v0.6.0.dev1'

5 changes: 5 additions & 0 deletions sfftk/formats/ilastik.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
from ..readers import ilastikreader


class IlastikHeader:
def __init__(self, segmentation):
self._segmentation = segmentation


class IlastikSegment(object):
"""Segment"""

Expand Down
12 changes: 6 additions & 6 deletions sfftk/test_data/sff/v0.8/output_emd_1181.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@
"id": 15559,
"parent_id": 0,
"biological_annotation": {
"name": "chart hydrometers trackers",
"description": "Nascetur minim dolore voluptua odio, leo minulla dictumst cum ornare elitvivamus. Sociis felissed.",
"number_of_instances": 366,
"name": "slit factories fire",
"description": "Felis ea nec consetetur lobortis, nulla pulvinar sociosqu. Invidunt egestasmauris venenatis integer nullam elit, luptatum euismod elitnunc doming.",
"number_of_instances": 587,
"external_references": [
{
"id": 0,
"resource": "powders",
"url": "conn",
"accession": "icing",
"resource": "contents",
"url": "parameter",
"accession": "destinations",
"label": null,
"description": null
}
Expand Down
8 changes: 4 additions & 4 deletions sfftk/test_data/sff/v0.8/output_emd_1181.sff
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
<segment_list>
<segment id="15559" parent_id="0">
<biological_annotation>
<name>hip pear transmission</name>
<description>Sedfusce enimnulla volutpatut purus, ridiculus nisi accumsan autem. Bibendumfusce phasellus.</description>
<name>combatants limitation alternation</name>
<description>Facilisisat neque. Sadipscing ametduis conubia.</description>
<external_references>
<ref id="0" resource="highline" url="trunk" accession="birth"/>
<ref id="0" resource="buoys" url="laboratories" accession="verbs"/>
</external_references>
<number_of_instances>89</number_of_instances>
<number_of_instances>982</number_of_instances>
</biological_annotation>
<colour>
<red>0.921817600727081</red>
Expand Down
1 change: 1 addition & 0 deletions sfftk/unittests/test_formats.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ def test_am_read(self):
def test_ilastik_read(self):
"""Read an ilastik (.h5) segmentation"""
self.read_ilastik()
self.assertIsInstance(self.ilastik_segmentation.header, ilastik.IlastikHeader)
self.assertIsInstance(list(self.ilastik_segmentation.segments), list)
self.assertIsInstance(list(self.ilastik_segmentation.segments)[0], ilastik.IlastikSegment)

Expand Down

0 comments on commit 3a44c9d

Please sign in to comment.