Backport zoneinfo logic into dateutil.tz.tzfile

.github/workflows/validate.yml

@@ -11,6 +11,7 @@ on:
 jobs:
   test:
     strategy:
+      fail-fast: false
       matrix:
         python-version: [
           "2.7",
@@ -28,26 +29,45 @@ jobs:
         ]
         os: [ubuntu-latest, windows-latest, macos-latest]
         exclude:
+          - python-version: "3.5"
+            os: "windows-latest"
           - python-version: "2.7"
             os: "ubuntu-latest"
           - python-version: "2.7"
             os: "windows-latest"
           - python-version: "2.7"
             os: "macos-latest"
+          - python-version: "3.5"
+            os: "macos-latest"
+          - python-version: "3.6"
+            os: "macos-latest"
+          - python-version: "3.7"
+            os: "macos-latest"
           - python-version: "3.5"
             os: "ubuntu-latest"
           - python-version: "3.6"
             os: "ubuntu-latest"
         include:
           - python-version: "2.7"
             os: "ubuntu-20.04"
+            env:
+              PIP_TRUSTED_HOST: pypi.python.org,pypi.org,files.pythonhosted.org
           - python-version: "3.5"
             os: "ubuntu-20.04"
+            env:
+              PIP_TRUSTED_HOST: pypi.python.org,pypi.org,files.pythonhosted.org
           - python-version: "3.6"
             os: "ubuntu-20.04"
+            env:
+              PIP_TRUSTED_HOST: pypi.python.org,pypi.org,files.pythonhosted.org
+          - python-version: "3.5"
+            os: "windows-latest"
+            env:
+              PIP_TRUSTED_HOST: pypi.python.org,pypi.org,files.pythonhosted.org
     runs-on: ${{ matrix.os }}
     env:
       TOXENV: py
+      PIP_TRUSTED_HOST: pypi.python.org
     steps:
       - uses: actions/checkout@v3
       - if: ${{ matrix.python-version == '2.7' }}
@@ -62,31 +82,32 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
-      - name: Install dependencies
-        run: python -m pip install -U tox six
-      - name: Install zic (Windows)
+      - name: Install lzip
+        run: sudo apt-get install lzip
+        if: startsWith(matrix.os, 'ubuntu')
+      - name: Install specific tzdata version
         run: |
-          curl https://get.enterprisedb.com/postgresql/postgresql-9.5.21-2-windows-x64-binaries.zip --output $env:GITHUB_WORKSPACE\postgresql9.5.21.zip
-          unzip -oq $env:GITHUB_WORKSPACE\postgresql9.5.21.zip -d .postgresql
-        if: runner.os == 'Windows'
-      - name: Run updatezinfo.py (Windows)
-        run: |
-          $env:Path += ";$env:GITHUB_WORKSPACE\.postgresql\pgsql\bin"
-          ci_tools/retry.bat python updatezinfo.py
-        if: runner.os == 'Windows'
-      - name: Run updatezinfo.py (Unix)
-        run: ./ci_tools/retry.sh python updatezinfo.py
-        if: runner.os != 'Windows'
+          TZDATA_VERSION="2024a"
+          TMP_DIR=$(mktemp -d)
+          cd $TMP_DIR
+          curl --fail --location "https://data.iana.org/time-zones/releases/tzdb-${TZDATA_VERSION}.tar.lz" -o tzdb.tar.lz
+          tar --lzip -xf tzdb.tar.lz
+          cd tzdb-${TZDATA_VERSION}
+          sudo rm -rf /usr/share/zoneinfo
+          sudo make install DESTDIR=./tzdata \
+                            DATAFORM=main
+
+          ls tzdata
+          sudo mv ./tzdata/usr/share/zoneinfo/ /usr/share/zoneinfo
+
+          cat /usr/share/zoneinfo/tzdata.zi | head -n 1
+        if: startsWith(matrix.os, 'ubuntu')
+      - name: Install dependencies
+        run: python -m pip install -U tox
       - name: Run tox
         run: python -m tox
       - name: Generate coverage.xml
         run: python -m tox -e coverage
