Skip to content

Commit

Permalink
style: run black & isort on inotify (#1015)
Browse files Browse the repository at this point in the history
* Run black on inotify

Run `black` on `src/watchdog/observers/inotify.py`. Fixes failing
`flake8` tests:

Before:
-------

```
(.venv)
abramowi at Marcs-MacBook-Pro-3 in ~/Code/OpenSource/watchdog (master●)
$ python -m tox -e flake8
flake8: install_deps> python -I -m pip install -r requirements-tests.txt
.pkg: _optional_hooks> python /Users/abramowi/Code/OpenSource/watchdog/.venv/lib/python3.10/site-packages/pyproject_api/_backend.py True setuptools.build_meta __legacy__
.pkg: get_requires_for_build_editable> python /Users/abramowi/Code/OpenSource/watchdog/.venv/lib/python3.10/site-packages/pyproject_api/_backend.py True setuptools.build_meta __legacy__
.pkg: build_editable> python /Users/abramowi/Code/OpenSource/watchdog/.venv/lib/python3.10/site-packages/pyproject_api/_backend.py True setuptools.build_meta __legacy__
flake8: install_package_deps> python -I -m pip install 'PyYAML>=3.10'
flake8: install_package> python -I -m pip install --force-reinstall --no-deps /Users/abramowi/Code/OpenSource/watchdog/.tox/.tmp/package/12/watchdog-3.0.1-0.editable-cp310-cp310-macosx_12_0_arm64.whl
flake8: commands[0]> python -m flake8 docs tools src tests setup.py
src/watchdog/observers/inotify.py:224:86: W504 line break after binary operator
src/watchdog/observers/inotify.py:225:88: W504 line break after binary operator
flake8: exit 1 (0.40 seconds) /Users/abramowi/Code/OpenSource/watchdog> python -m flake8 docs tools src tests setup.py pid=76654
.pkg: _exit> python /Users/abramowi/Code/OpenSource/watchdog/.venv/lib/python3.10/site-packages/pyproject_api/_backend.py True setuptools.build_meta __legacy__
  flake8: FAIL code 1 (9.23=setup[8.83]+cmd[0.40] seconds)
  evaluation failed :( (10.10 seconds)
```

After:
------

```
(.venv)
abramowi at Marcs-MacBook-Pro-3 in ~/Code/OpenSource/watchdog (master●)
$ python -m tox -e flake8
.pkg: _optional_hooks> python /Users/abramowi/Code/OpenSource/watchdog/.venv/lib/python3.10/site-packages/pyproject_api/_backend.py True setuptools.build_meta __legacy__
.pkg: get_requires_for_build_editable> python /Users/abramowi/Code/OpenSource/watchdog/.venv/lib/python3.10/site-packages/pyproject_api/_backend.py True setuptools.build_meta __legacy__
.pkg: build_editable> python /Users/abramowi/Code/OpenSource/watchdog/.venv/lib/python3.10/site-packages/pyproject_api/_backend.py True setuptools.build_meta __legacy__
flake8: install_package> python -I -m pip install --force-reinstall --no-deps /Users/abramowi/Code/OpenSource/watchdog/.tox/.tmp/package/13/watchdog-3.0.1-0.editable-cp310-cp310-macosx_12_0_arm64.whl
flake8: commands[0]> python -m flake8 docs tools src tests setup.py
.pkg: _exit> python /Users/abramowi/Code/OpenSource/watchdog/.venv/lib/python3.10/site-packages/pyproject_api/_backend.py True setuptools.build_meta __legacy__
  flake8: OK (1.59=setup[1.11]+cmd[0.48] seconds)
  congratulations :) (2.45 seconds)
```

* Create pyproject.toml

* Run black again

* Run isort

---------

Co-authored-by: Mickaël Schoentgen <[email protected]>
  • Loading branch information
msabramo and BoboTiG authored Oct 10, 2023
1 parent 52d8692 commit e4e2f8e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
7 changes: 7 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[tool.black]
target-version = ["py38"]
line-length = 120
safe = true

[tool.isort]
profile = "black"
10 changes: 7 additions & 3 deletions src/watchdog/observers/inotify.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,13 @@ def get_event_mask_from_filter(self):
elif cls in (DirCreatedEvent, FileCreatedEvent):
event_mask |= InotifyConstants.IN_MOVE | InotifyConstants.IN_CREATE
elif cls is DirModifiedEvent:
event_mask |= (InotifyConstants.IN_MOVE | InotifyConstants.IN_ATTRIB |
InotifyConstants.IN_MODIFY | InotifyConstants.IN_CREATE |
InotifyConstants.IN_CLOSE_WRITE)
event_mask |= (
InotifyConstants.IN_MOVE
| InotifyConstants.IN_ATTRIB
| InotifyConstants.IN_MODIFY
| InotifyConstants.IN_CREATE
| InotifyConstants.IN_CLOSE_WRITE
)
elif cls is FileModifiedEvent:
event_mask |= InotifyConstants.IN_ATTRIB | InotifyConstants.IN_MODIFY
elif cls in (DirDeletedEvent, FileDeletedEvent):
Expand Down

0 comments on commit e4e2f8e

Please sign in to comment.