Skip to content
This repository has been archived by the owner on Dec 5, 2019. It is now read-only.

Bug 1314763 - Enable mozlog logging format and django-configurations #69

Merged
merged 3 commits into from
Nov 8, 2016

Conversation

jezdez
Copy link
Contributor

@jezdez jezdez commented Nov 7, 2016

No description provided.

@jezdez
Copy link
Contributor Author

jezdez commented Nov 7, 2016

@maurodoglio Note, some of the config values in your .env need to be renamed:

  • DEBUG ➡️ DJANGO_DEBUG
  • SITE_URL ➡️ DJANGO_SITE_URL
  • ALLOWED_HOSTS ➡️ DJANGO_ALLOWED_HOSTS

@codecov-io
Copy link

codecov-io commented Nov 7, 2016

Current coverage is 82.06% (diff: 85.71%)

Merging #69 into master will increase coverage by 1.20%

@@             master        #69   diff @@
==========================================
  Files            34         35     +1   
  Lines           977        998    +21   
  Methods           0          0          
  Messages          0          0          
  Branches        102         99     -3   
==========================================
+ Hits            790        819    +29   
+ Misses          162        157     -5   
+ Partials         25         22     -3   

Powered by Codecov. Last update f1d7cd9...79c5e90

Copy link
Contributor

@maurodoglio maurodoglio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just a couple of docstrings to fix. The configuration for each environment is much more predictable now, I love it!
It took me a while to figure out where the .env file is loaded, I didn't find any reference to it in the django-configurations docs, only to envdir. I'll file a bug upstream.



class Prod(Stage):
"""Configuration to be used in stage environment"""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These docstrings refer to Stage and viceversa

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AH, d'oh :D


if SITE_URL.startswith('https://'):
class Stage(Base):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/Stage/Staging ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sadly, the dockerflow uses stage instead: https://atmo.stage.mozaws.net

@jezdez jezdez merged commit be4c781 into master Nov 8, 2016
@jezdez jezdez deleted the bug1314763 branch November 8, 2016 15:07
jezdez pushed a commit that referenced this pull request Jan 16, 2019
Bumps [markupsafe](https://github.com/pallets/markupsafe) from 1.0 to 1.1.0.
<details>
<summary>Changelog</summary>

*Sourced from [markupsafe's changelog](https://github.com/pallets/markupsafe/blob/master/CHANGES.rst).*

> Version 1.1.0
> -------------
> 
> Released 2018-11-05
> 
> -   Drop support for Python 2.6 and 3.3.
> -   Build wheels for Linux, Mac, and Windows, allowing systems without
>     a compiler to take advantage of the C extension speedups. (`#104`_)
> -   Use newer CPython API on Python 3, resulting in a 1.5x speedup.
>     (`#64`_)
> -   ``escape`` wraps ``__html__`` result in ``Markup``, consistent with
>     documented behavior. (`#69`_)
> 
> .. _#64: https://github-redirect.dependabot.com/pallets/markupsafe/pull/64
> .. _#69: https://github-redirect.dependabot.com/pallets/markupsafe/pull/69
> .. _#104: https://github-redirect.dependabot.com/pallets/markupsafe/pull/104
> 
> 
> Version 1.0
> -----------
> 
> Released 2017-03-07
> 
> -   Fixed custom types not invoking ``__unicode__`` when used with
>     ``format()``.
> -   Added ``__version__`` module attribute.
> -   Improve unescape code to leave lone ampersands alone.
> 
> 
> Version 0.18
> ------------
> 
> Released 2013-05-22
> 
> -   Fixed ``__mul__`` and string splitting on Python 3.
> 
> 
> Version 0.17
> ------------
> 
> Released 2013-05-21
> 
> -   Fixed a bug with broken interpolation on tuples.
> 
> 
> Version 0.16
> ------------
> 
> Released 2013-05-20
> 
></table> ... (truncated)
</details>
<details>
<summary>Commits</summary>

- [`9963f3d`](pallets/markupsafe@9963f3d) update docs link
- [`c81ffeb`](pallets/markupsafe@c81ffeb) Merge pull request [#107](https://github-redirect.dependabot.com/pallets/markupsafe/issues/107) from pallets/release-1-1-0
- [`cb06e16`](pallets/markupsafe@cb06e16) release 1.1.0
- [`09f4fc0`](pallets/markupsafe@09f4fc0) fix exclude pyc files
- [`3ca906f`](pallets/markupsafe@3ca906f) add changelog and license to docs
- [`ab4f863`](pallets/markupsafe@ab4f863) fix project link
- [`bf98b91`](pallets/markupsafe@bf98b91) Merge pull request [#106](https://github-redirect.dependabot.com/pallets/markupsafe/issues/106) from pallets/style
- [`b41c96e`](pallets/markupsafe@b41c96e) add style checks
- [`6247e01`](pallets/markupsafe@6247e01) update project files
- [`d9270db`](pallets/markupsafe@d9270db) Merge pull request [#105](https://github-redirect.dependabot.com/pallets/markupsafe/issues/105) from pallets/appveyor-cibuildwheel
- Additional commits viewable in [compare view](pallets/markupsafe@1.0...1.1.0)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=markupsafe&package-manager=pip&previous-version=1.0&new-version=1.1.0)](https://dependabot.com/compatibility-score.html?dependency-name=markupsafe&package-manager=pip&previous-version=1.0&new-version=1.1.0)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

---

**Note:** This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking `Bump now` in your [Dependabot dashboard](https://app.dependabot.com).

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants