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

Unit test (part 2) #168

Merged
merged 126 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from 124 commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
eb8db7f
add arg to load only wfs and do not extract charges
Jun 23, 2024
2b8b613
cleaner way to treat containers inside makers
Jun 26, 2024
5f30851
new methods to find computed calibration quatities
Jun 26, 2024
d8aa001
update to support new version of EvB v6
Jun 26, 2024
d183536
-bug fix SPE combined : method use to update parameters was not the w…
Jun 26, 2024
175afa9
Merge branch 'main' into dev_test_doc
Dec 9, 2024
b46a959
add find photostat result method
Dec 9, 2024
75f6b34
user scripts
Dec 9, 2024
04d60f6
Merge branch 'dev_test_doc' of github.com:guillaumegrolleron/nectarch…
Dec 9, 2024
7452e60
add workflow_display to CI
Jan 6, 2025
5f98800
change tests name in user_scripts which is not a test for pytest
Jan 6, 2025
08b956c
fix import errors in TRR
Jan 6, 2025
2dfdd82
bugfix : logger
Jan 7, 2025
c5d4419
static method decorator were missing
Jan 7, 2025
404f189
bugfix test containers
Jan 7, 2025
8c2ac41
unit test fore nectarchain.makers .core
Jan 7, 2025
413c9b4
bugfix with new version of LIghtNectarCAMEventSource from ctapipe_io_…
Jan 8, 2025
f023695
very small code improvement
Jan 8, 2025
37141c2
Unit test for WaveformsNectarCAMCalibrationTool
Jan 8, 2025
7308cda
Unit test for the ChargesNectarCAMCalibrationTool
Jan 8, 2025
9e9ee9e
formatting
Jan 8, 2025
f11d0c6
fix test core makers
Jan 8, 2025
e944206
formatting
Jan 8, 2025
02ee8c3
formatting
Jan 8, 2025
d392b4c
flake8 formatting
Jan 8, 2025
d40c122
refactoring folling pep8
Jan 8, 2025
65c196d
folling refactring
Jan 8, 2025
24d8ce4
dqm flake8
Jan 8, 2025
d571cb3
refactoring containers
Jan 8, 2025
9b9a63c
fix bug formatting
Jan 8, 2025
532f961
shitty python formatting
Jan 8, 2025
f6cf972
test bugfix
Jan 8, 2025
f950359
pedestal maker : implementation of I/O with containers
Jan 9, 2025
c9f331c
remove LightNectarCamEventSource
Jan 9, 2025
3629461
Merge branch 'main' into dev_test_doc
Jan 9, 2025
617d8f2
bugfix in toml file introduced in previous commits
Jan 9, 2025
a9df416
bugfix : __init__ file in tests repertory
Jan 9, 2025
36a7737
pytest don't like to have 2 test files with same names
Jan 9, 2025
9f6dc02
unit test for component core
Jan 9, 2025
408ef89
change filename
Jan 9, 2025
92dd017
specific noqa
Jan 9, 2025
454a802
tests for charges_component
Jan 10, 2025
7803f09
test charge compopent + core component refactored
Jan 10, 2025
e864e41
bugfix when ArgumentError are raised
Jan 10, 2025
e15d0c3
test for waveforms_component
Jan 10, 2025
e748348
typo
Jan 10, 2025
10fe7c4
typo + paramter tol can be passed to fit
Jan 10, 2025
3e14bbf
typo
Jan 10, 2025
4a5290c
base test for flatfiled SPE component
Jan 10, 2025
70a9886
minor changes in photostat
Jan 17, 2025
bc21e60
test flatfield spe components
Jan 17, 2025
97176d3
test photostat component
Jan 17, 2025
eafb2c6
Merge branch 'main' into dev_test_doc_2
Jan 17, 2025
f0d1d4b
clean test not used
Jan 17, 2025
48af153
test for spe makers
Jan 17, 2025
a4564ba
add pyqtgraph dependencies
Jan 17, 2025
a73935e
pyqtgraph is obtained with pip
Jan 17, 2025
15564de
fix pyqt
Jan 17, 2025
6c78351
fix pyqtgraph pip installation instead of conda-forge
Jan 17, 2025
6145585
pyqt6 to pyqt5
Jan 17, 2025
262e880
fix pyqt
Jan 20, 2025
a495fa1
fix pyqtgraph
Jan 20, 2025
84983be
fix pip
Jan 20, 2025
9a311f6
fix pyqt
Jan 20, 2025
8e0e495
add pip dependencies to pyproject.toml
Jan 20, 2025
115332c
pyqt6 to pyqt5
Jan 20, 2025
cc4b330
pin version of pyqtgraph
Jan 20, 2025
4e3f5c1
typo
Jan 20, 2025
23c4031
same in toml
Jan 20, 2025
dfec7ea
idk
Jan 20, 2025
53eee81
typo
Jan 20, 2025
aad0571
fix
Jan 20, 2025
214ff7c
test fix
Jan 20, 2025
649f0ab
pyside6 vs pyqt
Jan 20, 2025
f36de2f
tml
Jan 20, 2025
02e56ab
last try
Jan 20, 2025
cd463cc
last
Jan 20, 2025
44c90e4
test libglib2
Jan 20, 2025
b48dc6d
fix apt
Jan 20, 2025
4bbb44c
useless
Jan 20, 2025
05d122a
pyqt5
Jan 20, 2025
6e38d33
need to fix pyqt6 in trr suite
Jan 20, 2025
c0f5c50
Test installing freeglut3-dev for pyqt in CI on Ubuntu runners
jlenain Jan 20, 2025
b63db52
We seem to be hitting https://github.com/pytest-dev/pytest/issues/321…
jlenain Jan 20, 2025
6a7353f
Try deactivating the pytest-xdist plugin of pytest
jlenain Jan 21, 2025
5f505cf
Test all imports on top
jlenain Jan 21, 2025
f06562d
desactivate multiproc tests
Jan 21, 2025
c633314
add xvfb to allow X11 display with pyqtgraph
Jan 21, 2025
79a2cf8
Install Qt 5 dependencies on macOS in CI
jlenain Jan 21, 2025
634fb4d
try to reactivate multiCPU tests
Jan 21, 2025
53e98a4
Re-enable pytest-xdist
jlenain Jan 21, 2025
7b239c8
add Xvbf server to allow pyqtgraph plots
Jan 21, 2025
edc98ef
Try to fix dependencies for QtCore on macOS in CI
jlenain Jan 21, 2025
a4e7cc5
Install system packages on runner before setting up python environment
jlenain Jan 21, 2025
8b76c11
Another try to get QtCore on macOS in CI
jlenain Jan 21, 2025
7a23e77
No need to install pyqt5 on macOS via brew, already included in conda…
jlenain Jan 21, 2025
522c0d3
Try using platform selectors in conda recipe
jlenain Jan 21, 2025
385d6d4
test xquartz macOS
Jan 21, 2025
b59b97c
check if mpl is a issue
Jan 21, 2025
5440576
test
Jan 21, 2025
c1a32b3
fix cash
Jan 21, 2025
5db2f14
fix bre"w
Jan 21, 2025
1687304
sudo
Jan 21, 2025
201c245
pyqt5 macos
Jan 21, 2025
73d2ef1
fix sudo
Jan 21, 2025
edde8c3
test
Jan 21, 2025
6bbab66
back pyqt5
Jan 21, 2025
b55ec99
try chatGPT help
Jan 21, 2025
4c5084b
freeglut
Jan 21, 2025
3769d10
test
Jan 21, 2025
4b6a20b
yopyoyo
Jan 22, 2025
88df7e9
pyqt6
Jan 22, 2025
bded7f4
do we need specific macos setup
Jan 22, 2025
7258163
with only freeglut
Jan 22, 2025
74cce05
test
Jan 22, 2025
1c6d2ec
test
Jan 22, 2025
47cafa8
test
Jan 22, 2025
7bee7ca
ets
Jan 22, 2025
4f7365a
needed ?
Jan 22, 2025
ef9e3ad
test
Jan 22, 2025
698b869
test
Jan 22, 2025
8147c13
tests
Jan 22, 2025
b1c031d
clean
Jan 22, 2025
9864f69
fix pyqt agin
Jan 22, 2025
d1ff55a
reactive multi proc tests
Jan 22, 2025
73ce5e6
remove modification in TRR -> will be done in upcoming PR
Jan 22, 2025
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
35 changes: 35 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,21 @@ jobs:
ctapipe-version: "v0.19.3"
install-method: "mamba"

