8000 Bump requirements.txt and requirements-dev.txt by carmenbianca · Pull Request #310 · fsfe/reuse-tool · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Bump requirements.txt and requirements-dev.txt #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs=0
# --enable=similarities". If you want to run only the classes checker, but have
# no Warning level messages displayed, use"--disable=all --enable=classes
# --disable=W"
disable=redefined-builtin,C0330,duplicate-code,logging-format-interpolation,line-too-long,implicit-str-concat,logging-fstring-interpolation
disable=redefined-builtin,C0330,duplicate-code,logging-format-interpolation,line-too-long,implicit-str-concat,logging-fstring-interpolation,unsubscriptable-object,inherit-non-class

[REPORTS]

Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ The versions follow [semantic versioning](https://semver.org).
### Security
-->

## Unreleased - YYYY-MM-DD

### Fixed

- Declared dependency on `python-debian <= 0.1.38`. Later versions of the
dependency do not import on Windows.

## 0.12.1 - 2020-12-17

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ blackcheck: ## check with black

.PHONY: black
black: ## format with black
isort -y -s build -s dist
isort src/ tests/ *.py
black .

.PHONY: reuse
Expand Down
28 changes: 14 additions & 14 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@

-r requirements.txt

recommonmark==0.6.0
sphinx_rtd_theme==0.4.3
sphinx-autodoc-typehints==1.10.3
sphinx==3.0.4
recommonmark==0.7.1
sphinx==3.4.3
sphinx-autodoc-typehints==1.11.1
sphinx-rtd-theme==0.5.1
sphinxcontrib-apidoc==0.3.0

black==19.10b0
isort==4.3.21
pylint==2.5.2
black==20.8b1
isort==5.7.0
pylint==2.6.0

pytest-cov==2.9.0
pytest==5.4.2
tox==3.15.1
pytest==6.2.2
pytest-cov==2.11.1
tox==3.21.2

bump2version==1.0.0
pre-commit==2.4.0
twine==3.1.1
bump2version==1.0.1
pre-commit==2.9.3
twine==3.3.0

wheel==0.34.2
wheel==0.36.2
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ license-expression==1.2
python-debian==0.1.38
requests==2.25.1

setuptools==51.0.0
setuptools==52.0.0
setuptools-scm==5.0.1
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
from setuptools.command.build_py import build_py

requirements = [
# For parsing .reuse/dep5.
"python-debian",
# For parsing .reuse/dep5. TODO: Later versions do not work on Windows.
"python-debian <= 0.1.38",
# For downloading from spdx/spdx-license-list-data. Could maybe use
# standard library instead?
"requests",
Expand Down
10 changes: 6 additions & 4 deletions src/reuse/_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,18 +287,20 @@ def __call__(self, string):
if not path.exists() and os.access(path.parent, os.W_OK):
return path
raise ArgumentTypeError(_("can't write to '{}'").format(path))
except OSError:
raise ArgumentTypeError(_("can't read or write '{}'").format(path))
except OSError as error:
raise ArgumentTypeError(
_("can't read or write '{}'").format(path)
) from error


def spdx_identifier(text: str) -> Expression:
"""argparse factory for creating SPDX expressions."""
try:
return _LICENSING.parse(text)
except (ExpressionError, ParseError):
except (ExpressionError, ParseError) as error:
raise ArgumentTypeError(
_("'{}' is not a valid SPDX expression, aborting").format(text)
)
) from error


def similar_spdx_identifiers(identifier: str) -> List[str]:
Expand Down
2 changes: 1 addition & 1 deletion src/reuse/header.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
_NEWLINE_PATTERN = re.compile(r"\n", re.MULTILINE)


class _TextSections(NamedTuple):
class _TextSections(NamedTuple): # pylint: disable=too-few-public-methods
"""Used to split up text in three parts."""

before: str
Expand Down
4 changes: 3 additions & 1 deletion src/reuse/report.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ def __call__(self, file_):
return _MultiprocessingResult(file_, None, exc)


class _MultiprocessingResult(NamedTuple):
class _MultiprocessingResult(
NamedTuple
): # pylint: disable=too-few-public-methods
"""Result of :class:`MultiprocessingContainer`."""

path: PathLike
Expand Down
6 changes: 2 additions & 4 deletions tests/test_comment.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ def test_parse_comment_generic_multi(Style):


def test_base_class_throws_errors():
"""When trying to do much of anything with the base class, expect errors.
"""
"""When trying to do much of anything with the base class, expect errors."""
with pytest.raises(CommentParseError):
CommentStyle.parse_comment("hello")
with pytest.raises(CommentCreateError):
Expand Down Expand Up @@ -166,8 +165,7 @@ def test_create_comment_python_force_multi():


def test_parse_comment_python_strip_newlines():
"""When given a comment, remove newlines before and after before parsing.
"""
"""When given a comment, remove newlines before and after before parsing."""
text = dedent(
"""

Expand Down
3 changes: 1 addition & 2 deletions tests/test_download.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ def test_download_404(monkeypatch):


def test_download_exception(monkeypatch):
"""If requests raises an exception itself, that exception is not escaped.
"""
"""If requests raises an exception itself, that exception is not escaped."""

def raise_exception(_):
raise requests.RequestException()
Expand Down
3 changes: 1 addition & 2 deletions tests/test_header.py
4656
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,7 @@ def test_find_and_replace_separate_shebang():


def test_find_and_replace_only_shebang():
"""When the file only contains a shebang, keep it at the top of the file.
"""
"""When the file only contains a shebang, keep it at the top of the file."""
spdx_info = SpdxInfo({"GPL-3.0-or-later"}, set())
text = cleandoc(
"""
Expand Down
0