Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
e55821e
add ngio dependency
lorenzocerrone Nov 15, 2024
605d469
ngio based re-implementation of projection task
lorenzocerrone Nov 15, 2024
5b46f01
update poetry.lock
lorenzocerrone Nov 15, 2024
dd6dba9
rm python=3.0 from ci
lorenzocerrone Nov 15, 2024
802bdb8
update changelog
lorenzocerrone Nov 15, 2024
3da52c8
pre-commit fix
lorenzocerrone Nov 15, 2024
c8b050a
Merge branch 'main' into ngio-projection
tcompa Nov 26, 2024
2d63e84
Pass new_plate_name from projection init task to projection image lis…
jluethi Dec 12, 2024
0155294
Add correct zarr file ending to plate name
jluethi Dec 12, 2024
a17d4bb
Fix roi.z settings
jluethi Dec 12, 2024
1adf2bd
Update manifest
jluethi Dec 12, 2024
da10279
Rename variable roi_table to roi_table_name
jluethi Dec 12, 2024
9e744e4
Remove remaining Python 3.9 CI actions
jluethi Dec 12, 2024
65f69be
Fix workflow test updated init args
jluethi Dec 12, 2024
b784936
Update expected projection metadata output
jluethi Dec 12, 2024
b2abce6
Ensure all table values are floats
jluethi Dec 12, 2024
f76134d
rm type_check blocks
lorenzocerrone Dec 16, 2024
77a9941
revert to tasks-core logger
lorenzocerrone Dec 16, 2024
2f03cfe
new table copy behaviour
lorenzocerrone Dec 16, 2024
cb67710
Merge branch 'main' into ngio-projection
lorenzocerrone Dec 17, 2024
387aaae
minor logging changes
lorenzocerrone Dec 17, 2024
aacb3e2
update pyproject and lock files
lorenzocerrone Dec 17, 2024
6bbc5bf
Merge branch 'ngio-projection' of github.com:fractal-analytics-platfo…
lorenzocerrone Dec 17, 2024
bc25920
Merge branch 'main' into ngio-projection
tcompa Dec 18, 2024
135f902
Bring back coverage to v6.5
tcompa Dec 18, 2024
bc87363
Ignore some tests
tcompa Dec 18, 2024
200aac7
Disable caching in GHA
tcompa Dec 18, 2024
9dcf240
BROKEN - remove most of GHAs to test a specific one
tcompa Dec 18, 2024
1e47072
Comment tasks tests
tcompa Dec 18, 2024
3c9b168
Comment tasks tests
tcompa Dec 18, 2024
1d6ca35
Uncomment part of tasks tests
tcompa Dec 18, 2024
86f2104
fix
tcompa Dec 18, 2024
deec858
use py312 for gha
tcompa Dec 18, 2024
9990039
Remove future annotations
tcompa Dec 18, 2024
f412664
Re-bump coverage version
tcompa Dec 18, 2024
65e21c3
Install all extras
tcompa Dec 18, 2024
27abb6f
Add dev
tcompa Dec 18, 2024
08b1c3a
Remove --all-extras
tcompa Dec 18, 2024
87d0610
Omit .venv
tcompa Dec 18, 2024
2344f19
Ignore errors
tcompa Dec 18, 2024
3ebf98e
improve omit config
tcompa Dec 18, 2024
b4d6b52
update config
tcompa Dec 18, 2024
6616a9f
update config
tcompa Dec 18, 2024
9eb252c
update config
tcompa Dec 18, 2024
5a2b1fe
Set COVERAGE_PATH
tcompa Dec 18, 2024
922126c
Revert "Set COVERAGE_PATH"
tcompa Dec 18, 2024
2cb47cf
rm .venv
tcompa Dec 18, 2024
136706c
remove --data-file
tcompa Dec 18, 2024
28155dc
Remove omit
tcompa Dec 18, 2024
1e3fd15
remove coverage path
tcompa Dec 18, 2024
b92d968
Do not set virtualenvs.in-project
tcompa Dec 18, 2024
3f58691
Fix source
tcompa Dec 18, 2024
e4007db
Remove rm-r
tcompa Dec 18, 2024
630a190
yet another virtualenvs.in-project
tcompa Dec 18, 2024
a18e0cf
remove comments
tcompa Dec 18, 2024
8ca7366
simplify gha
tcompa Dec 18, 2024
e160e6f
debug
tcompa Dec 18, 2024
5dd67d0
debug
tcompa Dec 18, 2024
bcfd088
Remove `-E fractal-tasks`
tcompa Dec 19, 2024
6e20352
Revert "Remove `-E fractal-tasks`"
tcompa Dec 19, 2024
cb5f603
more debugging
tcompa Dec 19, 2024
e8895ab
change x-bit
tcompa Dec 19, 2024
dce31f1
grep
tcompa Dec 19, 2024
fb3f0e6
fix gha
tcompa Dec 19, 2024
78a8893
cat
tcompa Dec 19, 2024
4070ec1
Simplify
tcompa Dec 19, 2024
646e719
Simplify poetry/pyproj
tcompa Dec 19, 2024
f643b17
drop ngio
tcompa Dec 19, 2024
648cdfe
rm tasks
tcompa Dec 19, 2024
f312873
Revert "rm tasks"
tcompa Dec 19, 2024
bb418d7
Simplify
tcompa Dec 19, 2024
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
88 changes: 0 additions & 88 deletions .github/workflows/ci_pip.yml

