Navigation Menu

Skip to content

Commit

Permalink
chore: update project structure to 201e2aa0
Browse files Browse the repository at this point in the history
* chore: update project structure to 201e2aa0

* fix: resolve conflicts

Co-authored-by: escaped <escaped@users.noreply.github.com>
  • Loading branch information
escaped and escaped committed Feb 19, 2021
1 parent 977145d commit 3ae360f
Show file tree
Hide file tree
Showing 5 changed files with 144 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .cruft.json
@@ -1,6 +1,6 @@
{
"template": "https://github.com/escaped/cookiecutter-pypackage.git",
"commit": "78c5496a422a0047307d337f970c73f01dd9e392",
"commit": "201e2aa005db39b8b3ab854658dc5d8da0822e3a",
"context": {
"cookiecutter": {
"author": "Alexander Frenzel",
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/update.yml
Expand Up @@ -19,17 +19,27 @@ jobs:
- name: Update project structure
run: |
cruft update -y
- name: Check if there are changes
id: changes
uses: UnicornGlobal/has-changes-action@v1.0.11

- name: apply additional changes and fixes
if: steps.changes.outputs.changed == 1
run: |
poetry lock --no-update # add new dependencies
poetry install
poetry run pre-commit run -a || true # we have to fix other issue manually
- name: Get new template version
if: steps.changes.outputs.changed == 1
# extract new cooiecutter template version
run: |
echo "TEMPLATE_COMMIT=$(cat .cruft.json | jello -r "_['commit'][:8]")" >> $GITHUB_ENV
# behaviour if PR already exists: https://github.com/marketplace/actions/create-pull-request#action-behaviour
- name: Create Pull Request
if: steps.changes.outputs.changed == 1
uses: peter-evans/create-pull-request@v3
with:
token: ${{ secrets.AUTO_UPDATE_GITHUB_TOKEN }}
Expand All @@ -39,4 +49,3 @@ jobs:
body: ""
branch: chore/cookiecutter-pypackage
delete-branch: true

3 changes: 3 additions & 0 deletions README.md
Expand Up @@ -324,6 +324,9 @@ managing all dependencies and [pre-commit](https://pre-commit.com/) to run
[flake8](http://flake8.pycqa.org/), [isort](https://pycqa.github.io/isort/),
[mypy](http://mypy-lang.org/) and [black](https://github.com/python/black).

Additionally, [pdbpp](https://github.com/pdbpp/pdbpp) and [better-exceptions](https://github.com/qix-/better-exceptions) are installed to provide a better debugging experience.
To enable `better-exceptions` you have to run `export BETTER_EXCEPTIONS=1` in your current session/terminal.

Clone this repository and run

```bash
Expand Down
139 changes: 123 additions & 16 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions pyproject.toml
Expand Up @@ -24,6 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Topic :: Software Development :: Libraries :: Python Modules",
]

Expand All @@ -33,20 +34,24 @@ packages = [

[tool.poetry.dependencies]
python = ">=3.6.1, <4.0"
django-appconf = "^1.0"

django = ">=2.2"

django-appconf = "^1.0"
pillow = ">=5.0"

[tool.poetry.dev-dependencies]
autoflake = "^1.4"
better-exceptions = "^0.3.2"
black = "^20.8b1"
flake8 = "^3.8.3"
flake8-bugbear = "^20.11.1"
flake8-builtins = "^1.5.3"
flake8-comprehensions = "^3.3.1"
flake8-debugger = "^4.0.0"
isort = "^5.5.2"
mypy = "^0.782"
mypy = "^0.800"
pdbpp = "^0.10.2"
pep8-naming = "^0.11.1"
pre-commit = "^2.7.1"
pytest = "^6.0.1"
Expand Down

0 comments on commit 3ae360f

Please sign in to comment.