Skip to content

Commit 176e812

Browse files
authored
Merge pull request #545 from joke2k/develop
Release v0.12.0
2 parents df301b6 + 993b36c commit 176e812

39 files changed

+393
-121
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ jobs:
2424

2525
steps:
2626
- name: Checkout code
27-
uses: actions/checkout@v3.6.0
27+
uses: actions/checkout@v4.2.2
2828

29-
- name: Set up Python 3.10
30-
uses: actions/setup-python@v4.7.0
29+
- name: Set up Python 3.12
30+
uses: actions/setup-python@v5.3.0
3131
with:
32-
python-version: '3.10'
32+
python-version: '3.12'
3333

3434
- name: Install dependencies
3535
run: |
3636
python -m pip install --upgrade pip
37-
pip install tox tox-gh-actions
37+
pip install tox tox-gh-actions setuptools
3838
3939
- name: Check MANIFEST.in for completeness
4040
run: tox -e manifest
@@ -44,7 +44,7 @@ jobs:
4444

4545
- name: Archive build artifacts
4646
if: success()
47-
uses: actions/upload-artifact@v3
47+
uses: actions/upload-artifact@v4
4848
with:
4949
# To ensure that jobs don't overwrite existing artifacts,
5050
# use a different name per job.
@@ -64,12 +64,12 @@ jobs:
6464

6565
steps:
6666
- name: Checkout code
67-
uses: actions/checkout@v3.6.0
67+
uses: actions/checkout@v4.2.2
6868

69-
- name: Set up Python 3.10
70-
uses: actions/setup-python@v4.7.0
69+
- name: Set up Python 3.12
70+
uses: actions/setup-python@v5.3.0
7171
with:
72-
python-version: '3.10'
72+
python-version: '3.12'
7373

7474
- name: Install in dev mode
7575
run: python -m pip install -e .

.github/workflows/change-pr-target.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
check-branch:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: Vankka/pr-target-branch-action@v2
11+
- uses: Vankka/pr-target-branch-action@v3
1212
env:
1313
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1414
with:

.github/workflows/ci.yml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,38 +47,29 @@ jobs:
4747

4848
matrix:
4949
python:
50-
- '3.8'
5150
- '3.9'
5251
- '3.10'
5352
- '3.11'
54-
- 'pypy-3.7'
53+
- '3.12'
54+
- '3.13'
55+
- 'pypy-3.10'
5556
os: [ ubuntu-latest, macos-latest, windows-latest ]
5657

57-
# These versions are no longer supported by Python team, and may
58-
# eventually be dropped from GitHub Actions. The support of these
59-
# versions by django-environ will continue for as long as possible,
60-
# and may be discontinued at any time.
61-
include:
62-
- python: '3.6'
63-
os: ubuntu-20.04
64-
- python: '3.7'
65-
os: ubuntu-20.04
66-
6758
steps:
6859
- name: Checkout code
69-
uses: actions/checkout@v3.6.0
60+
uses: actions/checkout@v4.2.2
7061
with:
7162
fetch-depth: 5
7263

7364
- name: Set up Python ${{ matrix.python }}
74-
uses: actions/setup-python@v4.7.0
65+
uses: actions/setup-python@v5.3.0
7566
with:
7667
python-version: ${{ matrix.python }}
7768

7869
- name: Install dependencies
7970
run: |
8071
python -m pip install --upgrade pip
81-
python -m pip install tox tox-gh-actions
72+
python -m pip install tox tox-gh-actions setuptools
8273
8374
- name: Setuptools self-test
8475
run: |

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ jobs:
4545

4646
steps:
4747
- name: Checkout repository
48-
uses: actions/checkout@v3.6.0
48+
uses: actions/checkout@v4.2.2
4949

5050
# Initializes the CodeQL tools for scanning.
5151
- name: Initialize CodeQL
52-
uses: github/codeql-action/init@v2
52+
uses: github/codeql-action/init@v3
5353
with:
5454
languages: ${{ matrix.language }}
5555

5656
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v2
57+
uses: github/codeql-action/autobuild@v3
5858

5959
- name: Perform CodeQL Analysis
60-
uses: github/codeql-action/analyze@v2
60+
uses: github/codeql-action/analyze@v3

.github/workflows/cs.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ jobs:
2525

2626
steps:
2727
- name: Checkout code
28-
uses: actions/checkout@v3.6.0
28+
uses: actions/checkout@v4.2.2
2929

30-
- name: Set up Python 3.10
31-
uses: actions/setup-python@v4.7.0
30+
- name: Set up Python 3.12
31+
uses: actions/setup-python@v5.3.0
3232
with:
33-
python-version: '3.10'
33+
python-version: '3.12'
3434

3535
- name: Install dependencies
3636
run: |
3737
python -m pip install --upgrade pip
38-
pip install tox tox-gh-actions
38+
pip install tox tox-gh-actions setuptools
3939
4040
- name: Lint with tox
4141
run: tox -e lint

.github/workflows/docs.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ jobs:
2626

2727
steps:
2828
- name: Checkout code
29-
uses: actions/checkout@v3.6.0
29+
uses: actions/checkout@v4.2.2
3030

31-
- name: Set up Python 3.10
32-
uses: actions/setup-python@v4.7.0
31+
- name: Set up Python 3.12
32+
uses: actions/setup-python@v5.3.0
3333
with:
34-
python-version: '3.10'
34+
python-version: '3.12'
3535

