Merge branch 'master' into master

FactoryBoy · May 3, 2023 · 43c45c5 · 43c45c5
2 parents 5d856aa + 53b34d5
commit 43c45c5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -12,15 +12,13 @@ ChangeLog
       passwords.
     - :issue:`304`: Add :attr:`~factory.alchemy.SQLAlchemyOptions.sqlalchemy_session_factory` to dynamically
       create sessions for use by the :class:`~factory.alchemy.SQLAlchemyModelFactory`.
-    - Add support for Django 3.2
     - Add support for Django 4.0
     - Add support for Django 4.1
     - Add support for Python 3.10
+    - Add support for Python 3.11
 
 *Bugfix:*
 
-    - Do not override signals receivers registered in a :meth:`~factory.django.mute_signals` context.
-
     - Make :meth:`~factory.django.mute_signals` mute signals during post-generation.
 
     - :issue:`775`: Change the signature for :meth:`~factory.alchemy.SQLAlchemyModelFactory._save` and
@@ -54,6 +52,20 @@ ChangeLog
     - Drop support for Django 3.1
     - Drop support for Python 3.6
 
+3.2.1 (2021-10-26)
+------------------
+
+*New:*
+    - Add support for Django 3.2
+
+*Bugfix:*
+
+    - Do not override signals receivers registered in a :meth:`~factory.django.mute_signals` context.
+
+    - :issue:`775`: Change the signature for :meth:`~factory.alchemy.SQLAlchemyModelFactory._save` and
+      :meth:`~factory.alchemy.SQLAlchemyModelFactory._get_or_create` to avoid argument names clashes with a field named
+      ``session``.
+
 3.2.0 (2020-12-28)
 ------------------
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -79,7 +79,7 @@
 
 # -- intersphinx -------------------------------------------------------------
 intersphinx_mapping = {
-    'https://docs.python.org/': None,
+    'python': ('https://docs.python.org/3', None),
     'django': (
         'https://docs.djangoproject.com/en/dev/',
         'https://docs.djangoproject.com/en/dev/_objects/',

diff --git a/setup.cfg b/setup.cfg
@@ -35,7 +35,6 @@ classifiers =
     Topic :: Software Development :: Libraries :: Python Modules
 
 [options]
-zip_safe = false
 packages = factory
 python_requires = >=3.7
 install_requires =