Skip to content

Commit

Permalink
Merge branch 'dev' into feature/python-3-12-support
Browse files Browse the repository at this point in the history
  • Loading branch information
barseghyanartur committed Oct 30, 2024
2 parents 6a9f3c4 + 393f85f commit e082323
Show file tree
Hide file tree
Showing 85 changed files with 3,147 additions and 2,835 deletions.
14 changes: 9 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ jobs:
python -m pip install --upgrade pip
- name: Install tox
run: |
python -m pip install --no-cache-dir tox-gh-actions pip-tools Django djangorestframework django-extensions drf_spectacular
python -m pip install --no-cache-dir tox-gh-actions uv Django djangorestframework django-extensions drf_spectacular
- name: Compile requirements
run: pip-compile examples/requirements/flask.in
run: uv pip compile examples/requirements/flask.in --no-strip-extras
- name: Install requirements
run: pip install --no-cache-dir -r examples/requirements/flask.txt
- name: Run test suite
Expand All @@ -102,7 +102,7 @@ jobs:
- "3.11"
- "3.10"
- "3.9"
- "3.8"
# - "3.8"
# - "3.7"
steps:
- name: Install wkhtmltopdf
Expand All @@ -121,9 +121,13 @@ jobs:
python -m pip install --upgrade pip
- name: Install tox
run: |
python -m pip install --no-cache-dir tox-gh-actions pip-tools Django djangorestframework django-extensions drf_spectacular
python -m pip install --no-cache-dir tox-gh-actions uv Django djangorestframework django-extensions drf_spectacular
# - name: Remove compiled requirements
# run: rm examples/requirements/ml.txt
- name: Compile requirements
run: pip-compile examples/requirements/ml.in
run: uv pip compile examples/requirements/ml.in --no-strip-extras -o examples/requirements/ml.txt
# - name: Install package
# run: pip install .[all]
- name: Install requirements
run: pip install --no-cache-dir -r examples/requirements/ml.txt
- name: Run test suite
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repos:
args: []

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.6.0
hooks:
- id: trailing-whitespace
exclude: "data/"
Expand All @@ -33,23 +33,23 @@ repos:
- id: check-merge-conflict

- repo: https://github.com/psf/black
rev: 23.1.0
rev: 24.4.2
hooks:
- id: black
name: black
files: .
args: [ "--config", "pyproject.toml" ]

- repo: https://github.com/pycqa/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
name: isort
files: .
args: [ "--settings-path", "pyproject.toml", "--profile=black" ]

- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.252
rev: v0.4.4
hooks:
- id: ruff
name: lint
Expand Down
14 changes: 7 additions & 7 deletions .secrets.baseline
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.4.0",
"version": "1.5.0",
"plugins_used": [
{
"name": "ArtifactoryDetector"
Expand Down Expand Up @@ -118,14 +118,14 @@
"filename": "Makefile",
"hashed_secret": "504a5c3a2ce5fa0acc5f8d9685dc45860c25a8ed",
"is_verified": true,
"line_number": 100
"line_number": 283
},
{
"type": "Secret Keyword",
"filename": "Makefile",
"hashed_secret": "a3dd3453449ace4d9d2320fa941a909b57c0e846",
"is_verified": true,
"line_number": 103
"line_number": 286
}
],
"README.rst": [
Expand Down Expand Up @@ -170,7 +170,7 @@
"filename": "examples/sqlalchemy_example/faker_file_admin/alembic/versions/2695cb77cdf2_create_product_table.py",
"hashed_secret": "e303f337415ced59e878c080fbfb3b1543d2a29a",
"is_verified": true,
"line_number": 12
"line_number": 13
}
],
"src/faker_file/storages/sftp_storage.py": [
Expand All @@ -179,7 +179,7 @@
"filename": "src/faker_file/storages/sftp_storage.py",
"hashed_secret": "9d4e1e23bd5b727046a9e3b4b7db57bd8d6ee684",
"is_verified": true,
"line_number": 36
"line_number": 35
}
],
"src/faker_file/tests/data.py": [
Expand All @@ -206,7 +206,7 @@
"filename": "src/faker_file/tests/test_sftp_storage.py",
"hashed_secret": "a4b48a81cdab1e1a5dd37907d6c85ca1c61ddc7c",
"is_verified": true,
"line_number": 265
"line_number": 283
}
],
"src/faker_file/tests/test_storages.py": [
Expand All @@ -219,5 +219,5 @@
}
]
},
"generated_at": "2023-11-19T23:07:25Z"
"generated_at": "2024-09-10T21:44:07Z"
}
20 changes: 20 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,26 @@ are used for versioning (schema follows below):
0.3.4 to 0.4).
- All backwards incompatible changes are mentioned in this document.

0.17.13
-------
2024-10-30

- Upgrade `Pillow` related code to work with `Pillow`>=9.1.0 (tested with
10.x and 11.x).
- Drop EOL Python 3.8 support.

0.17.12
-------
2024-09-10

- Minor fixes.

0.17.11
-------
2023-11-20

- Minor documentation fixes.

0.17.10
-------
2023-11-19
Expand Down
Loading

0 comments on commit e082323

Please sign in to comment.