diff --git a/.flake8 b/.flake8
new file mode 100644
index 0000000..bf2058e
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,12 @@
+[flake8]
+ignore = E203, E266, E501, W503, F403, F401
+max-line-length = 120
+max-complexity = 18
+select = B,C,E,F,W,T4,B9
+exclude =
+ .venv/*
+ demo_app/*
+ */migrations/*
+ */tests/*
+ manage.py
+ setup.py
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6fe04f2..b913900 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
- python-version: 3.8
+ python-version: "3.10"
- name: Install dependencies
run: |
@@ -31,7 +31,7 @@ jobs:
pip install -r requirements_dev.txt --user
- name: outdated
- run: pip list --outdated --not-required --user | grep . && echo "There are outdated packages" && exit 1 || echo "All packages up to date"
+ run: pip list --outdated --not-required --exclude=django --user | grep . && echo "There are outdated packages" && exit 1 || echo "All packages up to date"
black:
name: Black
@@ -40,7 +40,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
- python-version: 3.8
+ python-version: "3.10"
- name: Install dependencies
run: |
@@ -59,7 +59,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
- python-version: 3.8
+ python-version: "3.10"
- name: Install dependencies
run: |
@@ -79,7 +79,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
- python-version: 3.8
+ python-version: "3.10"
- name: Install dependencies
run: |
@@ -108,8 +108,8 @@ jobs:
max-parallel: 4
matrix:
db: [ sqlite, mysql ]
- django-version: [ "~=3.2" ]
- python-version: [ 3.8, 3.9, "3.10"]
+ django-version: [ "~=3.2", "~=4.0" ]
+ python-version: [ "3.10" ]
experimental: [ false ]
services:
@@ -169,7 +169,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
- python-version: 3.8
+ python-version: "3.10"
- name: Install dependencies
run: |
@@ -220,7 +220,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v2
with:
- python-version: 3.8
+ python-version: "3.10"
- name: Install dependencies
run: |
diff --git a/.idea/django-datatable-view.iml b/.idea/django-datatable-view.iml
index 55708e8..83d37fb 100644
--- a/.idea/django-datatable-view.iml
+++ b/.idea/django-datatable-view.iml
@@ -16,7 +16,7 @@
-
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index dcd273d..a39c4b5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
new file mode 100644
index 0000000..bd83d37
--- /dev/null
+++ b/.idea/watcherTasks.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4bcf58a..ede4d39 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,8 @@
+default_language_version:
+ python: python3.10
repos:
- repo: git://github.com/pre-commit/pre-commit-hooks
- rev: v2.3.0
+ rev: v4.0.1
hooks:
- id: check-added-large-files
args: [ '--maxkb=500' ]
@@ -19,10 +21,11 @@ repos:
exclude: .idea/.*
- id: check-json
- repo: https://github.com/ambv/black
- rev: stable
+ rev: 21.12b0
hooks:
- id: black
+ language_version: python3.10
- repo: https://gitlab.com/pycqa/flake8
- rev: 3.9.2
+ rev: 4.0.1
hooks:
- id: flake8
diff --git a/pyproject.toml b/pyproject.toml
index 94637e9..d11a4b6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.black]
line-length = 100
-target-version = ['py38']
+target-version = ['py310']
include = '\.pyi?$'
exclude = '''
/(
diff --git a/requirements.txt b/requirements.txt
index ecf44e1..50b85d0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
python-decouple
-python-dateutil~=2.8.1
+python-dateutil
six
-Django~=3.2
-pytz~=2020.5
+Django
+pytz
diff --git a/setup.py b/setup.py
index 32b6998..0f21eaf 100644
--- a/setup.py
+++ b/setup.py
@@ -33,22 +33,20 @@
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
"Framework :: Django",
- "Framework :: Django :: 3.0",
- "Framework :: Django :: 3.1",
"Framework :: Django :: 3.2",
+ "Framework :: Django :: 4.0",
"Intended Audience :: Developers",
"License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
- "Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Topic :: Software Development",
],
- python_requires=">=3.8.*",
+ python_requires=">=3.9.*",
+ install_requires=["django>=3.2", "python-dateutil"],
packages=find_packages(),
package_data={"datatableview": ["static/js/*.js", "templates/datatableview/*.html"]},
include_package_data=True,
- install_requires=["django>=3.0", "python-dateutil"],
)