Skip to content

Commit

Permalink
Merge pull request #66 from cloudblue/LITE-27691-deprecate-python-3.7
Browse files Browse the repository at this point in the history
LITE-27691: deprecate python 3.7
  • Loading branch information
maxipavlovic authored May 30, 2023
2 parents b087476 + 0538a23 commit 77be154
Show file tree
Hide file tree
Showing 7 changed files with 370 additions and 430 deletions.
10 changes: 1 addition & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11']
django-version: ['3.2', '4.1', '4.2']
exclude:
- python-version: '3.7'
django-version: '4.1'
- python-version: '3.7'
django-version: '4.2'
steps:
- name: Checkout project
uses: actions/checkout@v3
Expand All @@ -34,9 +29,6 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install poetry
- name: Replace python version
if: ${{ matrix.python-version != '3.7' }}
run: sed -i "s/python = \">=3.7,<4\"/python = \">=3.8,<4\"/" ./pyproject.toml
- name: Install dependencies
run: |
poetry install
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ Best Practices
Development
===========

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

1. Python 3.7+
1. Python 3.8+
2. Install poetry: `pip install poetry`
3. Install dependencies: `poetry install`

Expand Down
2 changes: 1 addition & 1 deletion docs/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Getting started

# Requirements

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

- Django >= 3.2.* and <= 4.1
Expand Down
683 changes: 312 additions & 371 deletions poetry.lock

Large diffs are not rendered by default.

