python39: hardcode path to tzdata #103993

FRidh · 2020-11-16T20:35:51Z

Python 3.9 has a new module zoneinfo which requires tzdata. By default
it searches TZPATH for folders containing zoneinfo.

This commit makes the dependency on tzdata pure.

Motivation for this change

Things done

TODO

nuke-refs kills the reference to tzdata. This should not happen

SuperSandro2000 · 2020-11-23T14:32:55Z

Locally I get a merge conflict when trying to test this PR.

jonringer · 2021-01-24T17:29:49Z

we may have to do some patching

[nix-shell:/home/jon/.cache/nixpkgs-review/pr-103993]$ ./results/python310/bin/python3
Python 3.10.0a4 (default, Jan  4 2021, 17:26:04)
[GCC 10.2.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import zoneinfo
>>> zoneinfo.ZoneInfo("UTC")
Traceback (most recent call last):
  File "/home/jon/.cache/nixpkgs-review/pr-103993/results/python310/lib/python3.10/zoneinfo/_common.py", line 12, in load_tzdata
    return importlib.resources.open_binary(package_name, resource_name)
  File "/home/jon/.cache/nixpkgs-review/pr-103993/results/python310/lib/python3.10/importlib/resources.py", line 40, in open_binary
    package = _common.get_package(package)
  File "/home/jon/.cache/nixpkgs-review/pr-103993/results/python310/lib/python3.10/importlib/_common.py", line 66, in get_package
    resolved = resolve(package)
  File "/home/jon/.cache/nixpkgs-review/pr-103993/results/python310/lib/python3.10/importlib/_common.py", line 56, in resolve
    else importlib.import_module(cand)
  File "/home/jon/.cache/nixpkgs-review/pr-103993/results/python310/lib/python3.10/importlib/__init__.py", line 126, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
  File "<frozen importlib._bootstrap>", line 1049, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1026, in _find_and_load
  File "<frozen importlib._bootstrap>", line 991, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 241, in _call_with_frames_removed
  File "<frozen importlib._bootstrap>", line 1049, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1026, in _find_and_load
  File "<frozen importlib._bootstrap>", line 1003, in _find_and_load_unlocked
ModuleNotFoundError: No module named 'tzdata'

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/home/jon/.cache/nixpkgs-review/pr-103993/results/python310/lib/python3.10/zoneinfo/_common.py", line 24, in load_tzdata
    raise ZoneInfoNotFoundError(f"No time zone found with key {key}")
zoneinfo._common.ZoneInfoNotFoundError: 'No time zone found with key UTC'
>>>

or this may be an issue with upstream, as this doesn't occur in python3.9

FRidh · 2021-01-24T17:31:51Z

Should pass -e ${tzdata} to nuke-refs invocation.

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>

upstream plasma-browser-integration now depends on libtaskmanager Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>

libgphoto2: 2.5.26 -> 2.5.27

python3Packages.parso: fix flaky test due to slow moving time

This reverts commit acde9a0. A better solution is a65208c.

This reverts commit 963513e. A better solution is a65208c.

…otli stdenv/darwin: allow brotli reference from curl

firefox: 86.0 -> 86.0.1

libfabric: 1.11.2 -> 1.12.0

glib and libqrtr-glib are listed in the Requires field of the pkg-config file so we need to propagate them in order for depenents to be able to use this library.

asciidoc: patchPhase -> postPatch

vala: 0.40.18 -> 0.40.25, 0.46.5 -> 0.46.13, 0.48.9 -> 0.48.14, init 0.50.4

…riding pytest

With 20.8 upstream reverted buildsystem from flit back to setuptools as this would make it easier for some distro's.

because we already have a hook that takes care of it. Note tests were disabled because of a circular test dependency.

Achieve reproducible builds of the interpreter. Note this meant disabling optimizations again.

Python 3.9 has a new module `zoneinfo` which requires tzdata. By default it searches TZPATH for folders containing `zoneinfo`. This commit makes the dependency on tzdata pure.

FRidh · 2021-03-13T13:04:39Z

/rebase staging

FRidh · 2021-03-13T13:06:08Z

pushed 7617b03 to staging

github-actions · 2021-03-13T13:08:02Z

Failed to rebase

FRidh added 6.topic: python 2.status: work-in-progress labels Nov 16, 2020

ofborg bot added 11.by: package-maintainer 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Nov 16, 2020

FRidh requested a review from jonringer November 17, 2020 20:03

FRidh mentioned this pull request Jan 24, 2021

python3{9,10}: add tzdata to config #110622

Closed

10 tasks

FRidh added this to the 21.05 milestone Jan 25, 2021

CertainLach and others added 19 commits February 26, 2021 05:49

plasma-desktop: upgrade patch

ef8e9e0

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>

libkscreen: upgrade patch

b236ccb

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>

plasma-integration: add workspace dependency

0fee087

upstream plasma-browser-integration now depends on libtaskmanager Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>

kdeFrameworks: 5.78 -> 5.79

4e25a98

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>

plasma5: 5.20.90 -> 5.21.0

cfaf864

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>

kdesu: upgrade patch

b20587e

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>

kfilemetadata: upgrade patch

15fd832

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>

kinit: upgrade patches

47d5beb

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>

plasma5: 5.21.0 -> 5.21.1

1a4ab24

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>

Merge pull request NixOS#114077 from r-ryantm/auto-update/libgphoto2

9f4b7ea

libgphoto2: 2.5.26 -> 2.5.27

mpg123: 1.26.3 -> 1.26.4

5dab782

lyx: 2.3.6 -> 2.3.6.1

5f62158

mpop: 1.4.11 -> 1.4.12

d6094c4

mblaze: 1.0 -> 1.1

475886c

Merge pull request NixOS#114257 from bobrik/ivan/slow-moving-parso

b0ca5ad

python3Packages.parso: fix flaky test due to slow moving time

Revert "Apply suggestions from code review"

26c9976

This reverts commit acde9a0. A better solution is a65208c.

Revert "Fix tzdata cross-compilation"

109cbc4

This reverts commit 963513e. A better solution is a65208c.

Merge branch 'staging-next' into staging

54757b3

Merge staging-next into staging

10f6849

github-actions bot and others added 24 commits March 11, 2021 18:23

Merge master into staging-next

d6257d4

Merge master into staging-next

903fc48

Merge pull request NixOS#115498 from thefloweringash/stdenv-darwin-br…

91b3ede

…otli stdenv/darwin: allow brotli reference from curl

firefox: 86.0 -> 86.0.1

5ad7e11

Merge pull request NixOS#116020 from mweinelt/firefox

83156b8

firefox: 86.0 -> 86.0.1

Merge master into staging-next

121cc02

Merge pull request NixOS#115870 from r-ryantm/auto-update/libfabric

165e0cc

libfabric: 1.11.2 -> 1.12.0

Merge master into staging-next

c2eb9a7

libqmi: propagate requireds

6eed4a8

glib and libqrtr-glib are listed in the Requires field of the pkg-config file so we need to propagate them in order for depenents to be able to use this library.

Merge branch 'master' into staging-next

f747bcb

gtk3: add broadwayd to path (NixOS#116053)

b71eb28

Merge pull request NixOS#115349 from SuperSandro2000/ansible-lint

7eab1a2

asciidoc: patchPhase -> postPatch

7946498

Merge pull request NixOS#116003 from SuperSandro2000/asciidoc

999ec38

asciidoc: patchPhase -> postPatch

Merge pull request NixOS#115967 from maxeaubrey/vala_update

ab479f9

vala: 0.40.18 -> 0.40.25, 0.46.5 -> 0.46.13, 0.48.9 -> 0.48.14, init 0.50.4

Merge master into staging-next

b0a6c2b

Merge branch 'staging-next' into staging

9a64ee2

Merge master into staging-next

4181409

Merge staging-next into staging

970aea9

pythonPackages.pytest*: Move pytest to buildInputs to allow easy over…

60a10e0

…riding pytest

python3Packages.packaging: change build system from flit to setuptools

8149718

With 20.8 upstream reverted buildsystem from flit back to setuptools as this would make it easier for some distro's.

python3Packages.packaging: remove checkPhase

1adc69d

because we already have a hook that takes care of it. Note tests were disabled because of a circular test dependency.

python: reproducible builds

9d03ff5

Achieve reproducible builds of the interpreter. Note this meant disabling optimizations again.

python39: hardcode path to tzdata

7101571

Python 3.9 has a new module `zoneinfo` which requires tzdata. By default it searches TZPATH for folders containing `zoneinfo`. This commit makes the dependency on tzdata pure.

FRidh force-pushed the zoneinfo branch from f2a6941 to 7101571 Compare March 13, 2021 13:04

FRidh changed the title ~~WIP: python39: hardcode path to tzdata~~ python39: hardcode path to tzdata Mar 13, 2021

FRidh closed this Mar 13, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

python39: hardcode path to tzdata #103993

python39: hardcode path to tzdata #103993

FRidh commented Nov 16, 2020

SuperSandro2000 commented Nov 23, 2020

jonringer commented Jan 24, 2021

FRidh commented Jan 24, 2021

FRidh commented Mar 13, 2021

FRidh commented Mar 13, 2021

github-actions bot commented Mar 13, 2021

python39: hardcode path to tzdata #103993

python39: hardcode path to tzdata #103993

Conversation

FRidh commented Nov 16, 2020

Motivation for this change

Things done

TODO

SuperSandro2000 commented Nov 23, 2020

jonringer commented Jan 24, 2021

FRidh commented Jan 24, 2021

FRidh commented Mar 13, 2021

FRidh commented Mar 13, 2021

github-actions bot commented Mar 13, 2021