Skip to content

Commit

Permalink
Merge pull request #132 from glitchassassin/develop
Browse files Browse the repository at this point in the history
v0.7.3
  • Loading branch information
glitchassassin authored Nov 13, 2018
2 parents 24a0d8b + d150e6a commit 7adadfa
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 7 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ matrix:
- os: osx
language: generic
env: PYTHON=3.6.3
- os: osx
language: generic
env: PYTHON=3.7

before_install: "if [ \"$TRAVIS_OS_NAME\" == \"osx\" ]; then\n brew update\n brew
install openssl readline\n\n # install pyenv\n git clone --depth 1 https://github.com/pyenv/pyenv
Expand All @@ -30,4 +33,4 @@ script:
after_success:
- python setup.py bdist_wheel
- python setup.py sdist
- ls dist
- ls dist
7 changes: 5 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ environment:
- PYTHON: "C:\\Python27"
- PYTHON: "C:\\Python27-x64"

- PYTHON: "C:\\Python35"
- PYTHON: "C:\\Python35-x64"
- PYTHON: "C:\\Python36"
- PYTHON: "C:\\Python36-x64"

- PYTHON: "C:\\Python37"
- PYTHON: "C:\\Python37-x64"

install:
# If there is a newer build queued for the same PR, cancel this one.
Expand Down
2 changes: 1 addition & 1 deletion lackey/RegionMatching.py
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,7 @@ def findBest(self, pattern):
findFailedRetry = True
while findFailedRetry:
best_match = None
all_matches = self.findAll(*args)
all_matches = self.findAll(pattern)
for match in all_matches:
if best_match is None or best_match.getScore() < match.getScore():
best_match = match
Expand Down
2 changes: 1 addition & 1 deletion lackey/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"""

__version__ = "0.7.2"
__version__ = "0.7.3"
__sikuli_version__ = "1.1.0"
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ opencv-python
wheel
pyperclip
keyboard>=v0.9.13
twine
twine
mouse
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class BinaryDistribution(Distribution):
def is_pure(self):
return False

install_requires = ['requests', 'pillow', 'numpy', 'opencv-python', 'keyboard', 'pyperclip']
install_requires = ['requests', 'pillow', 'numpy', 'opencv-python', 'keyboard', 'mouse', 'pyperclip']
if platform.system() == "Darwin":
install_requires += ['pyobjc']

Expand Down

0 comments on commit 7adadfa

Please sign in to comment.