diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e54c83dac..c34e23019 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -81,12 +81,22 @@ jobs: with: files: junit/**/*.xml check_name: Test Results (Python ${{ matrix.python-version }}) + - name: "Upload coverage to Codecov" if: ${{ matrix.python-version == '3.8' }} uses: codecov/codecov-action@v3 with: fail_ci_if_error: true + - name: Run codacy-coverage-reporter + if: ${{ matrix.python-version == '3.9' }} + uses: codacy/codacy-coverage-reporter-action@v1 + with: + project-token: ${{ secrets.CODACY_PROJECT_TOKEN }} + # or + # api-token: ${{ secrets.CODACY_API_TOKEN }} + coverage-reports: coverage.xml + unit_tests_mac: needs: install_test strategy: diff --git a/.github/workflows/update_contributors.yml b/.github/workflows/update_contributors.yml index a793c5d47..c06bfbbae 100644 --- a/.github/workflows/update_contributors.yml +++ b/.github/workflows/update_contributors.yml @@ -11,7 +11,7 @@ jobs: - uses: minicli/action-contributors@v3 name: "Update a projects CONTRIBUTORS file" env: - CONTRIB_REPOSITORY: 'rochacbruno/dynaconf' + CONTRIB_REPOSITORY: 'dynaconf/dynaconf' CONTRIB_OUTPUT_FILE: 'CONTRIBUTORS.md' - name: Create a PR uses: peter-evans/create-pull-request@v3 diff --git a/3.x-release-notes.md b/3.x-release-notes.md index 69c706d2f..1593d9d95 100644 --- a/3.x-release-notes.md +++ b/3.x-release-notes.md @@ -3,13 +3,13 @@ In Dynaconf 3.0.0 we introduced some improvements and with those improvements it comes some **breaking changes.** -Some of the changes were discussed on the **1st Dynaconf community meeting** [video is available](https://www.twitch.tv/videos/657033043) and [meeting notes #354](https://github.com/rochacbruno/dynaconf/issues/354). +Some of the changes were discussed on the **1st Dynaconf community meeting** [video is available](https://www.twitch.tv/videos/657033043) and [meeting notes #354](https://github.com/dynaconf/dynaconf/issues/354). ## Improvements -- Validators now implements `|` and `&` operators to allow `Validator() &| Validator()` and has more `operations` available such as `len_eq, len_min, len_max, startswith` [#353](https://github.com/rochacbruno/dynaconf/pull/353). -- First level variables are now allowed to be `lowercase` it is now possible to access `settings.foo` or `settings.FOO` [#357](https://github.com/rochacbruno/dynaconf/pull/357). +- Validators now implements `|` and `&` operators to allow `Validator() &| Validator()` and has more `operations` available such as `len_eq, len_min, len_max, startswith` [#353](https://github.com/dynaconf/dynaconf/pull/353). +- First level variables are now allowed to be `lowercase` it is now possible to access `settings.foo` or `settings.FOO` [#357](https://github.com/dynaconf/dynaconf/pull/357). - All Dependencies are now vendored, so when installing Dynaconf is not needed to install any dependency. - Dynaconf configuration options are now aliased so when creating an instance of `LazySettings|FlaskDynaconf|DjangoDynaconf` it is now possible to pass instead of `ENVVAR_PREFIX_FOR_DYNACONF` just `envvar_prefix` and this lowercase alias is now accepted. - Fixed bugs in `merge` and deprecated the `@reset` token. diff --git a/CHANGELOG.md b/CHANGELOG.md index d48953183..524e24c86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -584,7 +584,7 @@ Changelog In order to keep the same method api, default values should be parsed and converted to Boxed objects. - https://github.com/rochacbruno/dynaconf/issues/462 + https://github.com/dynaconf/dynaconf/issues/462 - HOTFIX for 501 (#540) [Bruno Rocha] Flask still missing __contains__ @@ -828,7 +828,7 @@ Other Update docs/release_notes Fixing prospector warnings. (#425) Fix mkdocs config problem found in #423 - Signed in for https://xscode.com/rochacbruno/dynaconf (#426) + Signed in for https://xscode.com/dynaconf/dynaconf (#426) Remove links to outdated issues from guidelines Fix colors and KEyError handling on cli.py (#429) Fix #434 setenv failing to unset LazyValues (#437) @@ -858,7 +858,7 @@ Other Update docs/release_notes Fixing prospector warnings. (#425) Fix mkdocs config problem found in #423 - Signed in for https://xscode.com/rochacbruno/dynaconf (#426) + Signed in for https://xscode.com/dynaconf/dynaconf (#426) Remove links to outdated issues from guidelines Fix colors and KEyError handling on cli.py (#429) Fix #434 setenv failing to unset LazyValues (#437) @@ -931,7 +931,7 @@ Other - [Release notes](https://github.com/facelessuser/mkdocs-material-extensions/releases) - [Changelog](https://github.com/facelessuser/mkdocs-material-extensions/blob/master/changelog.md) - [Commits](https://github.com/facelessuser/mkdocs-material-extensions/compare/1.0...1.0.1) -- Signed in for https://xscode.com/rochacbruno/dynaconf (#426) [Bruno +- Signed in for https://xscode.com/dynaconf/dynaconf (#426) [Bruno Rocha] Offering paid support for dynaconf users. @@ -1171,7 +1171,7 @@ Other Bruno Rocha (10): Release version 3.0.0 Hot fix removing unused imports - Merge branch 'master' of github.com:rochacbruno/dynaconf + Merge branch 'master' of github.com:dynaconf/dynaconf Removing invalid links, adding allert on old docs fix #369 and fix #371 (#372) Fix #359 lazy template substitution on nested keys (#375) Flask fizes and other issues included. (#376) @@ -1199,7 +1199,7 @@ Other Bruno Rocha (10): Release version 3.0.0 Hot fix removing unused imports - Merge branch 'master' of github.com:rochacbruno/dynaconf + Merge branch 'master' of github.com:dynaconf/dynaconf Removing invalid links, adding allert on old docs fix #369 and fix #371 (#372) Fix #359 lazy template substitution on nested keys (#375) Flask fizes and other issues included. (#376) @@ -1247,7 +1247,7 @@ Other Rocha] - Removing invalid links, adding allert on old docs fix #369 and fix #371 (#372) [Bruno Rocha] -- Merge branch 'master' of github.com:rochacbruno/dynaconf. [Bruno +- Merge branch 'master' of github.com:dynaconf/dynaconf. [Bruno Rocha] - Fix validation of optional fields (#370) [Bruno Rocha Co-authored-by: Bruno Rocha @@ -1313,7 +1313,7 @@ Other DEPRECATED global settings object. DEPRECATED global settings object. (#356) Lowecase read allowed by default (#357) - Merge branch 'master' of github.com:rochacbruno/dynaconf + Merge branch 'master' of github.com:dynaconf/dynaconf envless by default - breaking change ⚠️ (#358) dotenv is no more loaded by default (#360) No more loading of `settings.*` by default (#361) @@ -1351,7 +1351,7 @@ Other * Fix redis and vault tests * CLI default to global instance with warnings -- Merge branch 'master' of github.com:rochacbruno/dynaconf. [Bruno +- Merge branch 'master' of github.com:dynaconf/dynaconf. [Bruno Rocha] - Lowecase read allowed by default (#357) [Bruno Rocha] @@ -2220,7 +2220,7 @@ Other Bruno Rocha (21): Merge branch 'jperras-merge-multiple-settings-files' - Merge branch 'master' of github.com:rochacbruno/dynaconf + Merge branch 'master' of github.com:dynaconf/dynaconf Fix #106 make PROJECT_ROOT_FOR_DYNACONF to work with custom paths Update dynaconf/utils/boxing.py Update dynaconf/utils/boxing.py @@ -2282,7 +2282,7 @@ Other Bruno Rocha (21): Merge branch 'jperras-merge-multiple-settings-files' - Merge branch 'master' of github.com:rochacbruno/dynaconf + Merge branch 'master' of github.com:dynaconf/dynaconf Fix #106 make PROJECT_ROOT_FOR_DYNACONF to work with custom paths Update dynaconf/utils/boxing.py Update dynaconf/utils/boxing.py @@ -2495,7 +2495,7 @@ Other Bruno Rocha (9): Merge branch 'jperras-merge-multiple-settings-files' - Merge branch 'master' of github.com:rochacbruno/dynaconf + Merge branch 'master' of github.com:dynaconf/dynaconf Fix #106 make PROJECT_ROOT_FOR_DYNACONF to work with custom paths Update dynaconf/utils/boxing.py Update dynaconf/utils/boxing.py @@ -2542,7 +2542,7 @@ Other Bruno Rocha (9): Merge branch 'jperras-merge-multiple-settings-files' - Merge branch 'master' of github.com:rochacbruno/dynaconf + Merge branch 'master' of github.com:dynaconf/dynaconf Fix #106 make PROJECT_ROOT_FOR_DYNACONF to work with custom paths Update dynaconf/utils/boxing.py Update dynaconf/utils/boxing.py @@ -2604,7 +2604,7 @@ Other Bruno Rocha (6): Merge branch 'jperras-merge-multiple-settings-files' - Merge branch 'master' of github.com:rochacbruno/dynaconf + Merge branch 'master' of github.com:dynaconf/dynaconf Fix #106 make PROJECT_ROOT_FOR_DYNACONF to work with custom paths Update dynaconf/utils/boxing.py Update dynaconf/utils/boxing.py @@ -2639,7 +2639,7 @@ Other Bruno Rocha (6): Merge branch 'jperras-merge-multiple-settings-files' - Merge branch 'master' of github.com:rochacbruno/dynaconf + Merge branch 'master' of github.com:dynaconf/dynaconf Fix #106 make PROJECT_ROOT_FOR_DYNACONF to work with custom paths Update dynaconf/utils/boxing.py Update dynaconf/utils/boxing.py @@ -2677,14 +2677,14 @@ Other Typo! - Fix small typo in README.md. [Matthias] -- Merge branch 'master' of github.com:rochacbruno/dynaconf. [Bruno +- Merge branch 'master' of github.com:dynaconf/dynaconf. [Bruno Rocha] - Python 3.4 has different error message. [Mantas] - Remove mocker fixture. [Mantas] Left this accidentaly. - https://travis-ci.org/rochacbruno/dynaconf/jobs/452612532 + https://travis-ci.org/dynaconf/dynaconf/jobs/452612532 - Add INSTANCE_FOR_DYNACONF and --instance. [Mantas] There parameters allows dynaconf to use different LazySettings instance @@ -2849,7 +2849,7 @@ Other Docs have been updated to show an example of the nested validator name definition in action. - Closes rochacbruno/dynaconf#85. + Closes dynaconf/dynaconf#85. - Fix #94 setenv cleans SETTINGS_MODULE attribute. [Bruno Rocha] - Merge branch 'jperras-dot-traversal-access' [Bruno Rocha] - Merge branch 'dot-traversal-access' of @@ -2879,7 +2879,7 @@ Other - Tested [✓] - Examples added [✓] - Closes rochacbruno/dynaconf#84 + Closes dynaconf/dynaconf#84 - Merge branch 'rsnyman-merge-settings' [Bruno Rocha] - Add example for merge_configs. [Bruno Rocha] - Add setting merging. [Raoul Snyman] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e009cca8c..712fbd0f4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,7 @@ This Diagram can help you understand visually what happens on Dynaconf: https:// git clone git@github.com:{$USER}/dynaconf.git # Add the upstream remote -git remote add upstream https://github.com/rochacbruno/dynaconf.git +git remote add upstream https://github.com/dynaconf/dynaconf.git # Activate your Python Environment python3.7 -m venv venv @@ -59,7 +59,7 @@ git commit -am "Changed XPTO to fix #issue_number" # Push to your own fork git push -u origin HEAD -# Open github.com/rochacbruno/dynaconf and send a Pull Request. +# Open github.com/dynaconf/dynaconf and send a Pull Request. ``` ### Run integration tests diff --git a/README.md b/README.md index 5838b6bf0..24cacd9e6 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ > **dynaconf** - Configuration Management for Python. -[![MIT License](https://img.shields.io/badge/license-MIT-007EC7.svg?style=flat-square)](/LICENSE) [![PyPI](https://img.shields.io/pypi/v/dynaconf.svg)](https://pypi.python.org/pypi/dynaconf) [![PyPI](https://img.shields.io/pypi/pyversions/dynaconf.svg)]() ![PyPI - Downloads](https://img.shields.io/pypi/dm/dynaconf.svg?label=pip%20installs&logo=python) [![CI](https://github.com/rochacbruno/dynaconf/actions/workflows/main.yml/badge.svg)](https://github.com/rochacbruno/dynaconf/actions/workflows/main.yml) [![codecov](https://codecov.io/gh/rochacbruno/dynaconf/branch/master/graph/badge.svg)](https://codecov.io/gh/rochacbruno/dynaconf) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/42d2f11ef0a446808b246c8c69603f6e)](https://www.codacy.com/gh/rochacbruno/dynaconf/dashboard?utm_source=github.com&utm_medium=referral&utm_content=rochacbruno/dynaconf&utm_campaign=Badge_Grade) ![GitHub stars](https://img.shields.io/github/stars/rochacbruno/dynaconf.svg) ![GitHub Release Date](https://img.shields.io/github/release-date/rochacbruno/dynaconf.svg) ![GitHub commits since latest release](https://img.shields.io/github/commits-since/rochacbruno/dynaconf/latest.svg) ![GitHub last commit](https://img.shields.io/github/last-commit/rochacbruno/dynaconf.svg) [![Code Style Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black/) +[![MIT License](https://img.shields.io/badge/license-MIT-007EC7.svg?style=flat-square)](/LICENSE) [![PyPI](https://img.shields.io/pypi/v/dynaconf.svg)](https://pypi.python.org/pypi/dynaconf) [![PyPI](https://img.shields.io/pypi/pyversions/dynaconf.svg)]() ![PyPI - Downloads](https://img.shields.io/pypi/dm/dynaconf.svg?label=pip%20installs&logo=python) [![CI](https://github.com/dynaconf/dynaconf/actions/workflows/main.yml/badge.svg)](https://github.com/dynaconf/dynaconf/actions/workflows/main.yml) [![codecov](https://codecov.io/gh/dynaconf/dynaconf/branch/master/graph/badge.svg)](https://codecov.io/gh/dynaconf/dynaconf) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/3fb2de98464442f99a7663181803b400)](https://www.codacy.com/gh/dynaconf/dynaconf/dashboard?utm_source=github.com&utm_medium=referral&utm_content=dynaconf/dynaconf&utm_campaign=Badge_Grade) ![GitHub stars](https://img.shields.io/github/stars/dynaconf/dynaconf.svg) ![GitHub Release Date](https://img.shields.io/github/release-date/dynaconf/dynaconf.svg) ![GitHub commits since latest release](https://img.shields.io/github/commits-since/dynaconf/dynaconf/latest.svg) ![GitHub last commit](https://img.shields.io/github/last-commit/dynaconf/dynaconf.svg) [![Code Style Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black/) -![GitHub issues](https://img.shields.io/github/issues/rochacbruno/dynaconf.svg) [![User Forum](https://img.shields.io/badge/users-forum-blue.svg?logo=googlechat)](https://github.com/rochacbruno/dynaconf/discussions) [![Join the chat at https://gitter.im/dynaconf/dev](https://badges.gitter.im/dynaconf/dev.svg)](https://gitter.im/dynaconf/dev?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![ Matrix](https://img.shields.io/badge/dev-room-blue.svg?logo=matrix)](https://matrix.to/#/#dynaconf:matrix.org) +![GitHub issues](https://img.shields.io/github/issues/dynaconf/dynaconf.svg) [![User Forum](https://img.shields.io/badge/users-forum-blue.svg?logo=googlechat)](https://github.com/dynaconf/dynaconf/discussions) [![Join the chat at https://gitter.im/dynaconf/dev](https://badges.gitter.im/dynaconf/dev.svg)](https://gitter.im/dynaconf/dev?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![ Matrix](https://img.shields.io/badge/dev-room-blue.svg?logo=matrix)](https://matrix.to/#/#dynaconf:matrix.org) ## Features @@ -127,7 +127,7 @@ There is a lot more you can do, **read the docs:** http://dynaconf.com ## Contribute -Main discussions happens on [Discussions Tab](https://github.com/rochacbruno/dynaconf/discussions) learn more about how to get involved on [CONTRIBUTING.md guide](CONTRIBUTING.md) +Main discussions happens on [Discussions Tab](https://github.com/dynaconf/dynaconf/discussions) learn more about how to get involved on [CONTRIBUTING.md guide](CONTRIBUTING.md) ## More diff --git a/docs/advanced.md b/docs/advanced.md index f2f611d97..50d60380d 100644 --- a/docs/advanced.md +++ b/docs/advanced.md @@ -167,7 +167,7 @@ def load( obj._loaded_files.append(sops_file) ``` -See more [example/custom_loader](https://github.com/rochacbruno/dynaconf/tree/master/example/custom_loader) +See more [example/custom_loader](https://github.com/dynaconf/dynaconf/tree/master/example/custom_loader) ## Module impersonation @@ -413,7 +413,7 @@ Then your `program.py` will print `"On Testing"` red from `[testing]` environmen For pytest it is common to create fixtures to provide pre-configured settings object or to configure the settings before all the tests are collected. -Examples available on [https://github.com/rochacbruno/dynaconf/tree/master/example/pytest_example](https://github.com/rochacbruno/dynaconf/tree/master/example/pytest_example) +Examples available on [https://github.com/dynaconf/dynaconf/tree/master/example/pytest_example](https://github.com/dynaconf/dynaconf/tree/master/example/pytest_example) With `pytest` fixtures it is recommended to use the `FORCE_ENV_FOR_DYNACONF` instead of just `ENV_FOR_DYNACONF` because it has precedence. diff --git a/docs/cli.md b/docs/cli.md index 5e0ac0c08..7bbf19f18 100644 --- a/docs/cli.md +++ b/docs/cli.md @@ -243,5 +243,5 @@ $ dynaconf -i config.settings --banner ██████╔╝ ██║ ██║ ╚████║██║ ██║╚██████╗╚██████╔╝██║ ╚████║██║ ╚═════╝ ╚═╝ ╚═╝ ╚═══╝╚═╝ ╚═╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═══╝╚═╝ -Learn more at: http://github.com/rochacbruno/dynaconf +Learn more at: http://github.com/dynaconf/dynaconf ``` diff --git a/docs/django.md b/docs/django.md index 8634e4cf2..7c501c91b 100644 --- a/docs/django.md +++ b/docs/django.md @@ -32,7 +32,7 @@ $ dynaconf init --django yourapp/settings.py Dynaconf will append its extension loading code to the bottom of your `yourapp/settings.py` file and will create `settings.toml` and `.secrets.toml` in the current folder (the same where `manage.py` is located). -> **TIP** Take a look at [example/django_example](https://github.com/rochacbruno/dynaconf/tree/master/example/django_example) +> **TIP** Take a look at [example/django_example](https://github.com/dynaconf/dynaconf/tree/master/example/django_example) ## Using `DJANGO_` environment variables @@ -241,7 +241,7 @@ import pytest @pytest.fixture(scope="session", autouse=True) def set_test_settings(): - # https://github.com/rochacbruno/dynaconf/issues/491#issuecomment-745391955 + # https://github.com/dynaconf/dynaconf/issues/491#issuecomment-745391955 from django.conf import settings settings.setenv('testing') # force the environment to be whatever you want ``` diff --git a/docs/index.md b/docs/index.md index 2ee1997e9..51b7eab4c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -7,10 +7,7 @@ Configuration Management for Python.

