Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ jobs:
build:
working_directory: ~/drf-flex-fields
docker:
- image: circleci/python:3.7.3
- image: circleci/python:3.8.17

steps:
- checkout
- run: sudo chown -R circleci:circleci /usr/local/bin
- run: sudo chown -R circleci:circleci /usr/local/lib/python3.7/site-packages
- run: sudo chown -R circleci:circleci /usr/local/lib/python3.8/site-packages
- restore_cache:
key: deps9-{{ .Branch }}-{{ checksum "requirements.txt" }}
- run:
Expand All @@ -20,8 +20,8 @@ jobs:
paths:
- ".venv"
- "/usr/local/bin"
- "/usr/local/lib/python3.7/site-packages"
- "/usr/local/lib/python3.8/site-packages"
- run:
name: Run Tests
command: |
python manage.py test
python manage.py test
9 changes: 5 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [ 3.7, 3.8, 3.9 ]
python-version: [ 3.8, 3.9 ]
django-version: [ 3.2, 4.1, 4.2 ]

steps:
- uses: actions/checkout@v3
Expand All @@ -22,9 +23,9 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Install Django ${{ matrix.django-version }}
run: |
python -m pip install "django~=${{ matrix.django-version }}"
- name: Run Tests
run: |
python manage.py test



4 changes: 2 additions & 2 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ Installation
Requirements
============

- Python >= 2.7
- Django >= 1.8
- Python = 3.8 & 3.9
- Django >= 3.2

Basics
======
Expand Down
38 changes: 19 additions & 19 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
appdirs==1.4.3
asgiref==3.4.1
attrs==19.1.0
black==19.3b0
Click==7.0
Django==3.2.18
djangorestframework==3.12.1
entrypoints==0.3
flake8==3.7.7
mccabe==0.6.1
mypy==0.910
mypy-extensions==0.4.3
pycodestyle==2.5.0
pyflakes==2.1.1
pytz==2019.1
sqlparse==0.3.0
toml==0.10.0
typed-ast==1.4.3
typing-extensions==3.10.0.0
appdirs==1.4.4
asgiref==3.7.2
attrs==23.1.0
black==23.1a1
Click==8.1.6
Django==4.2.3
djangorestframework==3.14.0
entrypoints==0.4
flake8==6.0.0
mccabe==0.7.0
mypy==1.4.1
mypy-extensions==1.0.0
pycodestyle==2.10.0
pyflakes==3.0.1
pytz==2023.3
sqlparse==0.4.4
toml==0.10.2
typed-ast==1.5.5
typing-extensions==4.7.1
12 changes: 2 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,10 @@ def readme():


classifiers = [
# Pick your license as you wish (should match "license" above)
"License :: OSI Approved :: MIT License",
# Specify the Python versions you support here. In particular, ensure
# that you indicate whether you support Python 2, Python 3 or both.
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.2",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
]
setup(
name="drf-flex-fields",
Expand Down
2 changes: 0 additions & 2 deletions tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@

USE_I18N = True

USE_L10N = True

USE_TZ = True


Expand Down
4 changes: 2 additions & 2 deletions tests/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.conf.urls import url, include
from django.urls import include, path
from rest_framework import routers
from tests.testapp.views import PetViewSet, TaggedItemViewSet

Expand All @@ -7,4 +7,4 @@
router.register(r"pets", PetViewSet, basename="pet")
router.register(r"tagged-items", TaggedItemViewSet, basename="tagged-item")

urlpatterns = [url(r"^", include(router.urls))]
urlpatterns = [path("", include(router.urls))]