env :
DISPLAY: ":99.0"
QT_SELECT: "qt5"
defaults:
run:
# We need login shells (-l) for micromamba to work.
shell: bash -leo pipefail {0}

steps:
- name: Install dependencies for Qt on Ubuntu
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install freeglut3-dev

- uses: actions/checkout@v4
with:
fetch-depth: 0
Expand All @@ -90,12 +99,28 @@ jobs:
environment-name: "ci"
environment-file: environment.yml


- name: Python setup
if: matrix.install-method == 'pip'
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
check-latest: true

- name: Setup xvfb for X11 display
if: matrix.os == 'ubuntu-latest'
run: |
# Stuff copied wildly from several stackoverflow posts
sudo apt-get install -y xvfb libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xinput0 libxcb-xfixes0 libxcb-shape0 libglib2.0-0 libgl1-mesa-dev
sudo apt-get install '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev
# start xvfb in the background
sudo /usr/bin/Xvfb $DISPLAY -screen 0 1280x1024x24 &

- name: Instal QT and setup environment on macOS
if: matrix.os == 'macos-14'
run: |
brew install pyqt@6
echo "DYLD_FRAMEWORK_PATH=$(brew --prefix qt)/lib" >> $GITHUB_ENV

- name: Install dependencies
env:
Expand All @@ -111,12 +136,17 @@ jobs:
echo "pip install -e ."
pip install -e .[test]

