Change to upstream tzdata #1

mbargull · 2020-10-06T15:21:07Z

Checklist

Used a personal fork of the feedstock to propose changes
Bumped the build number (if the version is unchanged)
Reset the build number to 0 (if the version changed)
Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
Ensured the license file is being packaged.

This changes this repository to build the upstream Time Zone Database as the package named tzdata on conda-forge.
Up until now, this recipe built the Python package tzdata, which is now living at https://github.com/conda-forge/python-tzdata-feedstock and will be available under the python-tzdata name on the conda-forge channel.
Following up on: conda-forge/python-feedstock#392 and conda-forge/staged-recipes#12828

…nda-forge-pinning 2020.10.06.07.41.18

conda-forge-linter · 2020-10-06T15:21:13Z

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

I do have some suggestions for making it better though...

For recipe:

License is not an SPDX identifier (or a custom LicenseRef) nor an SPDX license expression.

Documentation on acceptable licenses can be found here.

recipe/meta.yaml

mbargull · 2020-10-06T15:37:22Z

recipe/meta.yaml

@@ -1,41 +1,72 @@
-{% set version = "2020.1" %}
+{% set version = "2020a" %}


Although conda also uses Python-like versioning, tzdata uses consistent versions for which the non-numeric suffix is always lexicographical increasing.
Meaning: It's fine for us to use the upstream version scheme.

mbargull · 2020-10-06T15:39:10Z

recipe/meta.yaml


 requirements:
+  build:
+    - {{ compiler('c') }}


This uses a compiler because it builds its own tools. We add the ignore_run_exports above to get a noarch: generic package without any other dependencies.

recipe/meta.yaml

pganssle · 2020-10-06T16:02:38Z

recipe/build.sh

+  TOPDIR="${PREFIX}" \
+  USRDIR='' \
+  POSIXRULES='' \
+  ZFLAGS='-b slim' \


I would use -b fat (or whatever the equivalent is) for now. pytz and dateutil will have problems with the slim versions, unfortunately.

Ah, thanks. I assume you intend to change the Python package to -b fat then too?

No, the Python package is not used by anything except zoneinfo at the moment, whereas dateutil will automatically use the system time zone information, and pytz has an option to use the system time zone data. Anyone who starts using the Python tzdata package should support slim files.

I see. Makes sense to assume everything that uses newly introduced functionality to support slim.

tzdata will now carry the upstream database as a noarch:generic package. refs: - conda-forge/tzdata-feedstock#1

pganssle · 2020-10-06T16:03:42Z

recipe/0001-Add-TABDATA-to-install_data.patch

+  ZIC='$(ZIC)'
+
+-INSTALL_DATA_DEPS = zic leapseconds yearistype tzdata.zi
+INSTALL_DATA_DEPS = zic leapseconds yearistype tzdata.zi $(TABDATA)


Why do you need to patch this?

