Skip to content

Commit

Permalink
Merge 9a628c8 into d48445c
Browse files Browse the repository at this point in the history
  • Loading branch information
colinhoglund committed Apr 4, 2020
2 parents d48445c + 9a628c8 commit 45b254c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion piprepo/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def normalize(project):
def get_project_name_from_file(filename):
# PEP-440 compliant version
# https://www.python.org/dev/peps/pep-0440/#appendix-b-parsing-version-strings-with-regular-expressions
pep440 = '([1-9]\d*!)?(0|[1-9]\d*)(\.(0|[1-9]\d*))*((a|b|rc)(0|[1-9]\d*))?(\.post(0|[1-9]\d*))?(\.dev(0|[1-9]\d*))?'
pep440 = r'([1-9]\d*!)?(0|[1-9]\d*)(\.(0|[1-9]\d*))*((a|b|rc)(0|[1-9]\d*))?(\.post(0|[1-9]\d*))?(\.dev(0|[1-9]\d*))?'

# use pkg_resources to find project name for .eggs
if filename.endswith('.egg'):
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ envlist = py{27,35,36}-pip{8,9,10}
deps =
flake8
moto
pytest
pytest-cov
pytest==3.5.0
pytest-cov==2.5.1
usedevelop = true
commands =
pip8: pip install --upgrade pip>7,<9
Expand All @@ -16,4 +16,4 @@ commands =
pytest --cov=piprepo --cov-report=term-missing

[flake8]
max-line-length = 120
max-line-length = 130

0 comments on commit 45b254c

Please sign in to comment.