Skip to content

Commit

Permalink
Merge branch 'fedora-infra:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
phsmoura authored Jul 20, 2023
2 parents f191e87 + 3f7afc6 commit b1fc93e
Show file tree
Hide file tree
Showing 128 changed files with 5,459 additions and 1,061 deletions.
17 changes: 0 additions & 17 deletions .github/dependabot.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["local>fedora-infra/shared:renovate-config"]
}
30 changes: 0 additions & 30 deletions .github/workflows/dependabot-approve.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
unit_test:
name: Unit tests
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Run tests
uses: fedora-python/tox-github-action@master
with:
Expand All @@ -48,13 +48,13 @@ jobs:
integration_test:
name: Integration tests
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install RabbitMQ
uses: mer-team/[email protected]
with:
RABBITMQ_TAG: "3-management-alpine"
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- name: Install Tox
Expand Down
24 changes: 24 additions & 0 deletions .gitleaks.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[allowlist]
paths = [

"""noggin/tests/unit/controller/cassettes/test_forgot_password/test_change_post.yaml""",
"""noggin/tests/unit/controller/cassettes/test_forgot_password/test_change_post_password_policy_rejected.yaml""",
"""noggin/tests/unit/controller/cassettes/test_forgot_password/test_change_post_password_with_otp_not_given.yaml""",
"""noggin/tests/unit/controller/cassettes/test_forgot_password/test_change_post_password_with_otp_wrong_value.yaml""",
"""noggin/tests/unit/controller/cassettes/test_forgot_password/test_change_post_with_otp.yaml""",
"""noggin/tests/unit/controller/cassettes/test_forgot_password/test_change_post_no_earlier_password_change.yaml""",
"""noggin/tests/unit/controller/cassettes/test_forgot_password/test_change_post_password_too_short.yaml""",
]
# these commits all contain python files that use a password that is used for the tests.
# the same password has been there for a while, but keeps getting flagged because the file
# has been moved around and renamed.
# 54f8749f986ebb755b1219160fdf4e6b5132e77f/tests/unit/controller/test_authentication.py#L148
# we also now have a gitleaks:allow on this line too.
commits = [
"187716c9480916cf15a4f5f44e9465ae5455219e",
"b7b306e6518c750583c98b3709ab6fc5df0c9f3d",
"ee0a0289a56bf7a97c52acc7c90892fcabce97a6",
"3fc59f0905b6c97984d3d1f1f2baab90502e9cbd",
"3dd46cf59d439c21ea2bd846b75f58fbe70c9658",
"226f904f1886516d834044db054568a25042a2a9",
]
22 changes: 0 additions & 22 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,25 +58,3 @@ pull_request_rules:
- status-success=Unit tests (py310-unittest)
- status-success=Integration tests (3.9)
- status-success=Integration tests (3.10)

- name: Automatic merge Dependabot PRs
actions:
queue:
name: default
method: rebase
conditions:
- label!=WIP
- -draft
- author=dependabot[bot]
- approved-reviews-by=github-actions[bot]
- "#changes-requested-reviews-by=0"
- status-success=DCO
- status-success=Misc tests (lint)
- status-success=Misc tests (format)
- status-success=Misc tests (licenses)
- status-success=Misc tests (security)
- status-success=Misc tests (docs)
- status-success=Unit tests (py39-unittest)
- status-success=Unit tests (py310-unittest)
- status-success=Integration tests (3.9)
- status-success=Integration tests (3.10)
16 changes: 0 additions & 16 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,6 @@ actions:
- "sh -c 'wget https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py && python3 install-poetry.py --version 1.1.7 && rm install-poetry.py'"

jobs:
# upon upstream PRs, perform COPR builds
- job: copr_build
trigger: pull_request
metadata:
targets:
- fedora-latest-stable
- fedora-development

# upon upstream PRs, test builds
- job: tests
trigger: pull_request
Expand All @@ -59,14 +51,6 @@ jobs:
- fedora-latest-stable
- fedora-development

# upon upstream releases, test builds
- job: tests
trigger: release
metadata:
targets:
- fedora-latest-stable
- fedora-development

# upon downstream changes, create a PR upstream with sync'd files from above
- job: sync_from_downstream
trigger: commit
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repos:
# - --py39-plus

- repo: https://github.com/psf/black
rev: 23.1.0
rev: 23.7.0
hooks:
- id: black
language_version: python3
Expand Down Expand Up @@ -49,7 +49,7 @@ repos:
additional_dependencies: [sphinx]

- repo: https://github.com/dhatim/python-license-check
rev: master
rev: 0.9.1
hooks:
- id: liccheck
entry: ./devel/run-liccheck.sh
Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@
intersphinx_mapping = {"python": ("https://docs.python.org/3", None)}

extlinks = {
"commit": ("https://github.com/fedora-infra/noggin/commit/%s", ""),
"issue": ("https://github.com/fedora-infra/noggin/issues/%s", "#"),
"pr": ("https://github.com/fedora-infra/noggin/pull/%s", "PR#"),
"commit": ("https://github.com/fedora-infra/noggin/commit/%s", "%s"),
"issue": ("https://github.com/fedora-infra/noggin/issues/%s", "#%s"),
"pr": ("https://github.com/fedora-infra/noggin/pull/%s", "PR#%s"),
}

# -- Misc -----
Expand Down
1 change: 1 addition & 0 deletions news/1202.bug
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix the boolean values (checkboxes) not showing up in the profile page
2 changes: 1 addition & 1 deletion noggin/representation/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def attr_to_list(value):
def attr_to_bool(value):
if not value:
return False
return value[0] == "TRUE"
return value[0] in (True, "TRUE")


def attr_to_date(value):
Expand Down
49 changes: 49 additions & 0 deletions noggin/themes/almalinux/static/css/default.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*CSS rules for the 'almalinux' noggin theme */

body {
font-family: 'Montserrat', sans-serif;
font-weight: 400;
color: #000518;
}

.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
font-weight: 650;
line-height: 2;
}

.navbar-dark { background-color: #082336; color: #fff; }

.row { margin-left: 0 }

.btn-primary,
.btn-outline-primary { color: #264154; background-color: #fff; border-color: #082336; }
.btn-outline-primary:hover,
.btn-primary:hover { color: #fff; background-color: #004bbc; border-color: #082336; }
a, .btn-link { color: #264154 }
a:hover, .btn-link { color: #304b5e }

.badge-secondary { background-color: #2e3344; }

.text-info { color: #88c0d0 }
.text-success { color: #8fbcbb; }

div.media.align-items-center img { border-radius: 50%; }

.card.card-body {
margin-bottom: 10px !important;
}

ul.list-unstyled.row li {
padding-left: 0;
}

span.logo-text {
line-height: 5px;
display: block;
height: 50%;
}

span.logo-text-top {
display: flex;
align-items: flex-end;
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading

0 comments on commit b1fc93e

Please sign in to comment.