Skip to content
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

Added the regex pypi package as an extras_require #161

Closed
wants to merge 1 commit into from
Closed
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: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ python:
- "3.4"
- "3.5"
- "3.6"
- "3.7"
- "3.8"
install:
- pip install tox tox-travis
script:
Expand Down
6 changes: 5 additions & 1 deletion parsimonious/expressions.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
# anything--for speed. And kill all the dots.

from inspect import getargspec
import re

try:
import regex as re
except ImportError:
import re

from six import integer_types, python_2_unicode_compatible
from six.moves import range
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
url='https://github.com/erikrose/parsimonious',
include_package_data=True,
install_requires=['six>=1.9.0'],
extras_require={
"regex": ["regex>=2020.04.04"],
},
classifiers=[
'Intended Audience :: Developers',
'Natural Language :: English',
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27, py34, py35, py36
envlist = py27, py34, py35, py36, py37, py38, py{27, 34, 35, 36, 37, 38}--regex

[tox:travis]
2.7 = py27
Expand All @@ -13,3 +13,4 @@ commands = nosetests parsimonious
deps =
nose
six>=1.9.0
regex: regex