Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v0.12.0 #545

Merged
merged 41 commits into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
54daf88
Bump version
sergeyklay Aug 30, 2023
b343e05
Revert "Add variable expansion (fix #421)"
sergeyklay Sep 1, 2023
55ff0e3
Update change log
sergeyklay Sep 1, 2023
5561b35
Change version: v0.12.0 -> v0.11.2
sergeyklay Sep 1, 2023
928a654
Change version: v0.12.0 -> v0.11.2
sergeyklay Sep 1, 2023
7b5d7f9
Bump actions/checkout from 3.6.0 to 4.0.0
dependabot[bot] Sep 4, 2023
e3e7fc9
Make inline comments handling optional and disabled by default
sergeyklay Sep 8, 2023
b108444
Add Python 3.12 to the test matrix
foarsitter Oct 27, 2023
de22b7e
Bump actions/checkout from 4.0.0 to 4.1.1
dependabot[bot] Oct 27, 2023
46c035e
Bump actions/setup-python from 4.7.0 to 4.7.1
dependabot[bot] Oct 2, 2023
a1113e4
Test on Django 5.0
adamchainz Oct 24, 2023
7e9e32a
Bump github/codeql-action from 2 to 3
dependabot[bot] Dec 18, 2023
bead9cc
Bump actions/setup-python from 4.7.1 to 5.0.0
dependabot[bot] Dec 11, 2023
be3d746
Add support for Python 3.13 and drop support for 3.6-3.8
sergeyklay Oct 25, 2024
3a611db
Bump pypy version to 3.10
sergeyklay Oct 25, 2024
3af3921
Add setuptools to dependency list for testing purposes
sergeyklay Oct 25, 2024
3a58838
Drop Django 1.x support
sergeyklay Oct 25, 2024
ac6c0d4
Bump sphinx and furo
sergeyklay Oct 25, 2024
839b1f3
Correct link to Two Scoops of Django
sergeyklay Oct 25, 2024
01cd8e0
Correct python version to test docs
sergeyklay Oct 25, 2024
6321605
Bump python version to test docs
sergeyklay Oct 25, 2024
04642ad
Bump python version to build and lint
sergeyklay Oct 25, 2024
7af0b84
Update documentation and change log
sergeyklay Oct 25, 2024
09ef21a
Add support for Django 5.1
sergeyklay Oct 25, 2024
0ee9141
Bump actions/upload-artifact from 3 to 4
dependabot[bot] Oct 25, 2024
8968660
Include prefix in the `ImproperlyConfigured` error
spenserblack Feb 26, 2024
023491a
Bump version
sergeyklay Oct 25, 2024
6c12976
Bump actions/setup-python from 5.0.0 to 5.3.0
dependabot[bot] Oct 28, 2024
9fa66f2
Bump Vankka/pr-target-branch-action from 2 to 3
dependabot[bot] Oct 28, 2024
f53b3f4
Bump actions/checkout from 4.1.1 to 4.2.2
dependabot[bot] Oct 29, 2024
6f0a91b
Add support for Django CockroachDB driver
stevewilliamsuk Nov 25, 2023
c8379ed
Update copyright notice
sergeyklay Nov 4, 2024
0f2e088
Update change log
sergeyklay Nov 4, 2024
8729165
feat: Channels URL support
lasuillard Dec 4, 2023
8b70d9f
feat: Redis Pub/Sub
lasuillard Dec 15, 2023
60164fd
chore: Prefer Redis default port 6379
lasuillard Dec 15, 2023
d92e11b
Update change log
sergeyklay Nov 4, 2024
6abdb86
Add tests for kwarg overriding engine/backend from urls
fdemmer Jan 30, 2024
8e844ac
Correct code style
sergeyklay Nov 4, 2024
00c8203
Update change log
sergeyklay Nov 8, 2024
993b36c
Merge branch 'main' into develop
sergeyklay Nov 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3.6.0
uses: actions/checkout@v4.2.2

- name: Set up Python 3.10
uses: actions/setup-python@v4.7.0
- name: Set up Python 3.12
uses: actions/setup-python@v5.3.0
with:
python-version: '3.10'
python-version: '3.12'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox tox-gh-actions
pip install tox tox-gh-actions setuptools

- name: Check MANIFEST.in for completeness
run: tox -e manifest
Expand All @@ -44,7 +44,7 @@ jobs:

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

steps:
- name: Checkout code
uses: actions/checkout@v3.6.0
uses: actions/checkout@v4.2.2

- name: Set up Python 3.10
uses: actions/setup-python@v4.7.0
- name: Set up Python 3.12
uses: actions/setup-python@v5.3.0
with:
python-version: '3.10'
python-version: '3.12'

- name: Install in dev mode
run: python -m pip install -e .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/change-pr-target.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
check-branch:
runs-on: ubuntu-latest
steps:
- uses: Vankka/pr-target-branch-action@v2
- uses: Vankka/pr-target-branch-action@v3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
21 changes: 6 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,38 +47,29 @@ jobs:

