Skip to content

Commit 73f34b6

Browse files
committed
Merge branch 'release/3.5.0' into master
2 parents d0b86fa + 16eb1a3 commit 73f34b6

File tree

6 files changed

+1291
-1222
lines changed

6 files changed

+1291
-1222
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ check:
6060
publish: cythonize
6161
# Merge release to master branch
6262
git checkout master
63-
git merge --no-ff release/$(VERSION) -m 'Merge branch release/$(VERSION)'
63+
git merge --no-ff release/$(VERSION) -m "Merge branch 'release/$(VERSION)' into master"
6464
git push origin master
6565
# Create and upload tag
6666
git tag -a $(VERSION) -m 'version $(VERSION)'

docs/main/changelog.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ that were made in every particular version.
77
From version 0.7.6 *Dependency Injector* framework strictly
88
follows `Semantic versioning`_
99

10-
Development version
11-
-------------------
12-
- No features.
10+
3.5.0
11+
-----
12+
- Add functionality for initializing ``Configuration`` provider with default
13+
values.
1314

1415
3.4.8
1516
-----

src/dependency_injector/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Dependency injector top-level package."""
22

3-
__version__ = '3.4.8'
3+
__version__ = '3.5.0'
44
"""Version number that follows semantic versioning.
55
66
:type: str

0 commit comments

Comments
 (0)