mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 22:00:31 -04:00
fb45b842a3
The pinned dependency 'pygments<2.6' is only necessary to solve an issue with Python 2.7, and devel/ipython5 is now python3.5+ only. [1] [2] This fixes a conflict introduced on ports r549076 and r549418 between textproc/py-pygments and textproc/py-pygments-25 when building at least textproc/py-sphinx and math/sage. 1 - https://github.com/ipython/ipython/pull/12174 2 - https://github.com/ipython/ipython/issues/12173 PR: 249131, 250074, 250144 Reported by: thierry, swills Approved by: python (with hat) MFH: 2020Q4 (build fix, conflicts)
26 lines
921 B
Python
26 lines
921 B
Python
# Release pygments because devel/ipython5 is python:3.5+ now.
|
|
# https://github.com/ipython/ipython/pull/12174
|
|
#
|
|
# This avoids some conflicts:
|
|
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=250074
|
|
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=250144
|
|
--- setup.py.orig 2020-05-01 18:12:21 UTC
|
|
+++ setup.py
|
|
@@ -182,7 +182,7 @@ extras_require = dict(
|
|
parallel = ['ipyparallel'],
|
|
qtconsole = ['qtconsole'],
|
|
doc = ['Sphinx>=1.3'],
|
|
- test = ['nose>=0.10.1', 'requests', 'testpath', 'pygments<2.6', 'nbformat', 'ipykernel'],
|
|
+ test = ['nose>=0.10.1', 'requests', 'testpath', 'pygments', 'nbformat', 'ipykernel'],
|
|
terminal = [],
|
|
kernel = ['ipykernel'],
|
|
nbformat = ['nbformat'],
|
|
@@ -197,7 +197,7 @@ install_requires = [
|
|
'simplegeneric>0.8',
|
|
'traitlets>=4.2',
|
|
'prompt_toolkit>=1.0.4,<2.0.0',
|
|
- 'pygments<2.6',
|
|
+ 'pygments',
|
|
]
|
|
|
|
# Platform-specific dependencies:
|