This file was deleted.

95 changes: 12 additions & 83 deletions .github/workflows/ci_poetry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,130 +8,59 @@ on:

jobs:

tests_core:
name: "Core, Python ${{ matrix.python-version }}"
runs-on: ubuntu-22.04
timeout-minutes: 10

strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Install poetry
run: pipx install poetry==1.8.2

- name: Configure poetry
run: poetry config virtualenvs.in-project true

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Cache poetry virtualenv
uses: actions/cache@v4
with:
path: ./.venv
key: ${{ runner.os }}-python-${{ matrix.python-version }}-venv-${{ hashFiles('**/poetry.lock') }}-tests_core

- name: Install dependencies (without extras)
run: poetry install --with dev --without docs --no-interaction

- name: Test core library with pytest
env:
COVERAGE_FILE: coverage-data-core-${{ matrix.python-version }}
run: poetry run coverage run -m pytest tests --ignore tests/tasks --ignore tests/dev

- name: Upload coverage data
uses: actions/upload-artifact@v4
with:
name: coverage-data-core-${{ matrix.python-version }}
path: coverage-data-core-${{ matrix.python-version }}*

tests_tasks:
name: "Tasks, Python ${{ matrix.python-version }}"
runs-on: ubuntu-22.04
timeout-minutes: 30

strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Install poetry
run: pipx install poetry==1.8.2

- name: Configure poetry
run: poetry config virtualenvs.in-project true
- run: pipx install poetry==1.8.2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Cache poetry virtualenv
uses: actions/cache@v4
with:
path: ./.venv
key: ${{ runner.os }}-python-${{ matrix.python-version }}-venv-${{ hashFiles('**/poetry.lock') }}-tests_tasks

- name: Install dependencies (including fractal-tasks extra)
run: poetry install --with dev --without docs --no-interaction -E fractal-tasks

- name: Check if manifest has changed
run: |
poetry run python fractal_tasks_core/dev/create_manifest.py
echo "*.json diff=json" >> .gitattributes && git config diff.json.textconv "jq --sort-keys '.' \$1"
git diff ./fractal_tasks_core/__FRACTAL_MANIFEST__.json
if [ -n "$(git diff --exit-code ./fractal_tasks_core/__FRACTAL_MANIFEST__.json)" ]; then
echo "__FRACTAL_MANIFEST__.json has changed. Please run 'poetry run python fractal_tasks_core/dev/create_manifest.py' and commit the changes."
exit 1
else
echo "__FRACTAL_MANIFEST__.json has not changed."
fi

- name: Cache Pooch folder
id: cache-pooch-folder
uses: actions/cache@v4
with:
path: ~/.cache/pooch
key: pooch-cache
- run: poetry install --with dev --without docs --no-interaction -E fractal-tasks

- name: Test tasks with pytest
env:
COVERAGE_FILE: coverage-data-tasks-${{ matrix.python-version }}
run: poetry run coverage run -m pytest tests/dev tests/tasks -s --log-cli-level info
run: poetry run coverage run --debug=config,trace,pathmap -m pytest tests/dev/test_create_schema_for_single_task.py::test_create_schema_for_single_task_usage_1 -s >>file.txt 2>&1

- run: cat file.txt

- run: grep cellpose file.txt

- name: Upload coverage data
uses: actions/upload-artifact@v4
with:
name: coverage-data-tasks-${{ matrix.python-version }}
path: coverage-data-tasks-${{ matrix.python-version }}*


coverage:
name: Coverage
runs-on: ubuntu-22.04
needs: [tests_core, tests_tasks]
needs: [tests_tasks]
steps:
- uses: actions/checkout@v4

- run: pipx install poetry==1.8.2
- run: poetry config virtualenvs.in-project true
- uses: actions/setup-python@v5
with:
python-version: "3.10"

- name: Install dependencies
run: poetry install --only dev
run: poetry install --with dev

- name: Download data
uses: actions/download-artifact@v4
Expand All @@ -145,7 +74,7 @@ jobs:
# We added this step to replace the variable `MERGE_COVERAGE_FILES: true`
# in the next step, which had started to raise errors
# (https://github.com/fractal-analytics-platform/fractal-server/pull/1725).
run: poetry run coverage combine coverage-data-*
run: poetry run coverage combine --debug=config,trace,pathmap coverage-data-*

- name: Add coverage comment to Pull Requests
id: coverage_comment
Expand Down
42 changes: 0 additions & 42 deletions .github/workflows/documentation.yaml

This file was deleted.

114 changes: 0 additions & 114 deletions .github/workflows/manifest_external_packages.yml

This file was deleted.

Loading
Loading