Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
kingbuzzman authored Aug 26, 2024
2 parents bb6a4cd + ac49fb4 commit 5485cd1
Show file tree
Hide file tree
Showing 34 changed files with 367 additions and 327 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
groups:
GitHub_Actions:
patterns:
- "*" # Group all Actions updates into a single larger pull request
10 changes: 6 additions & 4 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
name: Check

on:
- push
- pull_request
push:
branches:
- "master"
pull_request:

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

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3'
cache: pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linkcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
name: Linkcheck
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3'

Expand Down
33 changes: 9 additions & 24 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,52 +1,37 @@
name: Test

on:
- push
- pull_request
push:
branches:
- "master"
pull_request:

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

jobs:
tests:
name: Python ${{ matrix.python-version }}, Database ${{ matrix.database-type }}
name: Python ${{ matrix.python-version }}
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
python-version:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "pypy-3.7"
- "pypy-3.8"
- "3.12"
- "pypy-3.9"
database-type:
- "sqlite"
- "postgres"

services:
mongodb:
image: mongo
ports:
- 27017:27017

postgresdb:
image: postgres:alpine
ports:
- 5432:5432
env:
POSTGRES_PASSWORD: password
- "pypy-3.10"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: pip
Expand Down
14 changes: 6 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,16 @@ testall:
tox

# DOC: Run tests for the currently installed version
# Remove cgi warning when dropping support for Django<=4.1.
# Remove cgi warning when dropping support for Django 3.2.
test:
mypy --ignore-missing-imports tests/test_typing.py
python \
-b \
-X dev \
-Werror \
-Wdefault:"the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses":DeprecationWarning:distutils: \
-Wdefault:"Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working":DeprecationWarning:: \
-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:: \
-Wdefault:"set_output_charset() is deprecated":DeprecationWarning:: \
-Wdefault:"parameter codeset is deprecated":DeprecationWarning:: \
-Wdefault:"'cgi' is deprecated and slated for removal in Python 3.13":DeprecationWarning:: \
-Wignore:::mongomock: \
-Wignore:::mongomock.__version__: \
-Wignore:::pkg_resources: \
-m unittest

# DOC: Test the examples
Expand Down Expand Up @@ -106,7 +104,7 @@ TAGS:

# DOC: Compile the documentation
doc:
$(MAKE) -C $(DOC_DIR) SPHINXOPTS=-W html
$(MAKE) -C $(DOC_DIR) SPHINXOPTS="-n -W" html

linkcheck:
$(MAKE) -C $(DOC_DIR) linkcheck
Expand Down
4 changes: 1 addition & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ factory_boy
:alt: Wheel status

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

factory_boy is a fixtures replacement based on thoughtbot's `factory_bot <https://github.com/thoughtbot/factory_bot>`_.
Expand Down Expand Up @@ -405,11 +405,9 @@ To test with a specific framework version, you may use a ``tox`` target:
# run tests inside a specific environment (django)
$ tox -e py310-djangomain
$ tox -e py310-djangomain-postgres
# run tests inside a specific environment (alchemy)
$ tox -e py310-alchemy
$ tox -e py310-alchemy-postgres
# run tests inside a specific environment (mongoengine)
$ tox -e py310-mongo
Expand Down
Loading

0 comments on commit 5485cd1

Please sign in to comment.