Skip to content

Commit

Permalink
Merge branch 'release-0.0.1' into releases-0.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
sinoroc committed Sep 17, 2020
2 parents 07b42bb + 6192135 commit aa13ebf
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 14 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@

.. Keep the current version number on line number 6
0.0.1
=====

2020-09-17

* Fix a small issue that blocked the usage under Python 3.5
* Make the dependencies mandatory


0.0.0
=====

Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ check:

.PHONY: lint
lint:
python3 -m pytest --mypy --pycodestyle --pydocstyle --pylint -m 'mypy or pycodestyle or pydocstyle or pylint'
python3 -m pytest --mypy --pycodestyle --pydocstyle --pylint --yapf \
-m 'mypy or pycodestyle or pydocstyle or pylint or yapf'


.PHONY: mypy
Expand Down Expand Up @@ -84,7 +85,7 @@ pytest:

.PHONY: review
review: check
python3 -m pytest --mypy --pycodestyle --pydocstyle --pylint
python3 -m pytest --mypy --pycodestyle --pydocstyle --pylint --yapf


.PHONY: clean
Expand Down
8 changes: 3 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,19 @@ url = https://pypi.org/project/tox-poetry-dev-dependencies/
[options]
install_requires =
importlib-metadata
poetry-core
tox
package_dir =
= src
packages = find:


[options.entry_points]
tox =
poetry_dev_dependencies = tox_poetry_dev_dependencies._hooks [plugin_tox]
poetry_dev_dependencies = tox_poetry_dev_dependencies._hooks


[options.extras_require]
plugin_tox =
poetry-core
tox
#
dev_package =
twine
wheel
Expand Down
7 changes: 2 additions & 5 deletions src/tox_poetry_dev_dependencies/_hooks.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#


"""Tox plugin hooks."""


import pathlib
import typing

Expand Down Expand Up @@ -53,14 +51,13 @@ def tox_configure(config: tox.config.Config) -> None:
def _get_dev_requirements(project_root_path: pathlib.Path) -> typing.List[str]:
poetry_factory = poetry.core.factory.Factory()
try:
poetry_ = poetry_factory.create_poetry(project_root_path)
poetry_ = poetry_factory.create_poetry(str(project_root_path))
except RuntimeError as runtime_error:
raise NoPoetryFound from runtime_error
else:
requirements = [
dependency.to_pep_508()
for dependency
in poetry_.package.dev_requires
for dependency in poetry_.package.dev_requires
]
return requirements

Expand Down
2 changes: 0 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ commands =
make review
extras =
dev_test
plugin_tox
whitelist_externals =
make

Expand All @@ -36,7 +35,6 @@ commands =
extras =
dev_package
dev_test
plugin_tox
usedevelop = True


Expand Down

0 comments on commit aa13ebf

Please sign in to comment.