From e3debb869783358fd328d8c395bbdf4d2fb19891 Mon Sep 17 00:00:00 2001 From: David Kasakaitis Date: Tue, 23 Jan 2024 14:19:21 +0000 Subject: [PATCH 1/4] chore: deps update --- requirements.txt | 3 ++- setup.cfg | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4c49beb..3b3abe8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ -pendulum==2.1.2 +setuptools==69.0.3 +pendulum>=2.1.2 requests>=2.23.0 click==8.1.3 inquirer==2.9.1 diff --git a/setup.cfg b/setup.cfg index 35a6149..6e43309 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,6 +20,7 @@ classifier = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Programming Language :: Python :: Implementation :: CPython Development Status :: 5 - Production/Stable Topic :: Office/Business :: Scheduling From a231d116ff35eeecfb84f76210c655d1298cc2b9 Mon Sep 17 00:00:00 2001 From: David Kasakaitis Date: Wed, 24 Jan 2024 11:18:41 +0000 Subject: [PATCH 2/4] chore: changed pendulumn to static version & removed 3.7 from setup config --- requirements.txt | 2 +- setup.cfg | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3b3abe8..762e25a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ setuptools==69.0.3 -pendulum>=2.1.2 +pendulum==3.0.0 requests>=2.23.0 click==8.1.3 inquirer==2.9.1 diff --git a/setup.cfg b/setup.cfg index 6e43309..7305e2e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,7 +7,7 @@ author = D. Robert Adams & Adam Uhlir author_email = adam@uhlir.dev license = MIT home_page = https://toggl.uhlir.dev -python_requires = >=3.7.0 +python_requires = >=3.8.0 project_urls = Source = https://github.com/auhau/toggl-cli Documentation = https://toggl.uhlir.devg @@ -15,7 +15,6 @@ classifier = License :: OSI Approved :: MIT License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 From 3cd74e855d629fdedfd04fe9c893a1c2b035ed48 Mon Sep 17 00:00:00 2001 From: David Kasakaitis Date: Wed, 24 Jan 2024 11:44:08 +0000 Subject: [PATCH 3/4] fix: changed pendulum to call the function to actually retrieve the tzs --- toggl/utils/migrations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toggl/utils/migrations.py b/toggl/utils/migrations.py index b5a125f..e011138 100644 --- a/toggl/utils/migrations.py +++ b/toggl/utils/migrations.py @@ -97,7 +97,7 @@ def migrate_datetime(parser): # type: (configparser.ConfigParser) -> None @staticmethod def migrate_timezone(parser): # type: (configparser.ConfigParser) -> None tz = parser.get('options', 'timezone') - if tz not in pendulum.timezones: + if tz not in pendulum.timezones(): click.echo('We have not recognized your timezone!') new_tz = inquirer.shortcuts.text( 'Please enter valid timezone. Default is your system\'s timezone.', From 25a93016e94957fa3d7195da8f5b1b2885ffefdf Mon Sep 17 00:00:00 2001 From: David Kasakaitis Date: Wed, 24 Jan 2024 14:01:28 +0000 Subject: [PATCH 4/4] chore: adjusted python testing targets --- .github/workflows/tests.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 2387723..a302d74 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -3,10 +3,10 @@ name: Tests on: push: branches: - - 'master' + - "master" pull_request: branches: - - '**' + - "**" jobs: python: @@ -15,7 +15,7 @@ jobs: strategy: max-parallel: 1 matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - name: Checkout @@ -26,7 +26,7 @@ jobs: - name: Use Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: - cache: 'pip' + cache: "pip" python-version: ${{ matrix.python-version }} - name: Install requirements