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

Staging next #119398

Merged
merged 742 commits into from Apr 25, 2021
Merged

Staging next #119398

merged 742 commits into from Apr 25, 2021

Conversation

vcunat
Copy link
Member

@vcunat vcunat commented Apr 14, 2021

ajs124 and others added 30 commits April 6, 2021 18:34
Co-authored-by: Graham Christensen <graham@floxdev.com>
Co-authored-by: Graham Christensen <graham@floxdev.com>
* clean up some erroneously propagated dependencies

* use pytestCheckHook, clarify specific test settings
Note: There are no "*-symbol-check" files anymore.
I am automatically a maintainer of all packages in the set, so there is not
reason to mention me explicitly as the maintainer of every individual package.
KDE Frameworks 5.80 and Applications 20.12.3
Remove applying patch incorporated into this release
Jonathan Ringer and others added 7 commits April 22, 2021 08:23
[staging-next] python3Packages.keyring: disable keychain tests on darwin
There is just one test failure on darwin, and it can probably be worked
around by allowing local networking.

This should hopefully fix the following testsuite error:

```
___________________________ test_timeout_subsequent ____________________________
tests/test_other.py:137: in test_timeout_subsequent
    assert response.status == 200
E   assert 408 == 200
E     +408
E     -200
        Handler    = <class 'tests.test_other.test_timeout_subsequent.<locals>.Handler'>
        _          = b'Request Timeout'
        http       = <httplib2.Http object at 0x10860f400>
        response   = {'content-type': 'text/plain', 'status': '408', 'content-length': 15}
        uri        = 'http://localhost:58287/'
----------------------------- Captured stderr call -----------------------------
Traceback (most recent call last):
  File "/private/tmp/nix-build-python3.8-httplib2-0.19.1.drv-0/source/tests/__init__.py", line 311, in server_socket_thread
    fun(client, tick)
  File "/private/tmp/nix-build-python3.8-httplib2-0.19.1.drv-0/source/tests/__init__.py", line 392, in server_request_socket_handler
    request = HttpRequest.from_buffered(buf)
  File "/private/tmp/nix-build-python3.8-httplib2-0.19.1.drv-0/source/tests/__init__.py", line 177, in from_buffered
    return parse_http_message(cls, buf)
  File "/private/tmp/nix-build-python3.8-httplib2-0.19.1.drv-0/source/tests/__init__.py", line 120, in parse_http_message
    start_line = buf.readline()
  File "/private/tmp/nix-build-python3.8-httplib2-0.19.1.drv-0/source/tests/__init__.py", line 110, in readline
    self._fill(more=1)
  File "/private/tmp/nix-build-python3.8-httplib2-0.19.1.drv-0/source/tests/__init__.py", line 81, in _fill
    chunk = self._sock.recv(8 << 10)
ConnectionResetError: [Errno 54] Connection reset by peer
```
@alyssais
Copy link
Member

Eval is broken on staging-next due to a conflict between 2489629 (which makes scandir python 2 only) and dbfbfa3 (which adds a python 3 package depending on scandir). CC @cole-h @FRidh

@cole-h
Copy link
Member

cole-h commented Apr 23, 2021

Eval fails because scandir was marked python2-only in 2489629 (even though it doesn't appear to be?).

EDIT: Opened a revert PR: #120302.

EDIT2: #120303

SuperSandro2000 and others added 5 commits April 23, 2021 05:52
[staging-next] python3Packages.httplib2: allow local networking on darwin
Conflicts:
	pkgs/development/python-modules/pyvex/default.nix
	pkgs/top-level/python-packages.nix
python3Packages.httplib2: disable test_timeout_subsequent on darwin
Conflicts:
	pkgs/top-level/python-packages.nix
@vcunat
Copy link
Member Author

vcunat commented Apr 24, 2021

So, we're getting to a state that's good enough for master? Or at least close? It's certainly not like all the regressions got fixed (still mostly python packages), but...

Downgrade to 0.7.6 because its dependents (panel, holoviews) do not seem
to be compatible yet with this 2.x.
@FRidh
Copy link
Member

FRidh commented Apr 24, 2021

Will take some time to check the manual still builds after Haskell updates. Python packages can be fixed by their maintainers.

@FRidh FRidh merged commit 78af98a into master Apr 25, 2021
@vcunat
Copy link
Member Author

vcunat commented May 7, 2021

Next iteration, after the irregular one with GNOME 40: #122068

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet