Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/behave/behave
Browse files Browse the repository at this point in the history
  • Loading branch information
jenisys committed May 26, 2019
2 parents 9b5204e + 0290cc5 commit 26a8bc1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion py.requirements/basic.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
cucumber-tag-expressions >= 1.1.1
parse >= 1.8.2
parse_type >= 0.4.2
six >= 1.11.0
six >= 1.12.0

traceback2; python_version < '3.0'
contextlib2 # MAYBE: python_version < '3.5'
Expand Down
4 changes: 2 additions & 2 deletions py.requirements/develop.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
# -- BUILD-TOOL:
# PREPARE USAGE: invoke
# ALREADY: six >= 1.11.0
invoke >= 0.21.0
path.py >= 10.1
invoke >= 1.2.0
path.py >= 11.5.0
pathlib; python_version <= '3.4'
pycmd

Expand Down
2 changes: 1 addition & 1 deletion py.requirements/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ PyHamcrest >= 1.9

# -- NEEDED: By some tests (as proof of concept)
# NOTE: path.py-10.1 is required for python2.6
path.py >= 10.1
path.py >= 11.5.0
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def find_packages_by_root_package(where):
"cucumber-tag-expressions >= 1.1.1",
"parse >= 1.8.2",
"parse_type >= 0.4.2",
"six >= 1.11.0",
"six >= 1.12.0",
"traceback2; python_version < '3.0'",
"enum34; python_version < '3.4'",
# -- PREPARED:
Expand All @@ -93,7 +93,7 @@ def find_packages_by_root_package(where):
"nose >= 1.3",
"mock >= 1.1",
"PyHamcrest >= 1.8",
"path.py >= 10.1"
"path.py >= 11.5.0"
],
cmdclass = {
"behave_test": behave_test,
Expand All @@ -110,7 +110,7 @@ def find_packages_by_root_package(where):
"pytest-cov",
"tox",
"invoke >= 1.2.0",
"path.py >= 10.1",
"path.py >= 11.5.0",
"pycmd",
"pathlib; python_version <= '3.4'",
"modernize >= 0.5",
Expand Down

0 comments on commit 26a8bc1

Please sign in to comment.