Skip to content

Commit

Permalink
Removed pinned macOS requirements for fsevents2
Browse files Browse the repository at this point in the history
This partially reverts 6baa210
and fixes several issues with old `setuptools` versions.

Finally, this is how we did for eleases before 0.10.0 where
PyObjC requirements were not required, but one would just
install them manually.
  • Loading branch information
BoboTiG committed Feb 7, 2020
1 parent 6e01c8d commit 80f51e4
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
1 change: 1 addition & 0 deletions changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Changelog
2020-0x-xx • `full history <https://github.com/gorakhargosh/watchdog/compare/v0.10.1...master>`__

- Fixed the ``build_ext`` command on macOS Catalina (`#628 <https://github.com/gorakhargosh/watchdog/pull/628>`__)
- Removed pinned macOS requirements for ``fsevents2`` (`#635 <https://github.com/gorakhargosh/watchdog/pull/635>`__)
- Refactored ``dispatch()`` method of ``FileSystemEventHandler``,
``PatternMatchingEventHandler`` and ``RegexMatchingEventHandler``
- Improve tests support on non Windows/Linux platforms (`#633 <https://github.com/gorakhargosh/watchdog/pull/633>`__, `#639 <https://github.com/gorakhargosh/watchdog/pull/639>`__)
Expand Down
11 changes: 0 additions & 11 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
[options]
install_requires =
pathtools >= 0.1.1
pyobjc-framework-Cocoa >= 4.2.2 ; sys_platform == "darwin"
pyobjc-framework-FSEvents >= 4.2.2 ; sys_platform == "darwin"

[options.extras_require]
watchmedo =
PyYAML >= 3.10
argh >= 0.24.1

[build_sphinx]
source-dir = docs/source
build-dir = docs/build
Expand Down
9 changes: 9 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@
),
]

install_requires = [
"pathtools>=0.1.1",
]
extras_require = {
'watchmedo': ['PyYAML>=3.10', 'argh>=0.24.1'],
}

with open('README.rst', encoding='utf-8') as f:
readme = f.read()

Expand Down Expand Up @@ -131,6 +138,8 @@
package_dir={'': SRC_DIR},
packages=find_packages(SRC_DIR),
include_package_data=True,
install_requires=install_requires,
extras_require=extras_require,
cmdclass={
'build_ext': build_ext,
},
Expand Down
2 changes: 1 addition & 1 deletion tests/test_emitter.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
)
elif platform.is_darwin():
pytestmark = pytest.mark.skip("FIXME: issue #546.")
from watchdog.observers.fsevents2 import FSEventsEmitter as Emitter
from watchdog.observers.fsevents import FSEventsEmitter as Emitter
elif platform.is_windows():
from watchdog.observers.read_directory_changes import (
WindowsApiEmitter as Emitter
Expand Down

0 comments on commit 80f51e4

Please sign in to comment.