Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update libczi and actions #115

Merged
merged 8 commits into from
Apr 2, 2024
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-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cpp-build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
cc: "clang", cxx: "clang++"
}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: build and test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cpp-build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
cc: "clang", cxx: "clang++"
}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: build and test
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/py-build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
python-version: [3.7, 3.8, 3.9, "3.10", 3.11]
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SWE recommended me using actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c which is the latest version.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we be doing that across the board? Do we trust these major mainstream actions like actions/checkout or actions/setup-python enough? I felt this was more relevant for lesser-known actions.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe @griffinfujioka can help with this one.

with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -35,17 +35,17 @@ jobs:
run: |
pytest --cov-report xml --cov=aicspylibczi aicspylibczi/tests
- name: Upload codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4

lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install dependencies
Expand All @@ -61,7 +61,7 @@ jobs:
needs: [python-test, lint]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
cibw-arch: win_amd64

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
if: "contains(github.event.head_commit.message, 'Bump version')"

steps:
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5

- uses: actions/download-artifact@v2
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/py-build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install aicspylibczi
Expand All @@ -32,17 +32,17 @@ jobs:
pip install dist/aicspylibczi-$MY_VERSION.tar.gz
shell: bash
- name: Upload codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4

lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions _aicspylibczi/Reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Reader::Reader(std::shared_ptr<libCZI::IStream> istream_)
: m_czireader(new CCZIReader)
, m_specifyScene(true)
{
m_czireader->Open(std::move(istream_));
m_czireader->Open(std::move(istream_), nullptr);
m_statistics = m_czireader->GetStatistics();
m_pixelType = libCZI::PixelType::Invalid; // get the pixeltype of the first readable subblock

Expand All @@ -34,7 +34,7 @@ Reader::Reader(const wchar_t* file_name_)
{
std::shared_ptr<libCZI::IStream> sp;
sp = std::shared_ptr<libCZI::IStream>(new StreamImplLockingRead(file_name_));
m_czireader->Open(sp);
m_czireader->Open(sp, nullptr);
m_statistics = m_czireader->GetStatistics();
// create a reference for finding one or more subblock indices from a CDimCoordinate
checkSceneShapes();
Expand Down
2 changes: 1 addition & 1 deletion c_tests/test_Reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class CziCreatorIStream
CziCreatorIStream()
: m_czi()
{
auto fp = std::shared_ptr<libCZI::IStream>(new CSimpleStreamImplCppStreams(L"resources/s_1_t_1_c_1_z_1.czi"));
auto fp = std::shared_ptr<libCZI::IInputOutputStream>(libCZI::CreateInputOutputStreamForFile(L"resources/s_1_t_1_c_1_z_1.czi"));
m_czi = std::make_unique<pylibczi::Reader>(fp);
}
pylibczi::Reader* get() { return m_czi.get(); }
Expand Down
2 changes: 1 addition & 1 deletion libCZI
Submodule libCZI updated 243 files
Loading