From 88e18ded588ee3c778724fbe7410a55a968b6403 Mon Sep 17 00:00:00 2001 From: escaped Date: Tue, 5 Jan 2021 01:13:19 +0000 Subject: [PATCH] chore: update project structure to 0a3ffcfa --- .cruft.json | 2 +- .github/workflows/release.yml | 1 + .github/workflows/test.yml | 2 +- .github/workflows/update.yml | 7 +++++-- .pre-commit-config.yaml | 8 ++++++++ README.md | 1 - README.md.rej | 15 +++++++++++++++ pyproject.toml.rej | 12 ++++++++++++ tox.ini | 2 ++ 9 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 README.md.rej create mode 100644 pyproject.toml.rej diff --git a/.cruft.json b/.cruft.json index 9020392..755b6a6 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/escaped/cookiecutter-pypackage.git", - "commit": "a20d0309738174fd9c5e9d10a03c1d9d5e610bbb", + "commit": "0a3ffcfa9a93a2e59037b38e605250b919064030", "context": { "cookiecutter": { "author": "Alexander Frenzel", diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f140526..4267624 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,6 +36,7 @@ jobs: draft: ${{ steps.changelog_reader.outputs.status == 'unreleased' }} publish: + needs: [release] name: Build and publish Python distributions to PyPI runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9d48c47..cdb6348 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,7 +35,7 @@ jobs: max-parallel: 4 matrix: platform: [ubuntu-latest] - python-version: [3.6, 3.7, 3.8] + python-version: [3.6, 3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index a1ac9c1..fa5e8f6 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -14,10 +14,13 @@ jobs: python-version: 3.8.5 - name: Install dependencies - run: pip install cruft jello + run: pip install cruft poetry jello - name: Update project structure - run: cruft update -y + run: | + cruft update -y + poetry lock --no-update # add new dependencies + poetry run pre-commit run -a - name: Get new template version # extract new cooiecutter template version diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7593eed..b288b5b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,6 +7,14 @@ repos: language: system entry: poetry run black types: [python] + + - repo: local + hooks: + - id: autoflake + name: autoflake + language: system + entry: poetry run autoflake --expand-star-imports --remove-all-unused-imports --remove-unused-variables --in-place --recursive tests/ networkx_astar_path/ + types: [python] - repo: local hooks: diff --git a/README.md b/README.md index e585672..4945763 100644 --- a/README.md +++ b/README.md @@ -121,4 +121,3 @@ cruft update ``` in the root of this repository. - diff --git a/README.md.rej b/README.md.rej new file mode 100644 index 0000000..8abb95b --- /dev/null +++ b/README.md.rej @@ -0,0 +1,15 @@ +diff a/README.md b/README.md (rejected hunks) +@@ -11,8 +11,12 @@ Alternative A* implementation, which provides the current and previous edge to t + ## Requirements + + * Python 3.6.1 or newer +-* [poetry](https://poetry.eustance.io/) 1.1 or newer + ++## Installation ++ ++```sh ++pip install networkx-astar-path ++``` + + ## Development + diff --git a/pyproject.toml.rej b/pyproject.toml.rej new file mode 100644 index 0000000..7544bd7 --- /dev/null +++ b/pyproject.toml.rej @@ -0,0 +1,12 @@ +diff a/pyproject.toml b/pyproject.toml (rejected hunks) +@@ -38,8 +38,10 @@ python = ">=3.6.1, <4.0" + + + [tool.poetry.dev-dependencies] ++autoflake = "^1.4" + black = "^20.8b1" + flake8 = "^3.8.3" ++flake8-bugbear = "^20.11.1" + isort = "^5.5.2" + mypy = "^0.782" + pre-commit = "^2.7.1" diff --git a/tox.ini b/tox.ini index 73de660..7b5cb97 100644 --- a/tox.ini +++ b/tox.ini @@ -3,6 +3,7 @@ python = 3.6: py36 3.7: py37 3.8: py38 + 3.9: py39 [tox] skipsdist = True @@ -11,6 +12,7 @@ envlist = py36 py37 py38 + py39 [testenv] skip_install = True