-

MIT License PyPIcodecov GitHub Release Date GitHub last commit Discussions Demo

- - -[![Foo](https://xscode.com/assets/promo-banner.svg)](https://xscode.com/rochacbruno/dynaconf) +

MIT License PyPIcodecov GitHub Release Date GitHub last commit Discussions Demo

> **TIP** You can see a working demo here: https://github.com/rochacbruno/learndynaconf diff --git a/docs/merging.md b/docs/merging.md index c2de78039..7e4aa437b 100644 --- a/docs/merging.md +++ b/docs/merging.md @@ -533,4 +533,4 @@ The **dynaconf_merge** and **@merge** functionalities works only for the first l ## More examples -Take a look at the [example](https://github.com/rochacbruno/dynaconf/tree/master/example) folder to see some examples of use with different file formats and features. +Take a look at the [example](https://github.com/dynaconf/dynaconf/tree/master/example) folder to see some examples of use with different file formats and features. diff --git a/docs/pt-br/docs/cli.md b/docs/pt-br/docs/cli.md index b04559dd3..afb09e153 100644 --- a/docs/pt-br/docs/cli.md +++ b/docs/pt-br/docs/cli.md @@ -239,5 +239,5 @@ $ dynaconf -i config.settings --banner ██████╔╝ ██║ ██║ ╚████║██║ ██║╚██████╗╚██████╔╝██║ ╚████║██║ ╚═════╝ ╚═╝ ╚═╝ ╚═══╝╚═╝ ╚═╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═══╝╚═╝ -Learn more at: http://github.com/rochacbruno/dynaconf +Learn more at: http://github.com/dynaconf/dynaconf ``` diff --git a/docs/pt-br/docs/index.md b/docs/pt-br/docs/index.md index 0c99f528b..3f804d19f 100644 --- a/docs/pt-br/docs/index.md +++ b/docs/pt-br/docs/index.md @@ -7,11 +7,9 @@ Gereciamento de Configurações para Python.

-

MIT License PyPIcodecov GitHub Release Date GitHub last commit Discussions Demo

+

MIT License PyPIcodecov GitHub Release Date GitHub last commit Discussions Demo

-[![Foo](https://xscode.com/assets/promo-banner.svg)](https://xscode.com/rochacbruno/dynaconf) - > **DICA** Você pode ver uma exmplo funcional aqui (em inglês): https://github.com/rochacbruno/learndynaconf ## Recursos @@ -142,4 +140,4 @@ pip install dynaconf --- - > ℹ️ Você pode criar os arquivos em vez de utilizar o comando `dynaconf init` e dar qualquer nome que queira em vez do padrão `config.py` (o arquivo deve estar em seu `python path` para ser importado) \ No newline at end of file + > ℹ️ Você pode criar os arquivos em vez de utilizar o comando `dynaconf init` e dar qualquer nome que queira em vez do padrão `config.py` (o arquivo deve estar em seu `python path` para ser importado) diff --git a/docs/release_notes.md b/docs/release_notes.md index af8590e17..2fa6c1938 100644 --- a/docs/release_notes.md +++ b/docs/release_notes.md @@ -98,13 +98,13 @@ Validator("FOO", default=Lazy(empty, formatter=my_function)) In Dynaconf 3.0.0 we introduced some improvements and with those improvements it comes some **breaking changes.** -Some of the changes were discussed on the **1st Dynaconf community meeting** [video is available](https://www.twitch.tv/videos/657033043) and [meeting notes #354](https://github.com/rochacbruno/dynaconf/issues/354). +Some of the changes were discussed on the **1st Dynaconf community meeting** [video is available](https://www.twitch.tv/videos/657033043) and [meeting notes #354](https://github.com/dynaconf/dynaconf/issues/354). ## Improvements -- Validators now implements `|` and `&` operators to allow `Validator() &| Validator()` and has more `operations` available such as `len_eq, len_min, len_max, startswith` [#353](https://github.com/rochacbruno/dynaconf/pull/353). -- First level variables are now allowed to be `lowercase` it is now possible to access `settings.foo` or `settings.FOO` [#357](https://github.com/rochacbruno/dynaconf/pull/357). +- Validators now implements `|` and `&` operators to allow `Validator() &| Validator()` and has more `operations` available such as `len_eq, len_min, len_max, startswith` [#353](https://github.com/dynaconf/dynaconf/pull/353). +- First level variables are now allowed to be `lowercase` it is now possible to access `settings.foo` or `settings.FOO` [#357](https://github.com/dynaconf/dynaconf/pull/357). - All Dependencies are now vendored, so when installing Dynaconf is not needed to install any dependency. - Dynaconf configuration options are now aliased so when creating an instance of `LazySettings|FlaskDynaconf|DjangoDynaconf` it is now possible to pass instead of `ENVVAR_PREFIX_FOR_DYNACONF` just `envvar_prefix` and this lowercase alias is now accepted. - Fixed bugs in `merge` and deprecated the `@reset` token. diff --git a/dynaconf/cli.py b/dynaconf/cli.py index efec9ec7c..299bbec3c 100644 --- a/dynaconf/cli.py +++ b/dynaconf/cli.py @@ -164,7 +164,7 @@ def show_banner(ctx, param, value): return set_settings(ctx) click.echo(settings.dynaconf_banner) - click.echo("Learn more at: http://github.com/rochacbruno/dynaconf") + click.echo("Learn more at: http://github.com/dynaconf/dynaconf") ctx.exit() diff --git a/dynaconf/utils/parse_conf.py b/dynaconf/utils/parse_conf.py index 0a6a32088..c6da55736 100644 --- a/dynaconf/utils/parse_conf.py +++ b/dynaconf/utils/parse_conf.py @@ -348,7 +348,7 @@ def _parse_conf_data(data, tomlfy=False, box_settings=None): def parse_conf_data(data, tomlfy=False, box_settings=None): - # fix for https://github.com/rochacbruno/dynaconf/issues/595 + # fix for https://github.com/dynaconf/dynaconf/issues/595 if isnamedtupleinstance(data): return data diff --git a/example/common-encoding/program.py b/example/common-encoding/program.py index a88350ea9..f030971c2 100644 --- a/example/common-encoding/program.py +++ b/example/common-encoding/program.py @@ -174,7 +174,7 @@ def connect(server, port, username, password): ) print("#" * 79) print(settings.dynaconf_banner) -print("Learn more at http://github.com/rochacbruno/dynaconf") +print("Learn more at http://github.com/dynaconf/dynaconf") with settings.using_env("testing"): diff --git a/example/common/program.py b/example/common/program.py index 5dcb10825..3a81699cd 100644 --- a/example/common/program.py +++ b/example/common/program.py @@ -163,7 +163,7 @@ def connect(server, port, username, password): ) print("#" * 79) print(settings.dynaconf_banner) -print("Learn more at http://github.com/rochacbruno/dynaconf") +print("Learn more at http://github.com/dynaconf/dynaconf") with settings.using_env("testing"): diff --git a/example/django_pytest/app/tests/conftest.py b/example/django_pytest/app/tests/conftest.py index 758795ee5..36faa58d6 100644 --- a/example/django_pytest/app/tests/conftest.py +++ b/example/django_pytest/app/tests/conftest.py @@ -6,7 +6,7 @@ @pytest.fixture(scope="session", autouse=True) def set_test_settings(): - # https://github.com/rochacbruno/dynaconf/issues/491#issuecomment-745391955 + # https://github.com/dynaconf/dynaconf/issues/491#issuecomment-745391955 from django.conf import settings settings.setenv("pytest") diff --git a/example/full_example.py b/example/full_example.py index 9340aa91e..e637e52ad 100644 --- a/example/full_example.py +++ b/example/full_example.py @@ -24,7 +24,7 @@ # Now when reading settings they will be get from your sources dynamically # defined data types are casted (but you can also do explicitly if want) -# read more in https://github.com/rochacbruno/dynaconf +# read more in https://github.com/dynaconf/dynaconf print("You server is:") print(settings.HOSTNAME) diff --git a/example/issues/443_object_merge/README.md b/example/issues/443_object_merge/README.md index c353a9b50..6793b8982 100644 --- a/example/issues/443_object_merge/README.md +++ b/example/issues/443_object_merge/README.md @@ -1,7 +1,7 @@ -# [bug] Setting values being stripped out after merge - -* created by @daviddavis on 2020-10-07 14:13:58 +0000 UTC - +# [bug] Setting values being stripped out after merge + +* created by @daviddavis on 2020-10-07 14:13:58 +0000 UTC + **Describe the bug** I'm seeing where values are being stripped out of settings. This is on dynaconf 3.1.1 with Python 3.7.7. @@ -31,15 +31,15 @@ I would expect the final settings dict to be: ``` {"DATABASES": {'default': {'ENGINE': 'django.db.backends.postgresql_psycopg2', 'HOST': 'localhost', 'PASSWORD': 'pulp', 'NAME': 'pulp', 'USER': 'postgres'}}} -``` - -## Comments: - -### comment by @rochacbruno on 2020-10-07 14:31:15 +0000 UTC - +``` + +## Comments: + +### comment by @rochacbruno on 2020-10-07 14:31:15 +0000 UTC + The bug is in -https://github.com/rochacbruno/dynaconf/blob/8998cac224a985dc8bb783f2a5abd71ff4e6769c/dynaconf/utils/__init__.py#L45 +https://github.com/dynaconf/dynaconf/blob/8998cac224a985dc8bb783f2a5abd71ff4e6769c/dynaconf/utils/__init__.py#L45 As all the values are `pulp` it is wrongly using `is` to compare and `"pulp" is "pulp"` will always be `True` regardless the key it is in. @@ -50,4 +50,4 @@ As all the values are `pulp` it is wrongly using `is` to compare and `"pulp" is True ``` -I will need to include the full path to the key on the comparison or change the `DynaBox` in a way that each value gets its own identity even if the value is the same. +I will need to include the full path to the key on the comparison or change the `DynaBox` in a way that each value gets its own identity even if the value is the same. diff --git a/mkdocs.yml b/mkdocs.yml index 1dcf57d5f..be0ad1e0a 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -2,9 +2,9 @@ site_name: Dynaconf - 3.1.9 site_url: https://dynaconf.com site_description: Configuration Management for Python site_author: Bruno Rocha -repo_name: rochacbruno/dynaconf -repo_url: https://github.com/rochacbruno/dynaconf -edit_uri: 'https://github.com/rochacbruno/dynaconf/tree/master/docs' +repo_name: dynaconf/dynaconf +repo_url: https://github.com/dynaconf/dynaconf +edit_uri: 'https://github.com/dynaconf/dynaconf/tree/master/docs' nav: - Home: index.md - Configuration: configuration.md @@ -72,7 +72,7 @@ extra: disqus: dynaconf social: - icon: fontawesome/brands/github-alt - link: https://github.com/rochacbruno/dynaconf + link: https://github.com/dynaconf/dynaconf - icon: fontawesome/brands/twitter link: https://twitter.com/rochacbruno - icon: fontawesome/brands/linkedin diff --git a/setup.py b/setup.py index 82d47fb0c..5b215d3e1 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ def read(*names, **kwargs): setup( name="dynaconf", version=read("dynaconf", "VERSION"), - url="https://github.com/rochacbruno/dynaconf", + url="https://github.com/dynaconf/dynaconf", license="MIT", author="Bruno Rocha", author_email="rochacbruno@gmail.com", diff --git a/tests/test_dynabox.py b/tests/test_dynabox.py index f68835f3e..b78f4c344 100644 --- a/tests/test_dynabox.py +++ b/tests/test_dynabox.py @@ -30,7 +30,7 @@ def test_named_tuple_is_not_transformed(): - """Issue: https://github.com/rochacbruno/dynaconf/issues/595""" + """Issue: https://github.com/dynaconf/dynaconf/issues/595""" assert isinstance(box.database, DBDATA) assert isinstance(box.database, tuple) diff --git a/tests/test_utils.py b/tests/test_utils.py index d2cf15821..b84a8fd58 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -56,7 +56,7 @@ def test_unparse(): def test_cast_bool(settings): - """Covers https://github.com/rochacbruno/dynaconf/issues/14""" + """Covers https://github.com/dynaconf/dynaconf/issues/14""" assert parse_conf_data(False, box_settings=settings) is False assert settings.get("SIMPLE_BOOL", cast="@bool") is False