From fb40caaa24511007391ff15c8f14ad81b4999f06 Mon Sep 17 00:00:00 2001 From: George Dorn Date: Tue, 5 Sep 2023 17:33:39 -0700 Subject: [PATCH 1/5] Test adding dev back to tox --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 3cd989ff9..eb2de3211 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"] - django-version: ["3.2", "4.0", "4.1", "4.2"] # Todo: add "dev" back + django-version: ["3.2", "4.0", "4.1", "4.2", "dev"] # Todo: add "dev" back exclude: - python-version: "3.6" django-version: "4.0" From 35b34b0f9d9402a7a72d5b43e6656d96cf2ec484 Mon Sep 17 00:00:00 2001 From: George Dorn Date: Tue, 5 Sep 2023 17:37:34 -0700 Subject: [PATCH 2/5] Fix python version and django version excludes, especially for dev --- .github/workflows/python-package.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index eb2de3211..f0ab99071 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -20,20 +20,24 @@ jobs: exclude: - python-version: "3.6" django-version: "4.0" - - python-version: "3.7" - django-version: "4.0" - python-version: "3.6" django-version: "4.1" - - python-version: "3.7" - django-version: "4.1" - python-version: "3.6" django-version: "4.2" + - python-version: "3.6" + django-version: "dev" + - python-version: "3.7" + django-version: "4.0" + - python-version: "3.7" + django-version: "4.1" - python-version: "3.7" django-version: "4.2" -# - python-version: "3.6" -# django-version: "dev" -# - python-version: "3.7" -# django-version: "dev" + - python-version: "3.7" + django-version: "dev" + - python-version: "3.8" + django-version: "dev" + - python-version: "3.9" + django-version: "dev" steps: - uses: actions/checkout@v2 From 51f9149e64ffd79bf481fcf5e50901e011f618ba Mon Sep 17 00:00:00 2001 From: George Dorn Date: Tue, 5 Sep 2023 18:00:15 -0700 Subject: [PATCH 3/5] Try running dev with ignoring results --- .github/workflows/python-package.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index f0ab99071..cd8f1b523 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -64,6 +64,11 @@ jobs: - name: Test with Tox run: | tox -e py${{matrix.python-version}}-dj${{matrix.django-version}} + if: ${{matrix.django-version}} != "dev" + - name: Test with Tox (Dev) + run: | + - tox -e py${{matrix.python-version}}-dj${{matrix.django-version}} + if: ${{matrix.django-version}} == "dev" - name: Upload coverage data to coveralls.io run: coveralls --service=github continue-on-error: true From cc2e69aa033b4af9009372924b4bd1a7f859d62b Mon Sep 17 00:00:00 2001 From: George Dorn Date: Tue, 5 Sep 2023 18:07:44 -0700 Subject: [PATCH 4/5] Maybe fix if statement syntax --- .github/workflows/python-package.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index cd8f1b523..7d6c9f0f6 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -64,11 +64,12 @@ jobs: - name: Test with Tox run: | tox -e py${{matrix.python-version}}-dj${{matrix.django-version}} - if: ${{matrix.django-version}} != "dev" + if: ${{matrix.django-version != 'dev'}} - name: Test with Tox (Dev) + if: ${{matrix.django-version == 'dev'}} run: | - - tox -e py${{matrix.python-version}}-dj${{matrix.django-version}} - if: ${{matrix.django-version}} == "dev" + tox -e py${{matrix.python-version}}-dj${{matrix.django-version}} + continue-on-error: true - name: Upload coverage data to coveralls.io run: coveralls --service=github continue-on-error: true From 4aaf61b4fa8cd7e2d0a39671e69d02b78c2ff8d3 Mon Sep 17 00:00:00 2001 From: George Dorn Date: Tue, 5 Sep 2023 18:13:37 -0700 Subject: [PATCH 5/5] Test fixing datetime_safe removal --- tastypie/fields.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tastypie/fields.py b/tastypie/fields.py index 5711f18a4..e51ff9968 100644 --- a/tastypie/fields.py +++ b/tastypie/fields.py @@ -12,7 +12,6 @@ except ImportError: from django.db.models.fields.related_descriptors import\ ReverseOneToOneDescriptor -from django.utils import datetime_safe from tastypie.bundle import Bundle from tastypie.exceptions import ApiFieldError, NotFound @@ -351,7 +350,7 @@ def convert(self, value): try: year, month, day = value[:10].split('-') - return datetime_safe.date(int(year), int(month), int(day)) + return datetime.date(int(year), int(month), int(day)) except ValueError: raise ApiFieldError("Date provided to '%s' field doesn't appear to be a valid date string: '%s'" % (self.instance_name, value)) @@ -389,7 +388,7 @@ def convert(self, value): year, month, day = value[:10].split('-') hour, minute, second = value[11:19].split(':') - return make_aware(datetime_safe.datetime(int(year), int(month), int(day), int(hour), int(minute), int(second))) + return make_aware(datetime.datetime(int(year), int(month), int(day), int(hour), int(minute), int(second))) except ValueError: raise ApiFieldError("Datetime provided to '%s' field doesn't appear to be a valid datetime string: '%s'" % (self.instance_name, value))