Skip to content

Commit

Permalink
Merge branch 'release/v0.1.1'
Browse files Browse the repository at this point in the history
* release/v0.1.1:
  bump to v0.1.1
  Bump actions/cache from v2 to v2.1.4 (#2)
  Bump pypa/gh-action-pypi-publish from v1.4.1 to v1.4.2 (#3)
  Bump actions/setup-python from v1 to v2.2.1 (#1)
  Bump snok/install-poetry from v1.1.1 to v1.1.2 (#4)
  Fix: pyprojects.toml dependency order
  • Loading branch information
MichaelSasser committed Mar 16, 2021
2 parents c1c3038 + 91eb1b3 commit ff2327a
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 50 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.9
uses: actions/setup-python@v1
uses: actions/setup-python@v2.2.1
with:
python-version: 3.9

- name: Install Poetry
uses: snok/install-poetry@v1.1.1
uses: snok/install-poetry@v1.1.2
with:
virtualenvs-create: true
virtualenvs-in-project: true

- name: Load cached venv
id: cached-poetry-dependencies
uses: actions/cache@v2
uses: actions/cache@v2.1.4
with:
path: .venv
key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2
- name: Set up Python 3.9
uses: actions/setup-python@v1
uses: actions/setup-python@v2.2.1
with:
python-version: 3.9

- name: Install Poetry
uses: snok/install-poetry@v1.1.1
uses: snok/install-poetry@v1.1.2
with:
virtualenvs-create: true
virtualenvs-in-project: true

- name: Load cached venv
id: cached-poetry-dependencies
uses: actions/cache@v2
uses: actions/cache@v2.1.4
with:
path: .venv
key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2
- name: Set up Python 3.9
uses: actions/setup-python@v1
uses: actions/setup-python@v2.2.1
with:
python-version: 3.9

- name: Install Poetry
uses: snok/install-poetry@v1.1.1
uses: snok/install-poetry@v1.1.2
with:
virtualenvs-create: true
virtualenvs-in-project: true

- name: Load cached venv
id: cached-poetry-dependencies
uses: actions/cache@v2
uses: actions/cache@v2.1.4
with:
path: .venv
key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
Expand All @@ -50,7 +50,7 @@ jobs:
run: poetry build

- name: pypi-publish
uses: pypa/gh-action-pypi-publish@v1.4.1
uses: pypa/gh-action-pypi-publish@v1.4.2
with:
# PyPI user
# user: # optional, default is __token__
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DevTools Documentation
======================

DevTools (or ``devhelpers``) is a loose collection of python development
DevTools (or ``devhelpers``) is a loose collection of python development
helpers.

.. toctree::
Expand Down
56 changes: 28 additions & 28 deletions poetry.lock

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

20 changes: 9 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@

[tool.poetry]
name = "devhelpers"
version = "0.1.0"
version = "0.1.1"
description = "A Development Toolbox"
license = "GPL-3.0-or-later"
authors = ["Michael Sasser <Michael@MichaelSasser.org>"]
maintainers = ["Michael Sasser <Michael@MichaelSasser.org>"]
readme = "README.md"
repository = "https://github.com/MichaelSasser/devhelpers"
homepage = "https://github.com/MichaelSasser/devhelpers"
documentation = "https://github.com/MichaelSasser/devhelpers"
documentation = "https://michaelsasser.github.io/devhelpers/index.html"
keywords = ['devtools', 'development', 'tools']
# Look here for all Classifiers:
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
Expand All @@ -38,6 +38,9 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Topic :: Software Development",
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: Software Development :: Quality Assurance",
"Topic :: Software Development :: Testing",
"Typing :: Typed",
"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
]

Expand All @@ -48,11 +51,8 @@ python = "^3.9"
sphinx-autodoc-typehints = { version = "^1.11.1", optional = true }
Sphinx = { version = "^3.5.1", optional = true }
numpydoc = { version = "^1.1.0", optional = true }
mypy = "^0.800"
black = "^20.8b1"

[tool.poetry.extras]
# Docs
docs = ["sphinx", "sphinx-autodoc-typehints", "numpydoc"]

[tool.poetry.dev-dependencies]
Expand All @@ -66,18 +66,17 @@ neovim = "^0.3.1"
pydocstyle = "^5.1.1"
pylint = "^2.6.2"
pycodestyle = "^2.6.0"
yapf = "^0.30.0"
yapf = "^0.31.0"
vulture = "^2.3"
mypy = "^0.800.0"
mypy = "^0.812"
isort = "^5.7.0"
python-language-server = { version = "^0.36.2", extras = ["all"] }
black = { version = "*", allow-prereleases = true }
black = "^20.8b1"


[tool.black]
line-length = 79
include = '\.pyi?$'
# exclude __init__.py because of ordered importing
exclude = '''
/(
\.eggs
Expand Down Expand Up @@ -112,10 +111,9 @@ multi_line_output = 3
use_parentheses = true
skip_glob = ["*/setup.py", "*.rst", "*.md", "*.yaml", "*.txt", "*.yml", "*.lock", "*.toml", "*.ini", "Makefile"]
filter_files = true
known_first_party = "ds2000"
known_first_party = "devhelpers"
known_third_party = [
"pytest",
"sphinx_rtd_theme",
]

[tool.vulture]
Expand Down

0 comments on commit ff2327a

Please sign in to comment.