Bug 250144 - textproc/py-sphinx: fix conflicts introduced by PR 249131 / r549076
Summary: textproc/py-sphinx: fix conflicts introduced by PR 249131 / r549076
Status: Closed Overcome By Events
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: freebsd-python (Nobody)
URL:
Keywords:
Depends on: 249131
Blocks:
  Show dependency treegraph
 
Reported: 2020-10-05 16:54 UTC by Thierry Thomas
Modified: 2020-10-07 23:23 UTC (History)
0 users

See Also:
bugzilla: maintainer-feedback? (python)


Attachments
Replace pygments by pygments-25 (1.15 KB, text/plain)
2020-10-05 16:54 UTC, Thierry Thomas
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Thierry Thomas freebsd_committer freebsd_triage 2020-10-05 16:54:54 UTC
Created attachment 218543 [details]
Replace pygments by pygments-25

See also https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=250074

Since PR 249131 / r549076, textproc/py-sphinx depends on textproc/py-pygments, and that introduced conflicts with ports using dependencies of py37-pygments-25, e.g. math/sage which uses both py-sphinx and devel/ipython5.

See also https://www.mail-archive.com/freebsd-python@freebsd.org/msg20042.html

Note: another version of textproc/py-sphinx still depending on py37-pygments might be needed later.
Comment 1 Thierry Thomas freebsd_committer freebsd_triage 2020-10-06 18:13:43 UTC
Thanks to the patch
https://people.freebsd.org/~dbaio/ipython5-pygments.patch
provided by dbaio@ this is no more needed.
Comment 2 commit-hook freebsd_committer freebsd_triage 2020-10-06 22:32:27 UTC
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
Comment 3 commit-hook freebsd_committer freebsd_triage 2020-10-07 23:23:19 UTC
A commit references this bug:

Author: dbaio
Date: Wed Oct  7 23:22:26 UTC 2020
New revision: 551675
URL: https://svnweb.freebsd.org/changeset/ports/551675

Log:
  MFH: r551605

  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)

  Approved by:	ports-secteam (fluffy)

Changes:
_U  branches/2020Q4/
  branches/2020Q4/devel/ipython5/Makefile
  branches/2020Q4/devel/ipython5/files/