Skip to content

Commit 5485cd1

Browse files
authored
Merge branch 'master' into master
2 parents bb6a4cd + ac49fb4 commit 5485cd1

34 files changed

+367
-327
lines changed

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "monthly"
7+
groups:
8+
GitHub_Actions:
9+
patterns:
10+
- "*" # Group all Actions updates into a single larger pull request

.github/workflows/check.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
name: Check
22

33
on:
4-
- push
5-
- pull_request
4+
push:
5+
branches:
6+
- "master"
7+
pull_request:
68

79
concurrency:
810
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -25,10 +27,10 @@ jobs:
2527
TOXENV: ${{ matrix.tox-environment }}
2628

2729
steps:
28-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
2931

3032
- name: Set up Python
31-
uses: actions/setup-python@v4
33+
uses: actions/setup-python@v5
3234
with:
3335
python-version: '3'
3436
cache: pip

.github/workflows/linkcheck.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
name: Linkcheck
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313

1414
- name: Set up Python ${{ matrix.python-version }}
15-
uses: actions/setup-python@v4
15+
uses: actions/setup-python@v5
1616
with:
1717
python-version: '3'
1818

.github/workflows/test.yml

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,37 @@
11
name: Test
22

33
on:
4-
- push
5-
- pull_request
4+
push:
5+
branches:
6+
- "master"
7+
pull_request:
68

79
concurrency:
810
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
911
cancel-in-progress: true
1012

1113
jobs:
1214
tests:
13-
name: Python ${{ matrix.python-version }}, Database ${{ matrix.database-type }}
15+
name: Python ${{ matrix.python-version }}
1416
runs-on: ubuntu-latest
1517

1618
strategy:
1719
fail-fast: false
1820
matrix:
1921
python-version:
20-
- "3.7"
2122
- "3.8"
2223
- "3.9"
2324
- "3.10"
2425
- "3.11"
25-
- "pypy-3.7"
26-
- "pypy-3.8"
26+
- "3.12"
2727
- "pypy-3.9"
28-
database-type:
29-
- "sqlite"
30-
- "postgres"
31-
32-
services:
33-
mongodb:
34-
image: mongo
35-
ports:
36-
- 27017:27017
37-
38-
postgresdb:
39-
image: postgres:alpine
40-
ports:
41-
- 5432:5432
42-
env:
43-
POSTGRES_PASSWORD: password
28+
- "pypy-3.10"
4429

4530
steps:
46-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
4732

4833
- name: Set up Python ${{ matrix.python-version }}
49-
uses: actions/setup-python@v4
34+
uses: actions/setup-python@v5
5035
with:
5136
python-version: ${{ matrix.python-version }}
5237
cache: pip

Makefile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,16 @@ testall:
5252
tox
5353

5454
# DOC: Run tests for the currently installed version
55-
# Remove cgi warning when dropping support for Django<=4.1.
55+
# Remove cgi warning when dropping support for Django 3.2.
5656
test:
57+
mypy --ignore-missing-imports tests/test_typing.py
5758
python \
5859
-b \
5960
-X dev \
6061
-Werror \
61-
-Wdefault:"the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses":DeprecationWarning:distutils: \
62-
-Wdefault:"Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working":DeprecationWarning:: \
63-
-Wdefault:"Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated since Python 3.3, and in 3.9 it will stop working":DeprecationWarning:: \
64-
-Wdefault:"set_output_charset() is deprecated":DeprecationWarning:: \
65-
-Wdefault:"parameter codeset is deprecated":DeprecationWarning:: \
66-
-Wdefault:"'cgi' is deprecated and slated for removal in Python 3.13":DeprecationWarning:: \
62+
-Wignore:::mongomock: \
63+
-Wignore:::mongomock.__version__: \
64+
-Wignore:::pkg_resources: \
6765
-m unittest
6866

6967
# DOC: Test the examples
@@ -106,7 +104,7 @@ TAGS:
106104

107105
# DOC: Compile the documentation
108106
doc:
109-
$(MAKE) -C $(DOC_DIR) SPHINXOPTS=-W html
107+
$(MAKE) -C $(DOC_DIR) SPHINXOPTS="-n -W" html
110108

111109
linkcheck:
112110
$(MAKE) -C $(DOC_DIR) linkcheck

README.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ factory_boy
2020
:alt: Wheel status
2121

2222
.. image:: https://img.shields.io/pypi/l/factory_boy.svg
23-
:target: https://pypi.org/project/factory-boy/
23+
:target: https://github.com/FactoryBoy/factory_boy/blob/master/LICENSE
2424
:alt: License
2525

2626
factory_boy is a fixtures replacement based on thoughtbot's `factory_bot <https://github.com/thoughtbot/factory_bot>`_.
@@ -405,11 +405,9 @@ To test with a specific framework version, you may use a ``tox`` target:
405405
406406
# run tests inside a specific environment (django)
407407
$ tox -e py310-djangomain
408-
$ tox -e py310-djangomain-postgres
409408
410409
# run tests inside a specific environment (alchemy)
411410
$ tox -e py310-alchemy
412-
$ tox -e py310-alchemy-postgres
413411
414412
# run tests inside a specific environment (mongoengine)
415413
$ tox -e py310-mongo

0 commit comments

Comments
 (0)