Skip to content

Commit

Permalink
Merge pull request #238 from fyntex/develop
Browse files Browse the repository at this point in the history
Deploy release v0.6.1
  • Loading branch information
svillegas-cdd authored Jun 13, 2023
2 parents 2584b35 + 7b1a58b commit cccf112
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[bumpversion]
current_version = 0.6.0
current_version = 0.6.1
commit = True
tag = False

[bumpversion:file:fd_dj_accounts/__init__.py]

6 changes: 5 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,11 @@ jobs:
source "$PYTHON_VIRTUALENV_ACTIVATE"
make test-coverage-report
codecov
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3.1.2
with:
directory: ./test-reports/coverage/
fail_ci_if_error: true

- name: Store Artifacts
if: ${{ always() }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ jobs:
uses: actions/checkout@v3.3.0

- name: Dependency Review
uses: actions/dependency-review-action@v3.0.3
uses: actions/dependency-review-action@v3.0.4
with:
fail-on-severity: critical
18 changes: 18 additions & 0 deletions .github/workflows/git-commit-lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# GitHub Actions Workflow for Git Commit Linter

name: Git Commit Linter

on:
pull_request:
types:
- opened
- reopened
- synchronize

permissions:
contents: read

jobs:
git-commit-lint:
name: Git Commit Linter
uses: cordada/github-actions-utils/.github/workflows/git-commit-lint.yaml@master
8 changes: 8 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ History
unreleased (YYYY-MM-DD)
+++++++++++++++++++++++

0.6.1 (2023-06-09)
++++++++++++++++++

- (PR #228, 2023-04-04) Add Git commit linter
- (PR #225, 2023-04-05) Bump wheel from 0.38.4 to 0.40.0
- (PR #227, 2023-05-23) chore(deps): Bump actions/dependency-review-action from 3.0.3 to 3.0.4
- (PR #234, 2023-06-05) Add Codecov to CI workflow

0.6.0 (2023-03-14)
++++++++++++++++++

Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ TOXENV ?= py310
.PHONY: clean clean-build clean-pyc clean-test
.PHONY: install-dev install-deps-dev
.PHONY: lint test test-all test-coverage
.PHONY: test-coverage-report test-coverage-report-console test-coverage-report-html
.PHONY: test-coverage-report test-coverage-report-console test-coverage-report-xml test-coverage-report-html
.PHONY: docs build dist deploy upload-release
.PHONY: docker-compose-run-test
.PHONY: python-virtualenv
Expand Down Expand Up @@ -79,12 +79,16 @@ test-coverage: ## run tests and record test coverage
coverage run --rcfile=setup.cfg runtests.py tests

test-coverage-report: test-coverage-report-console
test-coverage-report: test-coverage-report-xml
test-coverage-report: test-coverage-report-html
test-coverage-report: ## Run tests, measure code coverage, and generate reports

test-coverage-report-console: ## print test coverage summary
coverage report --rcfile=setup.cfg -m

test-coverage-report-xml: ## Generate test coverage XML report
coverage xml --rcfile=setup.cfg

test-coverage-report-html: ## generate test coverage HTML report
coverage html --rcfile=setup.cfg

Expand Down
10 changes: 10 additions & 0 deletions commitlint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*
Commitlint Configuration
Commitlint is a Git commit message linter.
- Web site: https://commitlint.js.org/
- Documentation: https://github.com/conventional-changelog/commitlint#readme
*/

module.exports = { extends: ["@cordada/commitlint-config-cordada"] };
2 changes: 1 addition & 1 deletion fd_dj_accounts/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"""


__version__ = '0.6.0'
__version__ = '0.6.1'


default_app_config = 'fd_dj_accounts.apps.AccountsAppConfig'
2 changes: 1 addition & 1 deletion requirements_release.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
bumpversion==0.5.3
setuptools==67.6.0
twine==4.0.1
wheel==0.38.4
wheel==0.40.0
1 change: 0 additions & 1 deletion requirements_test.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
-r requirements.txt

codecov==2.1.11
coverage==7.2.1
flake8==3.8.4
mypy==1.1.1
Expand Down
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ exclude_lines =
if __name__ == .__main__.
show_missing = True

[coverage:xml]
output = test-reports/coverage/xml/coverage.xml

[coverage:html]
directory = test-reports/coverage/html

Expand Down

0 comments on commit cccf112

Please sign in to comment.