From 94f413ab9677927b73f9cfcf2885b2c7ef4c0999 Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 4 Dec 2024 19:54:18 -0500 Subject: [PATCH 1/4] Add tazdata as dev dependencies and sync with tox.ini --- setup.py | 1 + tox.ini | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 23936a75d..122a68d9c 100755 --- a/setup.py +++ b/setup.py @@ -72,6 +72,7 @@ def run(self): 'pytest>=6.0', 'pytest-cov', 'freezegun~=1.0', + 'tzdata', ], }, cmdclass={'import_cldr': import_cldr}, diff --git a/tox.ini b/tox.ini index 70e5e7ed2..9cc9db5c5 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,6 @@ extras = deps = {env:BABEL_TOX_EXTRA_DEPS:} backports.zoneinfo;python_version<"3.9" - tzdata;sys_platform == 'win32' pytz: pytz setuptools: setuptools jinja: jinja2>=3.0 From 7832980226a572064dd33af64e560405d0e91223 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 13 Dec 2024 13:11:38 -0500 Subject: [PATCH 2/4] sync tox.ini and setup.py dependencies --- setup.py | 6 +++++- tox.ini | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 122a68d9c..f7ef8483c 100755 --- a/setup.py +++ b/setup.py @@ -72,7 +72,11 @@ def run(self): 'pytest>=6.0', 'pytest-cov', 'freezegun~=1.0', - 'tzdata', + "tzdata;sys_platform == 'win32'", + 'backports.zoneinfo; python_version<"3.9"', + 'pytz', + 'setuptools', + 'jinja2>=3.0', ], }, cmdclass={'import_cldr': import_cldr}, diff --git a/tox.ini b/tox.ini index 9cc9db5c5..e6958b87f 100644 --- a/tox.ini +++ b/tox.ini @@ -10,12 +10,6 @@ envlist = [testenv] extras = dev -deps = - {env:BABEL_TOX_EXTRA_DEPS:} - backports.zoneinfo;python_version<"3.9" - pytz: pytz - setuptools: setuptools - jinja: jinja2>=3.0 allowlist_externals = make commands = make clean-cldr test setenv = From c1bf7bd4c5d6abe82b1170d23c961403ef95837a Mon Sep 17 00:00:00 2001 From: wandrew004 <60816885+wandrew004@users.noreply.github.com> Date: Sat, 14 Dec 2024 11:47:37 -0500 Subject: [PATCH 3/4] fix spacing setup.py Co-authored-by: Tomas R. --- setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index f7ef8483c..d6f775cda 100755 --- a/setup.py +++ b/setup.py @@ -72,11 +72,11 @@ def run(self): 'pytest>=6.0', 'pytest-cov', 'freezegun~=1.0', - "tzdata;sys_platform == 'win32'", - 'backports.zoneinfo; python_version<"3.9"', - 'pytz', - 'setuptools', - 'jinja2>=3.0', + "tzdata;sys_platform == 'win32'", + 'backports.zoneinfo; python_version<"3.9"', + 'pytz', + 'setuptools', + 'jinja2>=3.0', ], }, cmdclass={'import_cldr': import_cldr}, From 7c6794a1ae085ec8c712e51797cbc5b25b66f1ba Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Wed, 8 Jan 2025 14:32:15 +0200 Subject: [PATCH 4/4] Fix lint failure, reinstate BABEL_TOX_EXTRA_DEPS --- setup.py | 14 +++++++------- tox.ini | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index d6f775cda..c8cdb9d0a 100755 --- a/setup.py +++ b/setup.py @@ -69,14 +69,14 @@ def run(self): ], extras_require={ 'dev': [ - 'pytest>=6.0', - 'pytest-cov', + "tzdata;sys_platform == 'win32'", + 'backports.zoneinfo; python_version<"3.9"', 'freezegun~=1.0', - "tzdata;sys_platform == 'win32'", - 'backports.zoneinfo; python_version<"3.9"', - 'pytz', - 'setuptools', - 'jinja2>=3.0', + 'jinja2>=3.0', + 'pytest-cov', + 'pytest>=6.0', + 'pytz', + 'setuptools', ], }, cmdclass={'import_cldr': import_cldr}, diff --git a/tox.ini b/tox.ini index 99b9cb034..8aaa8a3e3 100644 --- a/tox.ini +++ b/tox.ini @@ -10,6 +10,7 @@ envlist = [testenv] extras = dev +deps = {env:BABEL_TOX_EXTRA_DEPS:} allowlist_externals = make commands = make clean-cldr test setenv =