24 changes: 20 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ classifiers = [
'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Operating System :: Unix',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
Expand All @@ -35,22 +34,23 @@ keywords = [
]

[tool.poetry.dependencies]
python = ">=3.7,<4"
lib-rql = "^1.1.5"
python = ">=3.8,<4"
django = ">=3.2"
lib-rql = "^2.0"

[tool.poetry.group.test.dependencies]
pytest = ">=7.2.0,<8"
pytest-cov = ">=2.10.1,<5"
pytest-mock = "^3.3.1"
coverage = {extras = ["toml"], version = ">=5.3,<7"}
coverage = "^7"
flake8 = ">=3.8,<6"
flake8-bugbear = ">=20,<23"
flake8-cognitive-complexity = "^0.1"
flake8-commas = "~2.1"
flake8-future-import = "~0.4"
flake8-isort = "^5.0"
flake8-broken-line = ">=0.3,<0.7"
flake8-pyproject = "^1.2.3"
pytest-django = ">=4.4.0"
djangorestframework = ">=3.12"
isort = "^5.10"
Expand Down Expand Up @@ -102,3 +102,19 @@ use_parentheses = true
include_trailing_comma = true
line_length = 100
lines_after_imports = 2

[tool.flake8]
exclude = [
".idea",
".vscode",
".git",
"pg_data",
"venv",
"*.eggs",
"*.egg",
"_generated_filters*.py",
]
show-source = true
max-line-length = 100
max-cognitive-complexity = 20
ignore = ["FI1", "W503", "W605"]
71 changes: 34 additions & 37 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,37 +1,34 @@
beautifulsoup4==4.11.2 ; python_version >= "3.7" and python_version < "4"
cached-property==1.5.2 ; python_version >= "3.7" and python_version < "3.8"
certifi==2022.12.7 ; python_version >= "3.7" and python_version < "4"
charset-normalizer==3.0.1 ; python_version >= "3.7" and python_version < "4"
click==8.1.3 ; python_version >= "3.7" and python_version < "4"
colorama==0.4.6 ; python_version >= "3.7" and python_version < "4"
ghp-import==2.1.0 ; python_version >= "3.7" and python_version < "4"
griffe==0.25.4 ; python_version >= "3.7" and python_version < "4"
idna==3.4 ; python_version >= "3.7" and python_version < "4"
importlib-metadata==4.13.0 ; python_version >= "3.7" and python_version < "3.10"
jinja2==3.1.2 ; python_version >= "3.7" and python_version < "4"
markdown==3.3.7 ; python_version >= "3.7" and python_version < "4"
markupsafe==2.1.2 ; python_version >= "3.7" and python_version < "4"
mergedeep==1.3.4 ; python_version >= "3.7" and python_version < "4"
mkdocs-autorefs==0.4.1 ; python_version >= "3.7" and python_version < "4"
mkdocs-glightbox==0.3.1 ; python_version >= "3.7" and python_version < "4"
mkdocs-macros-plugin==0.7.0 ; python_version >= "3.7" and python_version < "4"
mkdocs-material-extensions==1.1.1 ; python_version >= "3.7" and python_version < "4"
mkdocs-material==9.0.11 ; python_version >= "3.7" and python_version < "4"
mkdocs==1.4.2 ; python_version >= "3.7" and python_version < "4"
mkdocstrings-python==0.8.3 ; python_version >= "3.7" and python_version < "4"
mkdocstrings==0.20.0 ; python_version >= "3.7" and python_version < "4"
packaging==23.0 ; python_version >= "3.7" and python_version < "4"
pygments==2.14.0 ; python_version >= "3.7" and python_version < "4"
pymdown-extensions==9.9.2 ; python_version >= "3.7" and python_version < "4"
python-dateutil==2.8.2 ; python_version >= "3.7" and python_version < "4"
pyyaml-env-tag==0.1 ; python_version >= "3.7" and python_version < "4"
pyyaml==6.0 ; python_version >= "3.7" and python_version < "4"
regex==2022.10.31 ; python_version >= "3.7" and python_version < "4"
requests==2.28.2 ; python_version >= "3.7" and python_version < "4"
six==1.16.0 ; python_version >= "3.7" and python_version < "4"
soupsieve==2.3.2.post1 ; python_version >= "3.7" and python_version < "4"
termcolor==2.2.0 ; python_version >= "3.7" and python_version < "4"
typing-extensions==4.4.0 ; python_version >= "3.7" and python_version < "3.8"
urllib3==1.26.14 ; python_version >= "3.7" and python_version < "4"
watchdog==2.2.1 ; python_version >= "3.7" and python_version < "4"
zipp==3.12.1 ; python_version >= "3.7" and python_version < "3.10"
certifi==2023.5.7 ; python_version >= "3.8" and python_version < "4"
charset-normalizer==3.1.0 ; python_version >= "3.8" and python_version < "4"
click==8.1.3 ; python_version >= "3.8" and python_version < "4"
colorama==0.4.6 ; python_version >= "3.8" and python_version < "4"
ghp-import==2.1.0 ; python_version >= "3.8" and python_version < "4"
griffe==0.29.0 ; python_version >= "3.8" and python_version < "4"
idna==3.4 ; python_version >= "3.8" and python_version < "4"
importlib-metadata==4.13.0 ; python_version >= "3.8" and python_version < "3.10"
jinja2==3.1.2 ; python_version >= "3.8" and python_version < "4"
markdown==3.3.7 ; python_version >= "3.8" and python_version < "4"
markupsafe==2.1.2 ; python_version >= "3.8" and python_version < "4"
mergedeep==1.3.4 ; python_version >= "3.8" and python_version < "4"
mkdocs-autorefs==0.4.1 ; python_version >= "3.8" and python_version < "4"
mkdocs-glightbox==0.3.4 ; python_version >= "3.8" and python_version < "4"
mkdocs-macros-plugin==0.7.0 ; python_version >= "3.8" and python_version < "4"
mkdocs-material-extensions==1.1.1 ; python_version >= "3.8" and python_version < "4"
mkdocs-material==9.1.15 ; python_version >= "3.8" and python_version < "4"
mkdocs==1.4.3 ; python_version >= "3.8" and python_version < "4"
mkdocstrings-python==0.8.3 ; python_version >= "3.8" and python_version < "4"
mkdocstrings==0.22.0 ; python_version >= "3.8" and python_version < "4"
packaging==23.1 ; python_version >= "3.8" and python_version < "4"
pygments==2.15.1 ; python_version >= "3.8" and python_version < "4"
pymdown-extensions==10.0.1 ; python_version >= "3.8" and python_version < "4"
python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "4"
pyyaml-env-tag==0.1 ; python_version >= "3.8" and python_version < "4"
pyyaml==6.0 ; python_version >= "3.8" and python_version < "4"
regex==2023.5.5 ; python_version >= "3.8" and python_version < "4"
requests==2.31.0 ; python_version >= "3.8" and python_version < "4"
six==1.16.0 ; python_version >= "3.8" and python_version < "4"
termcolor==2.3.0 ; python_version >= "3.8" and python_version < "4"
typing-extensions==4.6.2 ; python_version >= "3.8" and python_version < "3.10"
urllib3==2.0.2 ; python_version >= "3.8" and python_version < "4"
watchdog==3.0.0 ; python_version >= "3.8" and python_version < "4"
zipp==3.15.0 ; python_version >= "3.8" and python_version < "3.10"
6 changes: 0 additions & 6 deletions tox.ini

This file was deleted.

0 comments on commit 77be154

Please sign in to comment.