3636
- name: Install dependencies
3737
run: |
3838
python -m pip install --upgrade pip
39-
pip install tox tox-gh-actions
39+
pip install tox tox-gh-actions setuptools
4040
4141
- name: Check external links in the package documentation
4242
run: tox -e linkcheck
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: Archive docs artifacts
4848
if: always()
49-
uses: actions/upload-artifact@v3
49+
uses: actions/upload-artifact@v4
5050
with:
5151
name: docs
5252
path: docs

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is part of the django-environ.
22
#
3-
# Copyright (c) 2021, Serghei Iakovlev <[email protected]>
3+
# Copyright (c) 2021-2024, Serghei Iakovlev <[email protected]>
44
# Copyright (c) 2013-2021, Daniele Faraglia <[email protected]>
55
#
66
# For the full copyright and license information, please view

.readthedocs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is part of the django-environ.
22
#
3-
# Copyright (c) 2021, Serghei Iakovlev <[email protected]>
3+
# Copyright (c) 2021-2024, Serghei Iakovlev <[email protected]>
44
# Copyright (c) 2013-2021, Daniele Faraglia <[email protected]>
55
#
66
# For the full copyright and license information, please view
@@ -17,7 +17,7 @@ build:
1717
tools:
1818
# Keep version in sync with tox.ini (testenv:docs) and
1919
# docs.yml (GitHub Action Workflow).
20-
python: '3.10'
20+
python: '3.12'
2121

2222
python:
2323
install:

CHANGELOG.rst

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,41 @@ All notable changes to this project will be documented in this file.
55
The format is inspired by `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`_
66
and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0.html>`_.
77

8+
`v0.12.0`_ - 8-November-2024
9+
-----------------------------
10+
Fixed
11+
+++++
12+
- Include prefix in the ``ImproperlyConfigured`` error message
13+
`#513 <https://github.com/joke2k/django-environ/issues/513>`_.
14+
15+
Added
16+
+++++
17+
- Add support for Python 3.12 and 3.13
18+
`#538 <https://github.com/joke2k/django-environ/issues/538>`_.
19+
- Add support for Django 5.1
20+
`#535 <https://github.com/joke2k/django-environ/issues/535>`_.
21+
- Add support for Django CockroachDB driver
22+
`#509 <https://github.com/joke2k/django-environ/issues/509>`_.
23+
- Add support for Django Channels
24+
`#266 <https://github.com/joke2k/django-environ/issues/266>`_.
25+
26+
Changed
27+
+++++++
28+
- Disabled inline comments handling by default due to potential side effects.
29+
While the feature itself is useful, the project's philosophy dictates that
30+
it should not be enabled by default for all users
31+
`#499 <https://github.com/joke2k/django-environ/issues/499>`_.
32+
33+
Removed
34+
+++++++
35+
- Removed support of Python 3.6, 3.7 and 3.8
36+
`#538 <https://github.com/joke2k/django-environ/issues/538>`_.
37+
- Removed support of Django 1.x.
38+
`#538 <https://github.com/joke2k/django-environ/issues/538>`_.
39+
40+
841
`v0.11.2`_ - 1-September-2023
9-
-------------------------------
42+
-----------------------------
1043
Fixed
1144
+++++
1245
- Revert "Add variable expansion." feature
@@ -31,7 +64,7 @@ Added
3164
`#463 <https://github.com/joke2k/django-environ/pull/463>`_.
3265
- Added variable expansion
3366
`#468 <https://github.com/joke2k/django-environ/pull/468>`_.
34-
- Added capability to handle comments after #, after quoted values,
67+
- Added capability to handle comments after ``#``, after quoted values,
3568
like ``KEY= 'part1 # part2' # comment``
3669
`#475 <https://github.com/joke2k/django-environ/pull/475>`_.
3770
- Added support for ``interpolate`` parameter
@@ -388,6 +421,7 @@ Added
388421
- Initial release.
389422

390423

424+
.. _v0.12.0: https://github.com/joke2k/django-environ/compare/v0.11.2...v0.12.0
391425
.. _v0.11.2: https://github.com/joke2k/django-environ/compare/v0.11.1...v0.11.2
392426
.. _v0.11.1: https://github.com/joke2k/django-environ/compare/v0.11.0...v0.11.1
393427
.. _v0.11.0: https://github.com/joke2k/django-environ/compare/v0.10.0...v0.11.0
@@ -405,4 +439,4 @@ Added
405439
.. _v0.4.1: https://github.com/joke2k/django-environ/compare/v0.4...v0.4.1
406440
.. _v0.4: https://github.com/joke2k/django-environ/compare/v0.3.1...v0.4
407441
.. _v0.3.1: https://github.com/joke2k/django-environ/compare/v0.3...v0.3.1
408-
.. _v0.3: https://github.com/joke2k/django-environ/compare/v0.2.1...v0.3
442+
.. _v0.3: https://github.com/joke2k/django-environ/compare/v0.2.1...v0.3

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2021, Serghei Iakovlev <[email protected]>
1+
Copyright (c) 2021-2024, Serghei Iakovlev <[email protected]>
22
Copyright (c) 2013-2021, Daniele Faraglia <[email protected]>
33

44
Permission is hereby granted, free of charge, to any person obtaining a copy

0 commit comments

Comments
 (0)