-      - name: Report coverage to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          file: ./.tox/coverage.xml
-          name: ${{ matrix.os }}:${{ matrix.python-version }}
-          fail_ci_if_error: true
 
   other:
     runs-on: "ubuntu-latest"
@@ -123,7 +144,7 @@ jobs:
         with:
           options: "--check --diff --color --isort"
           src: "."
-          version: "~=1.7.1"
+          version: "1.7.2"
 
   build-dist:
     runs-on: ubuntu-latest

.gitignore

@@ -21,6 +21,7 @@ src/dateutil/_version.py
 
 # Sphinx documentation
 docs/_build/
+docs/docs_venv
 
 # Timezone information
 tzdata*.tar.gz

.travis.yml

@@ -26,7 +26,6 @@ install:
       pip install -U setuptools
     fi
   - pip install -U "tox<3.8.0" $PIP_ARGS
-  - if [[ $TOXENV == "py" ]]; then ./ci_tools/retry.sh python updatezinfo.py; fi
 
 script:
   - tox

MANIFEST.in

@@ -1,4 +1,4 @@
-include LICENSE NEWS zonefile_metadata.json updatezinfo.py pyproject.toml
+include LICENSE NEWS pyproject.toml
 recursive-include tests/ *
 global-exclude __pycache__
 global-exclude *.py[co]

RELEASING

@@ -2,8 +2,6 @@ Release Checklist
 -----------------------------------------
 [ ] Update classifiers in setup.cfg to include the latest supported Python
     versions.
-[ ] Update the metadata in zonefile_metadata.json to include the latest tzdata
-    release from https://www.iana.org/time-zones.
 [ ] If necessary, update the tzdata mirror at https://github.com/dateutil/tzdata
 [ ] Update NEWS with list of changes:
     [ ] Invoke `tox -e news -- --version <NEXT_VERSION>`

appveyor.yml

@@ -17,15 +17,11 @@ install:
   - set TOXENV=py%PYTHON_VERSION%
   - if %PLATFORM% == "X64" (set PYTHON_PATH=C:\Python%PYTHON_VERSION%-x64) ELSE (set PYTHON_PATH=C:\Python%PYTHON_VERSION%)
 
-  # Add PostgreSQL (zic), Python and scripts directory to current path
-  - set PATH=%PYTHON_PATH%;c:\Program Files\PostgreSQL\9.3\bin\;%PATH%
+  # Add Python to the path
+  - set PATH=%PYTHON_PATH%;%PATH%
   - set PYTHON=%PYTHON_PATH%/python.exe
   - "%PYTHON% -c \"import sys; print(sys.executable, sys.version)\""
 
-  # This frequently fails with network errors, so we'll retry it up to 5 times
-  # with a 1 minute rate limit.
-  - "%PYTHON% -m pip install six"
-  - "ci_tools/retry.bat %PYTHON% updatezinfo.py"
   # This environment variable tells the test suite it's OK to mess with the time zone.
   - set DATEUTIL_MAY_CHANGE_TZ=1
   - C:\Python36\python -m pip install -U tox virtualenv==20.4.7

azure-pipelines.yml

@@ -64,7 +64,6 @@ steps:
 
 - bash: |
     if [[ $TOXENV == "py" ]]; then
-      ./ci_tools/retry.sh python updatezinfo.py
       python -m tox -- tests --cov-config=tox.ini --cov=dateutil --junitxml=unittests/TEST-$(Agent.JobName).xml
       python -m tox -e coverage,codecov || true
     else

ci_tools/run_tz_master_env.sh

@@ -82,16 +82,6 @@ PATH=$TMP_DIR/tzdir/usr/sbin:${PATH}
 # Stash the old zoneinfo file in the temporary directory
 mv $REPO_TARBALL $TMP_TARBALL
 
-
-# Make the metadata file
-ZONEFILE_METADATA_NAME=zonefile_metadata_master.json
-${CITOOLS_DIR}/make_zonefile_metadata.py \
-    $TARBALL_NAME \
-    $VERSION \
-    $ZONEFILE_METADATA_NAME
-
-python ${REPO_DIR}/updatezinfo.py $ZONEFILE_METADATA_NAME
-
 # Run the tests
 python -m pytest ${REPO_DIR}/tests $EXTRA_TEST_ARGS