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

terminator: 1.92 -> 2.1.0 #100472

Merged
merged 1 commit into from Feb 17, 2021
Merged

terminator: 1.92 -> 2.1.0 #100472

merged 1 commit into from Feb 17, 2021

Conversation

@SFrijters
Copy link
Member

@SFrijters SFrijters commented Oct 14, 2020

Motivation for this change

A new version has been released.

Marked as a WIP for now because the tests are causing issues for me with a rather unhelpful error:

============================= test session starts ==============================
platform linux -- Python 3.8.5, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 -- /nix/store/z65l1jqvxa58zzwwa3bvglb6asj4y8cv-python3-3.8.5/bin/python3.8
cachedir: .pytest_cache
rootdir: /build/source, inifile: pytest.ini
collecting ... /nix/store/izsc5570p7850vzx9m57izi9jl9q22dw-setuptools-check-hook/nix-support/setup-hook: line 4:   454 Trace/breakpoint trap   (core dumped) /nix/store/z65l1jqvxa58zzwwa3bvglb6asj4y8cv-python3-3.8.5/bin/python3.8 nix_run_setup test

@bjornfor Could you maybe help out with this? The old run_tests file has been removed, and as far as I can see plain pytest should be the new way to run tests. It even dumps core if I run pytest --collect-only .

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@bjornfor
Copy link
Contributor

@bjornfor bjornfor commented Oct 14, 2020

I don't have time to investigate this now, sorry. (Did you try reproducing under nix-shell?)

@SFrijters
Copy link
Member Author

@SFrijters SFrijters commented Oct 14, 2020

I did try under nix-shell, yes, but I ran into a bunch of different errors - presumably related to not applying wrapGAppsHook (correctly) - and at that point I started hoping for an easy answer from an external source.

For clarity: I've been using the actual executable as a terminal and that is working fine so far, it's purely a test issue.

I will take another look later, but any input from other reviewers is welcome.

@AndersonTorres AndersonTorres marked this pull request as draft Oct 14, 2020
@SFrijters
Copy link
Member Author

@SFrijters SFrijters commented Oct 18, 2020

Managed to get the same error inside a nix-shell, using a standalone clone of the upstream repo at v2.0.1:

$ nix-shell --pure -p 'python38.withPackages(ps: with ps; [ configobj dbus-python pygobject3 psutil pycairo pytest pytestrunner file intltool gobject-introspection gtk3 keybinder3 libnotify vte wrapGAppsHook ])' -p gtk3 -p gobjectIntrospection -p vte -p gdb
$ export PYTHONPATH=/nix/store/yqny5bp0i6m7y5qfjabiqb2pnmanjrky-python3-3.8.1-env/lib/python3.8/site-packages
$ gdb --args /nix/store/b6f2jl1160slxhyyam11wg4qica6nhhc-python3-3.8.1/bin/python setup.py test
[...]
Reading symbols from /nix/store/b6f2jl1160slxhyyam11wg4qica6nhhc-python3-3.8.1/bin/python...
(No debugging symbols found in /nix/store/b6f2jl1160slxhyyam11wg4qica6nhhc-python3-3.8.1/bin/python)
(gdb) r
Starting program: /nix/store/b6f2jl1160slxhyyam11wg4qica6nhhc-python3-3.8.1/bin/python setup.py test
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/nix/store/6m2k8kx8h216jlx9dg3lp4m90bz05yck-glibc-2.30/lib/libthread_db.so.1".
[Detaching after fork from child process 1858]
running pytest
Searching for dbus-python
Best match: dbus-python 1.2.16
Processing dbus_python-1.2.16-py3.8-linux-x86_64.egg

Using /home/frijters/repos/terminator/.eggs/dbus_python-1.2.16-py3.8-linux-x86_64.egg
running egg_info
writing terminator.egg-info/PKG-INFO
writing dependency_links to terminator.egg-info/dependency_links.txt
writing requirements to terminator.egg-info/requires.txt
writing top-level names to terminator.egg-info/top_level.txt
reading manifest file 'terminator.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
warning: no previously-included files found matching 'po/.intltool-merge-cache'
writing manifest file 'terminator.egg-info/SOURCES.txt'
running build_ext
============================================================================================================= test session starts =============================================================================================================
platform linux -- Python 3.8.1, pytest-5.3.5, py-1.8.1, pluggy-0.13.1 -- /nix/store/b6f2jl1160slxhyyam11wg4qica6nhhc-python3-3.8.1/bin/python
cachedir: .pytest_cache
rootdir: /home/frijters/repos/terminator, inifile: pytest.ini
collecting ... [Detaching after fork from child process 1865]
collecting 3 items                                                                                                                                                                                                                            
Program received signal SIGTRAP, Trace/breakpoint trap.
0x00007ffff5495c75 in _g_log_abort () from /nix/store/5m1hnzw1fh46viaczdl78sirqa2305cx-glib-2.62.4/lib/libglib-2.0.so.0

Not sure where to go from here though...

@SFrijters SFrijters force-pushed the terminator-2.0.1 branch from dc9ba88 to f8020eb Oct 18, 2020
@SFrijters SFrijters force-pushed the terminator-2.0.1 branch 2 times, most recently from 11f4c8c to 694c576 Oct 29, 2020
@SFrijters SFrijters force-pushed the terminator-2.0.1 branch from 694c576 to c5089cd Nov 6, 2020
@SFrijters SFrijters force-pushed the terminator-2.0.1 branch from c5089cd to 397a02d Dec 4, 2020
@SFrijters SFrijters force-pushed the terminator-2.0.1 branch from 397a02d to b315205 Dec 25, 2020
@SFrijters SFrijters force-pushed the terminator-2.0.1 branch from b315205 to 52ff7a7 Jan 19, 2021
@SFrijters SFrijters changed the title WIP terminator: 1.92 -> 2.0.1 WIP terminator: 1.92 -> 2.1.0 Jan 19, 2021
@SFrijters SFrijters force-pushed the terminator-2.0.1 branch from 52ff7a7 to a0e2df2 Feb 16, 2021
@SFrijters SFrijters changed the title WIP terminator: 1.92 -> 2.1.0 terminator: 1.92 -> 2.1.0 Feb 16, 2021
@SFrijters
Copy link
Member Author

@SFrijters SFrijters commented Feb 16, 2021

@SuperSandro2000 I've been unable to find a way to get the tests to work, but I've been using the actual application as a daily driver since I opened the PR, so can this be merged or can someone take a look at what's wrong with the tests?

@SFrijters SFrijters marked this pull request as ready for review Feb 16, 2021
@SuperSandro2000 SuperSandro2000 merged commit c4ee39c into NixOS:master Feb 17, 2021
19 checks passed
@SFrijters SFrijters deleted the terminator-2.0.1 branch Feb 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants