Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev-python/spyder: replace patch with sed #15170

Closed

Conversation

AndrewAmmerlaan
Copy link
Member

The patch introduced in #15149 to fix bug https://bugs.gentoo.org/715148 patches a file with DOS End-Of-Line. Somewhere along the way the patch got converted to UNIX EOL and it's no longer working. So I'm using sed instead in this PR

trying to patch file with DOS EOL
the patch got converted to UNIX EOL
somehwere along the road and is not working

Bug: https://bugs.gentoo.org/715148

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
@gentoo-bot
Copy link

Pull Request assignment

Submitter: @AndrewAmmerlaan
Areas affected: ebuilds
Packages affected: dev-python/spyder

dev-python/spyder: grozin, @gentoo/python, @AndrewAmmerlaan, @gentoo/proxy-maint

Linked bugs

Bugs linked: 715148


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else) assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Mar 30, 2020
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2020-03-30 09:13 UTC
Newest commit scanned: 9d1461a
Status: ✅ good

Issues already there before the PR (double-check them):
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-admin/ansible
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-admin/consul-template
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-admin/puppet
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-admin/rsyslog
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-admin/system-tools-backends
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-editors/atom
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-emulation/bochs
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-emulation/cloud-init
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-emulation/virtualbox-additions
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-emulation/virtualbox-guest-additions
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-emulation/virtualbox-modules
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-i18n/tomoe
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-misc/cbrpager
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-misc/ignuit
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-office/gnucash
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-office/libreoffice-l10n
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-shells/hstr
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-text/glosung
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#app-text/jo
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-cpp/tbb
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-db/etcd
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-db/mongodb
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-db/mysql-workbench
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-db/pgagent
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-dotnet/gnome-keyring-sharp
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-embedded/gnome-avrdude
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-java/swt
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-lang/lisaac
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-lang/qu-prolog
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-lang/rust
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-libs/gjs
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-libs/glib
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-libs/iniparser
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-perl/gnome2-perl
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-perl/gnome2-vfs-perl
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/Numdifftools
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/autobahn
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/backports-functools-lru-cache
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/celery
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/contextlib2
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/deprecation
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/docker-py
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/ecdsa
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/falcon
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/flask-gravatar
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/flask-htmlmin
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/flask-security
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/fs
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/funcsigs
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/gconf-python
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/genson
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/gnome-vfs-python
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/google-api-python-client
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/google-apitools
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/kafka-python
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/kombu
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/libbonobo-python
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/libgnome-python
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/libgnomecanvas-python
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/linecache2
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/locustio
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/mock
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/pydot-ng
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/pygtk
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/pymssql
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/pyorbit
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/python-daemon
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/python-xmp-toolkit
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/pyu2f
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/raet
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/reflink
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/rsa
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/schedule
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/testtools
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/ws4py
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-python/zipp
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-util/electron
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-util/jenkins-bin
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#dev-vcs/subversion
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#games-board/gnono
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#games-board/grhino
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#games-board/gtkboard
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#games-board/mt_gtk_client
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#games-board/pioneers
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#games-board/sirius
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#games-board/teg
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#games-puzzle/gtetrinet
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#games-puzzle/skoosh
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#gnome-base/gdm
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#gnome-base/gnome-session
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#gnome-base/libbonobo
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#gnome-base/libbonoboui
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#gnome-base/libgnome
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#gnome-base/libgnome-keyring
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#gnome-base/libgnomeui
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#gnome-extra/cinnamon
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#gnome-extra/gnome-commander
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#mail-client/claws-mail
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#mail-client/mail-notification
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#mail-client/thunderbird
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#mail-mta/nullmailer
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#mate-extra/mate-power-manager
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#media-gfx/darktable
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#media-gfx/inkscape
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#media-libs/cogl
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#media-libs/libgpod
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#media-libs/lilv
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#media-libs/mlt
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#media-libs/pymemphis
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#media-libs/tremor
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#media-sound/grip
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#media-sound/jack-rack
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#media-tv/kodi
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#media-video/unifi-video
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-analyzer/etherape
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-analyzer/ntopng
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-analyzer/wireshark
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-analyzer/zabbix
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-dns/bind
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-dns/unbound
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-ftp/lftp
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-im/teams
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-misc/grdesktop
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-misc/gwget
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-misc/lldpd
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-misc/openssh
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-misc/rabbitmq-server
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-misc/youtube-dl
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-nds/openldap
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-nntp/pan
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-p2p/fms
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-p2p/retroshare
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-proxy/dante
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-proxy/haproxy
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-voip/telepathy-haze
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-vpn/networkmanager-openvpn
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-wireless/kismet
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#net-wireless/urh
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sci-biology/foldingathome
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sci-electronics/linsmith
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sci-libs/ceres-solver
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sci-libs/eccodes
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sci-libs/fftw
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sci-libs/openblas
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sci-libs/spqr
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sci-libs/suitesparse
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sci-libs/tensorflow
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sci-libs/umfpack
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sci-physics/clhep
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sci-physics/geant-data
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sys-apps/agedu
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sys-apps/modutils
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sys-devel/distcc
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sys-fs/lvm2
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sys-kernel/linux-firmware
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#sys-power/nut
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#www-apps/cgit
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#www-apps/jekyll
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#www-apps/netbox
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#www-apps/trac
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#www-client/firefox
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#www-client/seamonkey
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#www-client/seamonkey-bin
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#www-servers/nginx
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#www-servers/tomcat
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#www-servers/tornado
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#x11-misc/xnee
https://qa-reports.gentoo.org/output/gentoo-ci/16a5851/output.html#x11-plugins/pidgin-opensteamworks

@hartwork
Copy link
Member

hartwork commented Mar 30, 2020

Hi @AndrewAmmerlaan , sed in ebuilds has a tendency to break or go stale over time while patches do not have that problem. Is there something preventing us from running dos2unix or the other way around on the affected files prior to patching, instead?

@AndrewAmmerlaan
Copy link
Member Author

Hi @AndrewAmmerlaan , sed in ebuilds has a tendency to break or go stale over time while patches do not have that problem. Is there something preventing us from running dos2unix or the other way around on the affected files prior to patching, instead?

That might work to. However, regardless of whether I use a patch or sed, I have to remove it in the next version bump anyway cause the next version is supposed to allow usage of newer parso versions anyway, thus making the whole patching/sed'ing obsolete anyway. So in this case I think there's no advantage to using a patch, and it would just be extra work.

@AndrewAmmerlaan AndrewAmmerlaan deleted the dev-python/spyder branch March 30, 2020 11:32
thesamesam pushed a commit to thesamesam/gentoo that referenced this pull request Mar 30, 2020
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
Closes: gentoo#15170
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else)
Projects
None yet
5 participants