matrix:
python:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- 'pypy-3.7'
- '3.12'
- '3.13'
- 'pypy-3.10'
os: [ ubuntu-latest, macos-latest, windows-latest ]

# These versions are no longer supported by Python team, and may
# eventually be dropped from GitHub Actions. The support of these
# versions by django-environ will continue for as long as possible,
# and may be discontinued at any time.
include:
- python: '3.6'
os: ubuntu-20.04
- python: '3.7'
os: ubuntu-20.04

steps:
- name: Checkout code
uses: actions/checkout@v3.6.0
uses: actions/checkout@v4.2.2
with:
fetch-depth: 5

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

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install tox tox-gh-actions
python -m pip install tox tox-gh-actions setuptools

- name: Setuptools self-test
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3.6.0
uses: actions/checkout@v4.2.2

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

- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
10 changes: 5 additions & 5 deletions .github/workflows/cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3.6.0
uses: actions/checkout@v4.2.2

- name: Set up Python 3.10
uses: actions/setup-python@v4.7.0
- name: Set up Python 3.12
uses: actions/setup-python@v5.3.0
with:
python-version: '3.10'
python-version: '3.12'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox tox-gh-actions
pip install tox tox-gh-actions setuptools

- name: Lint with tox
run: tox -e lint
12 changes: 6 additions & 6 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3.6.0
uses: actions/checkout@v4.2.2

- name: Set up Python 3.10
uses: actions/setup-python@v4.7.0
- name: Set up Python 3.12
uses: actions/setup-python@v5.3.0
with:
python-version: '3.10'
python-version: '3.12'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox tox-gh-actions
pip install tox tox-gh-actions setuptools

- name: Check external links in the package documentation
run: tox -e linkcheck
Expand All @@ -46,7 +46,7 @@ jobs:

- name: Archive docs artifacts
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docs
path: docs
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is part of the django-environ.
#
# Copyright (c) 2021, Serghei Iakovlev <[email protected]>
# Copyright (c) 2021-2024, Serghei Iakovlev <[email protected]>
# Copyright (c) 2013-2021, Daniele Faraglia <[email protected]>
#
# For the full copyright and license information, please view
Expand Down
4 changes: 2 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is part of the django-environ.
#
# Copyright (c) 2021, Serghei Iakovlev <[email protected]>
# Copyright (c) 2021-2024, Serghei Iakovlev <[email protected]>
# Copyright (c) 2013-2021, Daniele Faraglia <[email protected]>
#
# For the full copyright and license information, please view
Expand All @@ -17,7 +17,7 @@ build:
tools:
# Keep version in sync with tox.ini (testenv:docs) and
# docs.yml (GitHub Action Workflow).
python: '3.10'
python: '3.12'

python:
install:
Expand Down
40 changes: 37 additions & 3 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,41 @@ All notable changes to this project will be documented in this file.
The format is inspired by `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>`_.

`v0.12.0`_ - 8-November-2024
-----------------------------
Fixed
+++++
- Include prefix in the ``ImproperlyConfigured`` error message
`#513 <https://github.com/joke2k/django-environ/issues/513>`_.

Added
+++++
- Add support for Python 3.12 and 3.13
`#538 <https://github.com/joke2k/django-environ/issues/538>`_.
- Add support for Django 5.1
`#535 <https://github.com/joke2k/django-environ/issues/535>`_.
- Add support for Django CockroachDB driver
`#509 <https://github.com/joke2k/django-environ/issues/509>`_.
- Add support for Django Channels
`#266 <https://github.com/joke2k/django-environ/issues/266>`_.

Changed
+++++++
- Disabled inline comments handling by default due to potential side effects.
While the feature itself is useful, the project's philosophy dictates that
it should not be enabled by default for all users
`#499 <https://github.com/joke2k/django-environ/issues/499>`_.

Removed
+++++++
- Removed support of Python 3.6, 3.7 and 3.8
`#538 <https://github.com/joke2k/django-environ/issues/538>`_.
- Removed support of Django 1.x.
`#538 <https://github.com/joke2k/django-environ/issues/538>`_.


`v0.11.2`_ - 1-September-2023
-------------------------------
-----------------------------
Fixed
+++++
- Revert "Add variable expansion." feature
Expand All @@ -31,7 +64,7 @@ Added
`#463 <https://github.com/joke2k/django-environ/pull/463>`_.
- Added variable expansion
`#468 <https://github.com/joke2k/django-environ/pull/468>`_.
- Added capability to handle comments after #, after quoted values,
- Added capability to handle comments after ``#``, after quoted values,
like ``KEY= 'part1 # part2' # comment``
`#475 <https://github.com/joke2k/django-environ/pull/475>`_.
- Added support for ``interpolate`` parameter
Expand Down Expand Up @@ -388,6 +421,7 @@ Added
- Initial release.