Just to avoid the manual copying of those extra files ;).
But if we don't need them, we can remove that whole commit. I just don't know if it makes sense to include them or not.
(ref: python/tzdata#28)

I'm not sure why you have to patch anything to get those files. Upstream the way I unpack this is here. I do:

make DESTDIR={temporary_directory} POSIXRULES= ZFLAGS='-b slim' install

(You would use -b fat) and then move everything that's in temporary_directory/usr/share/zoneinfo over to the location I'm expecting. As far as I know no additional copying is necessary.

I just wanted a Make target that installed everything in TZDIR. But I'm also more than fine with the way you did it and added a commit to do just that!
The tests in this recipe will also catch when anything unexpected would get installed, so all good either way.

ocefpaf · 2020-10-06T16:22:39Z

@mbargull thanks so much for doing this! I was planning to hack at it over the weekend but could not even get close to reading the build intructions.

I would like to say I approve and this is ready to go but you have the much better expertise of @pganssle here so I'll defer to him to tell us when this is OK to merge.

tzdata will now carry the upstream database as a noarch:generic package. refs: - conda-forge/tzdata-feedstock#1

mbargull · 2020-10-06T16:39:36Z

Thanks @ocefpaf. And yes, I'm also very happy that @pganssle is helping out here, much appreciated!

ocefpaf · 2020-10-06T16:47:01Z

@pganssle any last comments or is this OK to be merged?

mbargull · 2020-10-06T16:49:19Z

This is likely good to go now -- anything else we should change, @pganssle? Would you like to help maintaining this recipe, too? I took you off the maintainers list just to not enforce an additional recipe onto you -- but of course we'd be happy to have you!

Just to recap what's different from https://github.com/conda-forge/python-tzdata:

This is not a noarch: python package anymore, but just a noarch: generic with all files under share/zoneinfo.
This doesn't carry the zones files from the Python package.
The actual data files are the same as in the Python package, but not built with -b slim.
We can use this as a dependency for the python package and point its TZPATH to the directory from this package then.

recipe/meta.yaml

ocefpaf · 2020-10-06T21:53:46Z

Let's get this in. We can always add/remove stuff later. Thanks @mbargull for fixing this and @pganssle for the valuable insight!

pganssle · 2020-10-07T20:26:46Z

This is likely good to go now -- anything else we should change, @pganssle? Would you like to help maintaining this recipe, too? I took you off the maintainers list just to not enforce an additional recipe onto you -- but of course we'd be happy to have you!

Hey, sorry, this seemed low-priority since it was merged before I got back to it, but yeah I'm fine helping to maintain this feedstock.

Thanks for putting this together, I think it looks great!

(Now for the first test — tzdata 2020b was just released!)

tzdata will now carry the upstream database as a noarch:generic package. refs: - conda-forge/tzdata-feedstock#1

mbargull added 3 commits October 6, 2020 17:12

Change feedstock to package upstream tzdata

347187b

MNT: Re-rendered with conda-build 3.20.3, conda-smithy 3.7.10, and co…

fe36ef2

…nda-forge-pinning 2020.10.06.07.41.18

Add leapseconds, *.tab, and zic input files

014ebe9

mbargull requested review from ocefpaf and pganssle as code owners October 6, 2020 15:21

mbargull commented Oct 6, 2020

View reviewed changes

recipe/meta.yaml Show resolved Hide resolved

mbargull commented Oct 6, 2020

View reviewed changes

recipe/meta.yaml Show resolved Hide resolved

Add comment on why we don't skip on non-Linux

420f53b

pganssle reviewed Oct 6, 2020

View reviewed changes

mbargull added a commit to mbargull/cf-mark-broken that referenced this pull request Oct 6, 2020

tzdata=2020.1 superseded by python-tzdata=2020.1

23d823b

tzdata will now carry the upstream database as a noarch:generic package. refs: - conda-forge/tzdata-feedstock#1

pganssle reviewed Oct 6, 2020

View reviewed changes

mbargull mentioned this pull request Oct 6, 2020

tzdata=2020.1 superseded by python-tzdata=2020.1 conda-forge/admin-requests#134

Merged

4 tasks

Build "fat" versions for compatibility

e1778c8

beckermr pushed a commit to conda-forge/admin-requests that referenced this pull request Oct 6, 2020

tzdata=2020.1 superseded by python-tzdata=2020.1 (#134)

d4f94e5

tzdata will now carry the upstream database as a noarch:generic package. refs: - conda-forge/tzdata-feedstock#1

Use upstream install target + manual copying

d930b2e

ocefpaf mentioned this pull request Oct 6, 2020

Python 3.9.0rc recipe conda-forge/python-feedstock#389

Merged

ocefpaf approved these changes Oct 6, 2020

View reviewed changes

mbargull mentioned this pull request Oct 6, 2020

How should we handle tzdata/zoneinfo conda-forge/python-feedstock#392

Closed

jakirkham reviewed Oct 6, 2020

View reviewed changes

recipe/meta.yaml Show resolved Hide resolved

ocefpaf mentioned this pull request Oct 6, 2020

Py39 conda-forge/python-feedstock#395

Merged

ocefpaf merged commit 2c0fd2b into conda-forge:master Oct 6, 2020

ocefpaf mentioned this pull request May 28, 2024

tzdata-feedstock does not distribute the Time Zone Databasev Data Only Distribution (i.e. tzdata*.tar.gz) ; should it? #26

Closed

1 task

ammattita6i added a commit to ammattita6i/admin-requests that referenced this pull request Aug 14, 2024

tzdata=2020.1 superseded by python-tzdata=2020.1 (#134)

39aa1f1

tzdata will now carry the upstream database as a noarch:generic package. refs: - conda-forge/tzdata-feedstock#1

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change to upstream tzdata #1

Change to upstream tzdata #1

mbargull commented Oct 6, 2020

conda-forge-linter commented Oct 6, 2020

mbargull Oct 6, 2020

mbargull Oct 6, 2020

pganssle Oct 6, 2020

mbargull Oct 6, 2020

pganssle Oct 6, 2020

mbargull Oct 6, 2020

pganssle Oct 6, 2020

mbargull Oct 6, 2020

pganssle Oct 6, 2020

mbargull Oct 6, 2020

ocefpaf commented Oct 6, 2020

mbargull commented Oct 6, 2020

ocefpaf commented Oct 6, 2020

mbargull commented Oct 6, 2020

ocefpaf commented Oct 6, 2020

pganssle commented Oct 7, 2020

		@@ -1,41 +1,72 @@
		{% set version = "2020.1" %}
		{% set version = "2020a" %}

Change to upstream tzdata #1

Change to upstream tzdata #1

Conversation

mbargull commented Oct 6, 2020

conda-forge-linter commented Oct 6, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ocefpaf commented Oct 6, 2020

mbargull commented Oct 6, 2020

ocefpaf commented Oct 6, 2020

mbargull commented Oct 6, 2020

ocefpaf commented Oct 6, 2020

pganssle commented Oct 7, 2020