- name: Check pyqt version
run: |
pip list | grep PyQt

- name: Tests
run: |
pytest -n auto --dist loadscope --cov=nectarchain --cov-report=xml --ignore=src/nectarchain/user_scripts

- uses: codecov/codecov-action@v5


docs:
needs: lint
permissions:
Expand All @@ -132,6 +162,11 @@ jobs:
with:
python-version: 3.9

- name: Install dependencies for Qt 5 on Ubuntu
jlenain marked this conversation as resolved.
Show resolved Hide resolved
run: |
sudo apt-get update
sudo apt-get install freeglut3-dev

- name: Install doc dependencies
run: |
pip install -e .[docs]
Expand Down
11 changes: 7 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ dependencies:
- sphinx
- sphinx-automodapi
- pydata-sphinx-theme
- pyqt # [linux]
- pip:
- zeo
- zodb
- mechanize
- browser-cookie3
- zeo
- zodb
- mechanize
- browser-cookie3
- pyqtgraph
- pyqt6 # [osx and arm64]
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ dependencies = [
"scipy==1.11.4",
"zodb",
"zeo",
"pyqt6",
jlenain marked this conversation as resolved.
Show resolved Hide resolved
"pyqtgraph",
]

# needed for setuptools_scm, we don't define a static version
Expand Down
3 changes: 0 additions & 3 deletions src/nectarchain/makers/calibration/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
log.handlers = logging.getLogger("__main__").handlers


__all__ = None


class NectarCAMCalibrationTool(EventsLoopNectarCAMCalibrationTool):
name = "CalibrationTool"
# PIXELS_ID_COLUMN = "pixels_id"
Expand Down
Loading
Loading