Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
ducminh-phan committed Jul 16, 2022
2 parents f7cd578 + bb34e1d commit 148631d
Show file tree
Hide file tree
Showing 86 changed files with 3,219 additions and 469 deletions.
34 changes: 0 additions & 34 deletions .azure-pipelines-templates/jobs.yml

This file was deleted.

12 changes: 12 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[run]
source = reformat_gherkin
omit = reformat_gherkin/__main__.py

relative_files = True

[report]
exclude_lines =
pragma: no cover
if TYPE_CHECKING:
@abstractmethod
@overload
44 changes: 44 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Publish package

on:
workflow_run:
workflows:
- Test
types:
- completed
branches:
- master

jobs:
publish:
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.event == 'push' && github.event.workflow_run.conclusion == 'success' }}

env:
python_version: "3.8"
poetry_version: 1.1.14

steps:
- uses: actions/checkout@v3

- uses: actions/setup-python@v4
with:
python-version: ${{ env.python_version }}

- name: Cache poetry
uses: actions/cache@v3
with:
path: ~/.local
key: poetry-${{ env.python_version }}-${{ runner.os }}-${{ env.poetry_version }}

- name: Install Poetry
uses: snok/install-poetry@v1
with:
version: ${{ env.poetry_version }}
virtualenvs-create: true
virtualenvs-in-project: true

- run: |
poetry config pypi-token.pypi ${{ secrets.PYPI_TOKEN }}
poetry build
poetry publish
78 changes: 78 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: Test

on:
- push
- pull_request

jobs:
test:
strategy:
fail-fast: false
matrix:
python-version:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
os:
- ubuntu-latest
- macos-latest
- windows-latest

runs-on: ${{ matrix.os }}

env:
poetry_version: 1.1.14

defaults:
run:
shell: bash

steps:
- uses: actions/checkout@v3

- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Cache poetry
uses: actions/cache@v3
if: matrix.os != 'windows-latest'
with:
path: ~/.local
key: poetry-${{ matrix.python-version }}-${{ matrix.os }}-${{ env.poetry_version }}

- name: Install Poetry
uses: snok/install-poetry@v1
with:
version: ${{ env.poetry_version }}
virtualenvs-create: true
virtualenvs-in-project: true

- name: Cache dependencies
uses: actions/cache@v3
with:
path: .venv
key: deps-${{ matrix.python-version }}-${{ matrix.os }}-${{ hashFiles('poetry.lock') }}

- name: Install dependencies
run: poetry install

- name: Run tests
run: poetry run pytest --cov

- name: Coveralls
uses: AndreMiras/coveralls-python-action@develop
if: matrix.os == 'ubuntu-latest'
with:
parallel: true
flag-name: test

coveralls:
needs: test
runs-on: ubuntu-latest
steps:
- name: Coveralls finished
uses: AndreMiras/coveralls-python-action@develop
with:
parallel-finished: true
19 changes: 14 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,28 @@ repos:
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 22.1.0
rev: 22.6.0
hooks:
- id: black
- repo: https://gitlab.com/pycqa/flake8
rev: 3.9.2
- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
hooks:
- id: flake8
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.940
rev: v0.961
hooks:
- id: mypy
additional_dependencies:
- attrs==20.2
- attrs==21.4.0
- types-all
args:
- --ignore-missing-imports

ci:
autofix_commit_msg: |
[pre-commit.ci] Auto fixes from pre-commit hooks
For more information, see https://pre-commit.ci
autoupdate_branch: develop
autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate"
autoupdate_schedule: quarterly
39 changes: 0 additions & 39 deletions .travis.yml

This file was deleted.

11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [3.0.0] - 2022-07-16

### Changed

- Update `gherkin-official` version to `24.0.0`
- Keep newlines at the end of table cell values ([#51](https://github.com/ducminh-phan/reformat-gherkin/issues/51))
- Triple backticks in docstrings are not escaped to `` \`\`\` `` ([#32](https://github.com/ducminh-phan/reformat-gherkin/pull/32))

## [2.2.1] - 2022-03-14

### Fixed
Expand Down Expand Up @@ -91,7 +99,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Initial release

[unreleased]: https://github.com/ducminh-phan/reformat-gherkin/compare/v2.2.1...develop
[unreleased]: https://github.com/ducminh-phan/reformat-gherkin/compare/v3.0.0...develop
[3.0.0]: https://github.com/ducminh-phan/reformat-gherkin/compare/v2.2.1...v3.0.0
[2.2.1]: https://github.com/ducminh-phan/reformat-gherkin/compare/v2.2.0...v2.2.1
[2.2.0]: https://github.com/ducminh-phan/reformat-gherkin/compare/v2.1.1...v2.2.0
[2.1.1]: https://github.com/ducminh-phan/reformat-gherkin/compare/v2.1.0...v2.1.1
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Reformat-gherkin

[![Build Status](https://dev.azure.com/alephvn/reformat-gherkin/_apis/build/status/ducminh-phan.reformat-gherkin?branchName=master)](https://dev.azure.com/alephvn/reformat-gherkin/_build/latest?definitionId=1&branchName=master)
  [![Build Status](https://travis-ci.com/ducminh-phan/reformat-gherkin.svg?branch=master)](https://travis-ci.com/ducminh-phan/reformat-gherkin)
[![Test](https://github.com/ducminh-phan/reformat-gherkin/actions/workflows/test.yml/badge.svg)](https://github.com/ducminh-phan/reformat-gherkin/actions/workflows/test.yml)
  [![Coverage Status](https://coveralls.io/repos/github/ducminh-phan/reformat-gherkin/badge.svg?branch=master)](https://coveralls.io/github/ducminh-phan/reformat-gherkin?branch=master)

[![Maintainability](https://api.codeclimate.com/v1/badges/16718a231901c293215d/maintainability)](https://codeclimate.com/github/ducminh-phan/reformat-gherkin/maintainability)
Expand Down
12 changes: 0 additions & 12 deletions azure-pipelines.yml

This file was deleted.

Loading

0 comments on commit 148631d

Please sign in to comment.