[Bug 250144] textproc/py-sphinx: fix conflicts introduced by PR 249131 / r549076

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=250144

--- Comment #2 from commit-hook at FreeBSD.org ---
A commit references this bug:

Author: dbaio
Date: Tue Oct  6 22:32:07 UTC 2020
New revision: 551605
URL: https://svnweb.freebsd.org/changeset/ports/551605

Log:
  devel/ipython5: Use newest version of pygments

  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)

Changes:
  head/devel/ipython5/Makefile
  head/devel/ipython5/files/
  head/devel/ipython5/files/patch-setup.py

-- 
You are receiving this mail because:
You are the assignee for the bug.