Skip to content

Commit 80f51e4

Browse files
committed
Removed pinned macOS requirements for fsevents2
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.
1 parent 6e01c8d commit 80f51e4

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Changelog
99
2020-0x-xx • `full history <https://github.com/gorakhargosh/watchdog/compare/v0.10.1...master>`__
1010

1111
- Fixed the ``build_ext`` command on macOS Catalina (`#628 <https://github.com/gorakhargosh/watchdog/pull/628>`__)
12+
- Removed pinned macOS requirements for ``fsevents2`` (`#635 <https://github.com/gorakhargosh/watchdog/pull/635>`__)
1213
- Refactored ``dispatch()`` method of ``FileSystemEventHandler``,
1314
``PatternMatchingEventHandler`` and ``RegexMatchingEventHandler``
1415
- Improve tests support on non Windows/Linux platforms (`#633 <https://github.com/gorakhargosh/watchdog/pull/633>`__, `#639 <https://github.com/gorakhargosh/watchdog/pull/639>`__)

setup.cfg

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
[options]
2-
install_requires =
3-
pathtools >= 0.1.1
4-
pyobjc-framework-Cocoa >= 4.2.2 ; sys_platform == "darwin"
5-
pyobjc-framework-FSEvents >= 4.2.2 ; sys_platform == "darwin"
6-
7-
[options.extras_require]
8-
watchmedo =
9-
PyYAML >= 3.10
10-
argh >= 0.24.1
11-
121
[build_sphinx]
132
source-dir = docs/source
143
build-dir = docs/build

setup.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,13 @@
7575
),
7676
]
7777

78+
install_requires = [
79+
"pathtools>=0.1.1",
80+
]
81+
extras_require = {
82+
'watchmedo': ['PyYAML>=3.10', 'argh>=0.24.1'],
83+
}
84+
7885
with open('README.rst', encoding='utf-8') as f:
7986
readme = f.read()
8087

@@ -131,6 +138,8 @@
131138
package_dir={'': SRC_DIR},
132139
packages=find_packages(SRC_DIR),
133140
include_package_data=True,
141+
install_requires=install_requires,
142+
extras_require=extras_require,
134143
cmdclass={
135144
'build_ext': build_ext,
136145
},

tests/test_emitter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
)
4444
elif platform.is_darwin():
4545
pytestmark = pytest.mark.skip("FIXME: issue #546.")
46-
from watchdog.observers.fsevents2 import FSEventsEmitter as Emitter
46+
from watchdog.observers.fsevents import FSEventsEmitter as Emitter
4747
elif platform.is_windows():
4848
from watchdog.observers.read_directory_changes import (
4949
WindowsApiEmitter as Emitter

0 commit comments

Comments
 (0)