.. _v0.12.0: https://github.com/joke2k/django-environ/compare/v0.11.2...v0.12.0
.. _v0.11.2: https://github.com/joke2k/django-environ/compare/v0.11.1...v0.11.2
.. _v0.11.1: https://github.com/joke2k/django-environ/compare/v0.11.0...v0.11.1
.. _v0.11.0: https://github.com/joke2k/django-environ/compare/v0.10.0...v0.11.0
Expand All @@ -405,4 +439,4 @@ Added
.. _v0.4.1: https://github.com/joke2k/django-environ/compare/v0.4...v0.4.1
.. _v0.4: https://github.com/joke2k/django-environ/compare/v0.3.1...v0.4
.. _v0.3.1: https://github.com/joke2k/django-environ/compare/v0.3...v0.3.1
.. _v0.3: https://github.com/joke2k/django-environ/compare/v0.2.1...v0.3
.. _v0.3: https://github.com/joke2k/django-environ/compare/v0.2.1...v0.3
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2021, Serghei Iakovlev <[email protected]>
Copyright (c) 2021-2024, Serghei Iakovlev <[email protected]>
Copyright (c) 2013-2021, Daniele Faraglia <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is part of the django-environ.
#
# Copyright (c) 2021, Serghei Iakovlev <[email protected]>
# Copyright (c) 2021-2024, Serghei Iakovlev <[email protected]>
# Copyright (c) 2013-2021, Daniele Faraglia <[email protected]>
#
# For the full copyright and license information, please view
Expand Down
7 changes: 4 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ approach, some connection strings are expressed as url, so this package can pars
it and return a ``urllib.parse.ParseResult``. These strings from ``os.environ``
are loaded from a ``.env`` file and filled in ``os.environ`` with ``setdefault``
method, to avoid to overwrite the real environ.
A similar approach is used in `Two Scoops of Django <https://www.feldroy.com/books/two-scoops-of-django-3-x>`_
A similar approach is used in
`Two Scoops of Django <https://web.archive.org/web/20240121133956/https://www.feldroy.com/books/two-scoops-of-django-3-x>`_
book and explained in `12factor-django <https://wellfire.co/learn/easier-12-factor-django>`_
article.

Expand Down Expand Up @@ -126,8 +127,8 @@ its documentation lives at `Read the Docs <https://django-environ.readthedocs.io
the code on `GitHub <https://github.com/joke2k/django-environ>`_,
and the latest release on `PyPI <https://pypi.org/project/django-environ/>`_.

It’s rigorously tested on Python 3.6+, and officially supports
Django 1.11, 2.2, 3.0, 3.1, 3.2, 4.0, 4.1 and 4.2.
It’s rigorously tested on Python 3.9+, and officially supports
Django 2.2, 3.0, 3.1, 3.2, 4.0, 4.1, 4.2, 5.0, and 5.1.

If you'd like to contribute to ``django-environ`` you're most welcome!

Expand Down
2 changes: 1 addition & 1 deletion SECURITY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ Reporting a Vulnerability
-------------------------

If you discover a security vulnerability within ``django-environ``, please
send an e-mail to Serghei Iakovlev via [email protected]. All security
send an e-mail to Serghei Iakovlev via [email protected]. All security
vulnerabilities will be promptly addressed.
2 changes: 1 addition & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is part of the django-environ.
#
# Copyright (c) 2021-2022, Serghei Iakovlev <[email protected]>
# Copyright (c) 2021-2024, Serghei Iakovlev <[email protected]>
# Copyright (c) 2013-2021, Daniele Faraglia <[email protected]>
#
# For the full copyright and license information, please view
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is part of the django-environ.
#
# Copyright (c) 2021-2023, Serghei Iakovlev <[email protected]>
# Copyright (c) 2021-2024, Serghei Iakovlev <[email protected]>
# Copyright (c) 2013-2021, Daniele Faraglia <[email protected]>
#
# For the full copyright and license information, please view
Expand Down
2 changes: 1 addition & 1 deletion docs/docutils.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is part of the django-environ.
#
# Copyright (c) 2021-2022, Serghei Iakovlev <[email protected]>
# Copyright (c) 2021-2024, Serghei Iakovlev <[email protected]>
# Copyright (c) 2013-2021, Daniele Faraglia <[email protected]>
#
# For the full copyright and license information, please view
Expand Down
4 changes: 2 additions & 2 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Installation
Requirements
============

* `Django <https://www.djangoproject.com/>`_ >= 1.11
* `Python <https://www.python.org/>`_ >= 3.5
* `Django <https://www.djangoproject.com/>`_ >= 2.2
* `Python <https://www.python.org/>`_ >= 3.9

Installing django-environ
=========================
Expand Down
Loading
Loading