Skip to content

Commit

Permalink
Merge pull request #48 from alexferl/bump-versions
Browse files Browse the repository at this point in the history
update deps
  • Loading branch information
alexferl authored Apr 3, 2024
2 parents 9687824 + 350468e commit 038c0ac
Show file tree
Hide file tree
Showing 9 changed files with 185 additions and 183 deletions.
17 changes: 13 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
include:
- os: ubuntu-latest
python-version: '3.8'
FLASK: 3.0.0
FLASK: 3.0.2
- os: ubuntu-latest
python-version: '3.8'
FLASK: 2.3.3
Expand All @@ -23,7 +23,7 @@ jobs:
FLASK: 2.2.5
- os: ubuntu-latest
python-version: '3.9'
FLASK: 3.0.0
FLASK: 3.0.2
- os: ubuntu-latest
python-version: '3.9'
FLASK: 2.3.3
Expand All @@ -32,7 +32,7 @@ jobs:
FLASK: 2.2.5
- os: ubuntu-latest
python-version: '3.10'
FLASK: 3.0.0
FLASK: 3.0.2
- os: ubuntu-latest
python-version: '3.10'
FLASK: 2.3.3
Expand All @@ -41,13 +41,22 @@ jobs:
FLASK: 2.2.5
- os: ubuntu-latest
python-version: '3.11'
FLASK: 3.0.0
FLASK: 3.0.2
- os: ubuntu-latest
python-version: '3.11'
FLASK: 2.3.3
- os: ubuntu-latest
python-version: '3.11'
FLASK: 2.2.5
- os: ubuntu-latest
python-version: '3.12'
FLASK: 3.0.2
- os: ubuntu-latest
python-version: '3.12'
FLASK: 2.3.3
- os: ubuntu-latest
python-version: '3.12'
FLASK: 2.2.5
steps:
- name: 'Set up Python ${{ matrix.python-version }}'
uses: actions/setup-python@v5
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: mixed-line-ending
args: ['--fix=lf']
description: Forces to replace line ending by the UNIX 'lf' character.
- repo: https://github.com/psf/black
rev: 23.9.1
rev: 24.3.0
hooks:
- id: black
language_version: python3
Expand Down
7 changes: 0 additions & 7 deletions AUTHORS

This file was deleted.

10 changes: 5 additions & 5 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ verify_ssl = true
name = "pypi"

[packages]
mysqlclient = "==2.2.0"
flask = "==3.0.0"
mysqlclient = "==2.2.4"
flask = "==3.0.2"

[dev-packages]
black = "==23.9.1"
pre-commit = "==3.4.0"
pytest = "==7.4.2"
black = "==24.3.0"
pre-commit = "==3.5.0"
pytest = "==8.1.1"
287 changes: 145 additions & 142 deletions Pipfile.lock

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# Flask-MySQLdb

Flask-MySQLdb provides MySQL connection for Flask.

## Quickstart

First, you _may_ need to install some dependencies for [mysqlclient](https://github.com/PyMySQL/mysqlclient)
if you don't already have them, see [here](https://github.com/PyMySQL/mysqlclient#install).

Expand All @@ -13,7 +11,7 @@ pip install flask-mysqldb
```

Flask-MySQLdb depends, and will install for you, recent versions of Flask
(1.0.4 or later) and [mysqlclient](https://github.com/PyMySQL/mysqlclient).
(2.2.5 or later) and [mysqlclient](https://github.com/PyMySQL/mysqlclient).
Flask-MySQLdb is compatible with and tested with Python 3.8+.

Next, add a `MySQL` instance to your code:
Expand Down Expand Up @@ -48,7 +46,6 @@ if __name__ == "__main__":
Other configuration directives can be found [here](https://github.com/alexferl/flask-mysqldb/blob/master/flask_mysqldb/__init__.py#L31).

## Why

Why would you want to use this extension versus just using MySQLdb by itself?
The only reason is that the extension was made using Flask's best practices in relation
to resources that need caching on the [app context](https://flask.palletsprojects.com/en/2.0.x/appcontext/).
Expand All @@ -57,5 +54,4 @@ for you while with if you were just using MySQLdb you would have to do it yourse


## Resources

- [PyPI](https://pypi.org/project/Flask-MySQLdb/)
24 changes: 12 additions & 12 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
-i https://pypi.org/simple
black==23.9.1; python_version >= '3.8'
black==24.3.0; python_version >= '3.8'
cfgv==3.4.0; python_version >= '3.8'
click==8.1.7; python_version >= '3.7'
distlib==0.3.7
filelock==3.12.4; python_version >= '3.8'
identify==2.5.30; python_version >= '3.8'
distlib==0.3.8
filelock==3.13.3; python_version >= '3.8'
identify==2.5.35; python_version >= '3.8'
iniconfig==2.0.0; python_version >= '3.7'
mypy-extensions==1.0.0; python_version >= '3.5'
nodeenv==1.8.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'
packaging==23.2; python_version >= '3.7'
pathspec==0.11.2; python_version >= '3.7'
platformdirs==3.11.0; python_version >= '3.7'
pluggy==1.3.0; python_version >= '3.8'
pre-commit==3.4.0; python_version >= '3.8'
pytest==7.4.2; python_version >= '3.7'
packaging==24.0; python_version >= '3.7'
pathspec==0.12.1; python_version >= '3.8'
platformdirs==4.2.0; python_version >= '3.8'
pluggy==1.4.0; python_version >= '3.8'
pre-commit==3.5.0; python_version >= '3.8'
pytest==8.1.1; python_version >= '3.8'
pyyaml==6.0.1; python_version >= '3.6'
setuptools==68.2.2; python_version >= '3.8'
virtualenv==20.24.5; python_version >= '3.7'
setuptools==69.2.0; python_version >= '3.8'
virtualenv==20.25.1; python_version >= '3.7'
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
-i https://pypi.org/simple
blinker==1.6.2; python_version >= '3.7'
blinker==1.7.0; python_version >= '3.8'
click==8.1.7; python_version >= '3.7'
flask==3.0.0; python_version >= '3.8'
flask==3.0.2; python_version >= '3.8'
itsdangerous==2.1.2; python_version >= '3.7'
jinja2==3.1.3; python_version >= '3.7'
markupsafe==2.1.3; python_version >= '3.7'
mysqlclient==2.2.0; python_version >= '3.8'
werkzeug==3.0.1; python_version >= '3.8'
markupsafe==2.1.5; python_version >= '3.7'
mysqlclient==2.2.4; python_version >= '3.8'
werkzeug==3.0.2; python_version >= '3.8'
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ classifiers =
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Topic :: Software Development :: Libraries :: Python Modules

[options]
zip_safe = False
include_package_data = True
python_requires = >=3.8
install_requires =
Flask>=1.0.4
Flask>=2.2.5
mysqlclient>=2.2.0

0 comments on commit 038c0ac

Please sign in to comment.