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

🐛 📝 fixes/enhancements on the tooling repo-wide #2679

Merged
merged 15 commits into from
Dec 6, 2021

Conversation

pcrespov
Copy link
Member

@pcrespov pcrespov commented Dec 6, 2021

What do these changes do?

This PR includes various fixes/enhancements on the tooling across the repository

  • Improves watchmedo ignore filter (used in the boot.sh for development) to avoid unnecessary auto-restart of the apps while developing. E.g. now we can edit tests w/o triggering the full webserver to autorestart and wait a while until it restarts ( rest module takes >30secs ... !! but i leave a speed up for another PR)
  • Enhances logs messages by including variable names using f-strings as f"{my_var=}" -> "my_var=33"
  • 🐛 Fixes tail, inspect, shell recipes in common.service.Makefile
  • 🐛 Fixes check recipe in api/common/schemas/Makefile
  • 📝 Updated github issue template for e2e including also portal tests. (Updated generator script as well)
  • Disabled python linting 3.10 CI job until we have bandwidth to fix it (received multiple complaints about it)

How to test

common.service.Makefile

cd osparc-simcore
make up-prod

# go to any service folder
cd services/storage
make inspect
make tail
...
make shell

test include/exclude patterns

Getting the right ignore pattern sometimes is tricky because of the different implementation of the globs. I tested the entrypoint patterns using watchmedo log as a replacement for watchmedo auto-restart. E.g.

$ watchmedo log \
  --recursive \
  --pattern="*.py;*/src/*" \
  --ignore-patterns="*test*;ignoreme/*" \
  --ignore-directories \
  .

on_moved(self=<watchdog.tricks.LoggerTrick object at 0x7fe547504250>, event=<FileMovedEvent: src_path='./pytest-simcore/ignoreme/ignore.py', dest_path='./pytest-simcore/ignore.py', is_directory=False>)
on_modified(self=<watchdog.tricks.LoggerTrick object at 0x7fe547504250>, event=<FileModifiedEvent: event_type=modified, src_path='./pytest-simcore/ignore.py', is_directory=False>)
on_modified(self=<watchdog.tricks.LoggerTrick object at 0x7fe547504250>, event=<FileModifiedEvent: event_type=modified, src_path='./pytest-simcore/ignore.py', is_directory=False>)
on_modified(self=<watchdog.tricks.LoggerTrick object at 0x7fe547504250>, event=<FileModifiedEvent: event_type=modified, src_path='./pytest-simcore/ignore.py', is_directory=False>)

@pcrespov pcrespov self-assigned this Dec 6, 2021
@codecov
Copy link

codecov bot commented Dec 6, 2021

Codecov Report

Merging #2679 (4936a9f) into master (8d0ad6a) will increase coverage by 0.1%.
The diff coverage is 50.0%.

Impacted file tree graph

@@           Coverage Diff            @@
##           master   #2679     +/-   ##
========================================
+ Coverage    77.9%   78.1%   +0.1%     
========================================
  Files         638     638             
  Lines       26093   26092      -1     
  Branches     2525    2526      +1     
========================================
+ Hits        20351   20384     +33     
+ Misses       5069    5040     -29     
+ Partials      673     668      -5     
Flag Coverage Δ
integrationtests 66.8% <0.0%> (+<0.1%) ⬆️
unittests 73.6% <50.0%> (+0.1%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...simcore_service_webserver/projects/projects_api.py 87.7% <ø> (ø)
.../simcore_service_webserver/projects/projects_db.py 90.7% <50.0%> (-0.4%) ⬇️
...car/src/simcore_service_dask_sidecar/dask_utils.py 89.2% <0.0%> (-1.2%) ⬇️
.../director/src/simcore_service_director/producer.py 62.1% <0.0%> (+0.4%) ⬆️
.../src/simcore_service_webserver/director_v2_core.py 65.3% <0.0%> (+1.1%) ⬆️
...tor_v2/modules/dynamic_sidecar/scheduler/events.py 95.0% <0.0%> (+2.1%) ⬆️
..._director_v2/modules/dynamic_sidecar/client_api.py 70.6% <0.0%> (+3.1%) ⬆️
...ce_webserver/resource_manager/garbage_collector.py 75.6% <0.0%> (+9.7%) ⬆️

@pcrespov pcrespov added this to the Meerkat milestone Dec 6, 2021
@pcrespov pcrespov changed the title WIP: Maintenance/e2e diagnostics 🐛 📝 fixes/enhancements on the tooling repo-wide Dec 6, 2021
@pcrespov pcrespov marked this pull request as ready for review December 6, 2021 13:59
.github/ISSUE_TEMPLATE/e2e_report.md Show resolved Hide resolved
Copy link
Member

@sanderegg sanderegg left a comment

Choose a reason for hiding this comment

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

👍

services/dask-sidecar/docker/boot.sh Show resolved Hide resolved
services/dask-sidecar/docker/boot.sh Show resolved Hide resolved
@pcrespov pcrespov merged commit 6dbb6d8 into ITISFoundation:master Dec 6, 2021
@pcrespov pcrespov deleted the maintenance/e2e-diagnostics branch December 6, 2021 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants