Skip to content

Commit 77be154

Browse files
authored
Merge pull request #66 from cloudblue/LITE-27691-deprecate-python-3.7
LITE-27691: deprecate python 3.7
2 parents b087476 + 0538a23 commit 77be154

File tree

7 files changed

+370
-430
lines changed

7 files changed

+370
-430
lines changed

.github/workflows/build.yml

+1-9
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,8 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
17+
python-version: ['3.8', '3.9', '3.10', '3.11']
1818
django-version: ['3.2', '4.1', '4.2']
19-
exclude:
20-
- python-version: '3.7'
21-
django-version: '4.1'
22-
- python-version: '3.7'
23-
django-version: '4.2'
2419
steps:
2520
- name: Checkout project
2621
uses: actions/checkout@v3
@@ -34,9 +29,6 @@ jobs:
3429
run: |
3530
python -m pip install --upgrade pip
3631
pip install poetry
37-
- name: Replace python version
38-
if: ${{ matrix.python-version != '3.7' }}
39-
run: sed -i "s/python = \">=3.7,<4\"/python = \">=3.8,<4\"/" ./pyproject.toml
4032
- name: Install dependencies
4133
run: |
4234
poetry install

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ Best Practices
272272
Development
273273
===========
274274

275-
1. Python 3.7+
275+
1. Python 3.8+
276276
2. Install poetry: `pip install poetry`
277277
3. Install dependencies: `poetry install`
278278
4. We use `isort` library to order and format our imports, and we check it using `flake8-isort` library (automatically on `flake8` run).
@@ -282,7 +282,7 @@ For convenience you may run `isort .` to order imports.
282282
Testing
283283
=======
284284

285-
1. Python 3.7+
285+
1. Python 3.8+
286286
2. Install poetry: `pip install poetry`
287287
3. Install dependencies: `poetry install`
288288

docs/getting_started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Getting started
33

44
# Requirements
55

6-
`django-rql` works with Python 3.7 or newer and has the
6+
`django-rql` works with Python 3.8 or newer and has the
77
following dependencies:
88

99
- Django >= 3.2.* and <= 4.1

poetry.lock

+312-371
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+20-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ classifiers = [
1919
'Intended Audience :: Developers',
2020
'License :: OSI Approved :: Apache Software License',
2121
'Operating System :: Unix',
22-
'Programming Language :: Python :: 3.7',
2322
'Programming Language :: Python :: 3.8',
2423
'Programming Language :: Python :: 3.9',
2524
'Programming Language :: Python :: 3.10',
@@ -35,22 +34,23 @@ keywords = [
3534
]
3635

3736
[tool.poetry.dependencies]
38-
python = ">=3.7,<4"
39-
lib-rql = "^1.1.5"
37+
python = ">=3.8,<4"
4038
django = ">=3.2"
39+
lib-rql = "^2.0"
4140

4241
[tool.poetry.group.test.dependencies]
4342
pytest = ">=7.2.0,<8"
4443
pytest-cov = ">=2.10.1,<5"
4544
pytest-mock = "^3.3.1"
46-
coverage = {extras = ["toml"], version = ">=5.3,<7"}
45+
coverage = "^7"
4746
flake8 = ">=3.8,<6"
4847
flake8-bugbear = ">=20,<23"
4948
flake8-cognitive-complexity = "^0.1"
5049
flake8-commas = "~2.1"
5150
flake8-future-import = "~0.4"
5251
flake8-isort = "^5.0"
5352
flake8-broken-line = ">=0.3,<0.7"
53+
flake8-pyproject = "^1.2.3"
5454
pytest-django = ">=4.4.0"
5555
djangorestframework = ">=3.12"
5656
isort = "^5.10"
@@ -102,3 +102,19 @@ use_parentheses = true
102102
include_trailing_comma = true
103103
line_length = 100
104104
lines_after_imports = 2
105+
106+
[tool.flake8]
107+
exclude = [
108+
".idea",
109+
".vscode",
110+
".git",
111+
"pg_data",
112+
"venv",
113+
"*.eggs",
114+
"*.egg",
115+
"_generated_filters*.py",
116+
]
117+
show-source = true
118+
max-line-length = 100
119+
max-cognitive-complexity = 20
120+
ignore = ["FI1", "W503", "W605"]

requirements/docs.txt

+34-37
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,34 @@
1-
beautifulsoup4==4.11.2 ; python_version >= "3.7" and python_version < "4"
2-
cached-property==1.5.2 ; python_version >= "3.7" and python_version < "3.8"
3-
certifi==2022.12.7 ; python_version >= "3.7" and python_version < "4"
4-
charset-normalizer==3.0.1 ; python_version >= "3.7" and python_version < "4"
5-
click==8.1.3 ; python_version >= "3.7" and python_version < "4"
6-
colorama==0.4.6 ; python_version >= "3.7" and python_version < "4"
7-
ghp-import==2.1.0 ; python_version >= "3.7" and python_version < "4"
8-
griffe==0.25.4 ; python_version >= "3.7" and python_version < "4"
9-
idna==3.4 ; python_version >= "3.7" and python_version < "4"
10-
importlib-metadata==4.13.0 ; python_version >= "3.7" and python_version < "3.10"
11-
jinja2==3.1.2 ; python_version >= "3.7" and python_version < "4"
12-
markdown==3.3.7 ; python_version >= "3.7" and python_version < "4"
13-
markupsafe==2.1.2 ; python_version >= "3.7" and python_version < "4"
14-
mergedeep==1.3.4 ; python_version >= "3.7" and python_version < "4"
15-
mkdocs-autorefs==0.4.1 ; python_version >= "3.7" and python_version < "4"
16-
mkdocs-glightbox==0.3.1 ; python_version >= "3.7" and python_version < "4"
17-
mkdocs-macros-plugin==0.7.0 ; python_version >= "3.7" and python_version < "4"
18-
mkdocs-material-extensions==1.1.1 ; python_version >= "3.7" and python_version < "4"
19-
mkdocs-material==9.0.11 ; python_version >= "3.7" and python_version < "4"
20-
mkdocs==1.4.2 ; python_version >= "3.7" and python_version < "4"
21-
mkdocstrings-python==0.8.3 ; python_version >= "3.7" and python_version < "4"
22-
mkdocstrings==0.20.0 ; python_version >= "3.7" and python_version < "4"
23-
packaging==23.0 ; python_version >= "3.7" and python_version < "4"
24-
pygments==2.14.0 ; python_version >= "3.7" and python_version < "4"
25-
pymdown-extensions==9.9.2 ; python_version >= "3.7" and python_version < "4"
26-
python-dateutil==2.8.2 ; python_version >= "3.7" and python_version < "4"
27-
pyyaml-env-tag==0.1 ; python_version >= "3.7" and python_version < "4"
28-
pyyaml==6.0 ; python_version >= "3.7" and python_version < "4"
29-
regex==2022.10.31 ; python_version >= "3.7" and python_version < "4"
30-
requests==2.28.2 ; python_version >= "3.7" and python_version < "4"
31-
six==1.16.0 ; python_version >= "3.7" and python_version < "4"
32-
soupsieve==2.3.2.post1 ; python_version >= "3.7" and python_version < "4"
33-
termcolor==2.2.0 ; python_version >= "3.7" and python_version < "4"
34-
typing-extensions==4.4.0 ; python_version >= "3.7" and python_version < "3.8"
35-
urllib3==1.26.14 ; python_version >= "3.7" and python_version < "4"
36-
watchdog==2.2.1 ; python_version >= "3.7" and python_version < "4"
37-
zipp==3.12.1 ; python_version >= "3.7" and python_version < "3.10"
1+
certifi==2023.5.7 ; python_version >= "3.8" and python_version < "4"
2+
charset-normalizer==3.1.0 ; python_version >= "3.8" and python_version < "4"
3+
click==8.1.3 ; python_version >= "3.8" and python_version < "4"
4+
colorama==0.4.6 ; python_version >= "3.8" and python_version < "4"
5+
ghp-import==2.1.0 ; python_version >= "3.8" and python_version < "4"
6+
griffe==0.29.0 ; python_version >= "3.8" and python_version < "4"
7+
idna==3.4 ; python_version >= "3.8" and python_version < "4"
8+
importlib-metadata==4.13.0 ; python_version >= "3.8" and python_version < "3.10"
9+
jinja2==3.1.2 ; python_version >= "3.8" and python_version < "4"
10+
markdown==3.3.7 ; python_version >= "3.8" and python_version < "4"
11+
markupsafe==2.1.2 ; python_version >= "3.8" and python_version < "4"
12+
mergedeep==1.3.4 ; python_version >= "3.8" and python_version < "4"
13+
mkdocs-autorefs==0.4.1 ; python_version >= "3.8" and python_version < "4"
14+
mkdocs-glightbox==0.3.4 ; python_version >= "3.8" and python_version < "4"
15+
mkdocs-macros-plugin==0.7.0 ; python_version >= "3.8" and python_version < "4"
16+
mkdocs-material-extensions==1.1.1 ; python_version >= "3.8" and python_version < "4"
17+
mkdocs-material==9.1.15 ; python_version >= "3.8" and python_version < "4"
18+
mkdocs==1.4.3 ; python_version >= "3.8" and python_version < "4"
19+
mkdocstrings-python==0.8.3 ; python_version >= "3.8" and python_version < "4"
20+
mkdocstrings==0.22.0 ; python_version >= "3.8" and python_version < "4"
21+
packaging==23.1 ; python_version >= "3.8" and python_version < "4"
22+
pygments==2.15.1 ; python_version >= "3.8" and python_version < "4"
23+
pymdown-extensions==10.0.1 ; python_version >= "3.8" and python_version < "4"
24+
python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "4"
25+
pyyaml-env-tag==0.1 ; python_version >= "3.8" and python_version < "4"
26+
pyyaml==6.0 ; python_version >= "3.8" and python_version < "4"
27+
regex==2023.5.5 ; python_version >= "3.8" and python_version < "4"
28+
requests==2.31.0 ; python_version >= "3.8" and python_version < "4"
29+
six==1.16.0 ; python_version >= "3.8" and python_version < "4"
30+
termcolor==2.3.0 ; python_version >= "3.8" and python_version < "4"
31+
typing-extensions==4.6.2 ; python_version >= "3.8" and python_version < "3.10"
32+
urllib3==2.0.2 ; python_version >= "3.8" and python_version < "4"
33+
watchdog==3.0.0 ; python_version >= "3.8" and python_version < "4"
34+
zipp==3.15.0 ; python_version >= "3.8" and python_version < "3.10"

tox.ini

-6
This file was deleted.

0 commit comments

Comments
 (0)