Skip to content

Commit

Permalink
Merge from 5.x: PR #15886
Browse files Browse the repository at this point in the history
  • Loading branch information
ccordoba12 committed Jun 16, 2021
2 parents 0734214 + 0d4138a commit dc31fbb
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies:
- qtconsole >=5.1.0
- qtpy >=1.5.0
- rtree >=0.9.7
- setuptools >=39.0.0
- setuptools >=49.6.0
- sphinx >=0.6.6
# NOTE: There's no need to set constraints for spyder-kernels here
# because Spyder uses the subrepo for it when started in Binder.
Expand Down
2 changes: 1 addition & 1 deletion installers/macOS/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def make_app_bundle(dist_dir, make_lite=False):
NotADirectoryError: [Errno 20] Not a directory: '<path>/Resourses/lib/
python38.zip/qtawesome/fonts/fontawesome4.7-webfont.ttf'
setuptools :
Mandatory: setuptools >=39.0.0 : None (NOK)
Mandatory: setuptools >=49.6.0 : None (NOK)
sphinx :
No module named 'sphinx.builders.changes'
spyder :
Expand Down
2 changes: 1 addition & 1 deletion requirements/conda.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ qtawesome >=1.0.2
qtconsole >=5.1.0
qtpy >=1.5.0
rtree >=0.9.7
setuptools >=39.0.0
setuptools >=49.6.0
sphinx >=0.6.6
# NOTE: There's no need to set a version for spyder-kernels
# here because we're using a subrepo for it to run our tests.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ def run(self):
'qtconsole>=5.1.0',
'qtpy>=1.5.0',
'rtree>=0.9.7',
'setuptools>=39.0.0',
'setuptools>=49.6.0',
'sphinx>=0.6.6',
'spyder-kernels>=2.0.4,<2.1.0',
'textdistance>=4.2.0',
Expand Down
2 changes: 1 addition & 1 deletion spyder/dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
QTCONSOLE_REQVER = '>=5.1.0'
QTPY_REQVER = '>=1.5.0'
RTREE_REQVER = '>=0.9.7'
SETUPTOOLS_REQVER = '>=39.0.0'
SETUPTOOLS_REQVER = '>=49.6.0'
SPHINX_REQVER = '>=0.6.6'
SPYDER_KERNELS_REQVER = '>=2.0.4;<2.1.0'
TEXTDISTANCE_REQVER = '>=4.2.0'
Expand Down

0 comments on commit dc31fbb

Please sign in to comment.