From 177d213e7fc9eb99cbf8f8d03c95fd993271ef91 Mon Sep 17 00:00:00 2001
From: Oscar Dowson <odow@users.noreply.github.com>
Date: Mon, 1 Apr 2024 10:13:31 +1300
Subject: [PATCH] Prep for v1.21.0 (#3718)

---
 Project.toml          |  2 +-
 docs/Project.toml     |  2 +-
 docs/src/changelog.md | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/Project.toml b/Project.toml
index f71308cf950..c79144887f6 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "JuMP"
 uuid = "4076af6c-e467-56ae-b986-b466b2749572"
 repo = "https://github.com/jump-dev/JuMP.jl.git"
-version = "1.20.0"
+version = "1.21.0"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
diff --git a/docs/Project.toml b/docs/Project.toml
index 3b9090bdf62..633ed5cc8ae 100644
--- a/docs/Project.toml
+++ b/docs/Project.toml
@@ -56,7 +56,7 @@ Ipopt = "=1.6.2"
 JSON = "0.21"
 JSONSchema = "1"
 Literate = "2.8"
-MathOptInterface = "=1.27.0"
+MathOptInterface = "=1.27.1"
 MultiObjectiveAlgorithms = "=1.3.2"
 PATHSolver = "=1.7.4"
 Plots = "1"
diff --git a/docs/src/changelog.md b/docs/src/changelog.md
index 05795588312..037b9be5385 100644
--- a/docs/src/changelog.md
+++ b/docs/src/changelog.md
@@ -7,6 +7,40 @@ CurrentModule = JuMP
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Version 1.21.0 (March 31, 2024)
+
+### Added
+
+ - Added support for matrix inequality constraints with the [`HermitianPSDCone`](@ref)
+   (#3705)
+ - Added batched modification methods for [`set_normalized_rhs`](@ref),
+   [`set_objective_coefficient`](@ref) and [`set_normalized_coefficient`](@ref).
+   Using these methods can be more efficient for some solvers (#3716)
+ - Added the private constant `_CONSTRAINT_LIMIT_FOR_PRINTING`, which controls
+   how many constraints are printed to the screen during `print(model)`. The
+   main purpose of this is to prevent large quantities of text being printed
+   when `print(model)` is accidentally called on a large model. (#3686)
+
+### Fixed
+
+ - Changed [`Containers.SparseAxisArray`](@ref) to use an `OrderedDict` as the
+   backing data structure. Iterating over the elements in a `SparseAxisArray`
+   now iterates in the order that the elements were created. Previously, the
+   order was undefined behavior. (#3681)
+ - Fixed complex variables for non-Float64 coefficient types (#3691)
+ - Fixed `LinearAlgebra.hermitan(::AbstractJuMPScalar)` (#3693)
+ - Fixed multiplying real scalar by Hermitian matrix (#3695)
+
+### Other
+
+ - Documentation improvements (#3679) (#3683) (#3702) (#3703) (#3706) (#3696)
+   (#3708) (#3709) (#3711)
+ - Added new tutorials:
+   - [Basis matrices](@ref) (#3675)
+   - [Transitioning from MATLAB](@ref) (#3698)
+   - [Automatic differentiation of user-defined operators](@ref) (#3713)
+ - Updated versions and compat bounds (#3687) (#3707) (#3717)
+
 ## Version 1.20.0 (February 15, 2024)
 
 ### Added