Skip to content

Commit

Permalink
Merge pull request #865 from evgenymarkov/upgrade-deps
Browse files Browse the repository at this point in the history
Upgrade development dependencies, fix some types
  • Loading branch information
csmarchbanks committed Dec 6, 2022
2 parents 1dfc910 + 5ed71d8 commit d6e08e3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
4 changes: 2 additions & 2 deletions prometheus_client/exposition.py
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,8 @@ def basic_auth_handler(
timeout: Optional[float],
headers: List[Tuple[str, str]],
data: bytes,
username: str = None,
password: str = None,
username: Optional[str] = None,
password: Optional[str] = None,
) -> Callable[[], None]:
"""Handler that implements HTTP/HTTPS connections with Basic Auth.
Expand Down
2 changes: 1 addition & 1 deletion prometheus_client/metrics_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def __init__(self,
name: str,
documentation: str,
value: Optional[float] = None,
labels: Sequence[str] = None,
labels: Optional[Sequence[str]] = None,
created: Optional[float] = None,
unit: str = '',
):
Expand Down
14 changes: 5 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[tox]
envlist = coverage-clean,py3.6,py3.7,py3.8,py3.9,py3.10,pypy3.7,py3.9-nooptionals,coverage-report,flake8,isort,mypy


[base]
deps =
coverage
Expand All @@ -23,27 +22,25 @@ deps = coverage
skip_install = true
commands = coverage erase


[testenv:coverage-report]
deps = coverage
skip_install = true
commands =
coverage combine
coverage report


[testenv:flake8]
deps =
flake8==3.7.8
flake8-docstrings==1.5.0
flake8-import-order==0.18.1
flake8==6.0.0
flake8-docstrings==1.6.0
flake8-import-order==0.18.2
skip_install = true
commands =
flake8 prometheus_client/ tests/ setup.py

[testenv:isort]
deps =
isort==5.5.4
isort==5.10.1
skip_install = true
commands =
isort --check prometheus_client/ tests/ setup.py
Expand All @@ -52,7 +49,7 @@ commands =
deps =
pytest
asgiref
mypy==0.910
mypy==0.991
skip_install = true
commands =
mypy --install-types --non-interactive prometheus_client/ tests/
Expand All @@ -77,7 +74,6 @@ per-file-ignores = prometheus_client/__init__.py:F401
import-order-style = google
application-import-names = prometheus_client


[isort]
force_alphabetical_sort_within_sections = True
force_sort_within_sections = True
Expand Down

0 comments on commit d6e08e3

Please sign in to comment.