Merge branch 'master' of github.com:hartym/bonobo-selenium

Author: hartym

.coveragerc

@@ -0,0 +1,26 @@
+[run]
+branch = True
+
+[report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain about missing debug-only code:
+    def __repr__
+    if self\.debug
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise AbstractError
+    raise AssertionError
+    raise NotImplementedError
+
+    # Don't complain if non-runnable code isn't run:
+    if 0:
+    if __name__ == .__main__.:
+
+ignore_errors = True
+
+[html]
+directory = docs/_build/html/coverage

.gitignore

@@ -3,6 +3,7 @@
 *,cover
 *.egg
 *.egg-info/
+*.iml
 *.log
 *.manifest
 *.mo

.travis.yml

@@ -9,6 +9,6 @@ install:
   - make install-dev
   - pip install coveralls
 script:
-  - make clean docs test
+  - make clean test
 after_success:
   - coveralls

Makefile

@@ -1,52 +1,44 @@
 # This file has been auto-generated.
 # All changes will be lost, see Projectfile.
 #
-# Updated at 2016-12-28 13:00:03.652442
+# Updated at 2017-06-11 11:44:27.482152
 
+PACKAGE ?= bonobo_selenium
 PYTHON ?= $(shell which python)
 PYTHON_BASENAME ?= $(shell basename $(PYTHON))
+PYTHON_DIRNAME ?= $(shell dirname $(PYTHON))
 PYTHON_REQUIREMENTS_FILE ?= requirements.txt
 PYTHON_REQUIREMENTS_DEV_FILE ?= requirements-dev.txt
 QUICK ?= 
-VIRTUAL_ENV ?= .virtualenv-$(PYTHON_BASENAME)
-PIP ?= $(VIRTUAL_ENV)/bin/pip
-PYTEST ?= $(VIRTUAL_ENV)/bin/pytest
-PYTEST_OPTIONS ?= --capture=no --cov=bonobo_selenium --cov-report html
-SPHINX_OPTS ?= 
-SPHINX_BUILD ?= $(VIRTUAL_ENV)/bin/sphinx-build
-SPHINX_SOURCEDIR ?= docs
-SPHINX_BUILDDIR ?= $(SPHINX_SOURCEDIR)/_build
+PIP ?= $(PYTHON_DIRNAME)/pip
+PIP_INSTALL_OPTIONS ?= 
+PYTEST ?= $(PYTHON_DIRNAME)/pytest
+PYTEST_OPTIONS ?= --capture=no --cov=$(PACKAGE) --cov-report html
+YAPF ?= $(PYTHON) -m yapf
+YAPF_OPTIONS ?= -rip
+VERSION ?= $(shell git describe 2>/dev/null || echo dev)
 
-.PHONY: $(SPHINX_SOURCEDIR) clean install install-dev lint test
+.PHONY: clean format install install-dev test
 
 # Installs the local project dependencies.
-install: $(VIRTUAL_ENV)
+install:
 	if [ -z "$(QUICK)" ]; then \
-	    $(PIP) install -Ur $(PYTHON_REQUIREMENTS_FILE) ; \
+	    $(PIP) install -U pip wheel $(PYTHON_PIP_INSTALL_OPTIONS) -r $(PYTHON_REQUIREMENTS_FILE) ; \
 	fi
 
 # Installs the local project dependencies, including development-only libraries.
-install-dev: $(VIRTUAL_ENV)
+install-dev:
 	if [ -z "$(QUICK)" ]; then \
-	    $(PIP) install -Ur $(PYTHON_REQUIREMENTS_DEV_FILE) ; \
+	    $(PIP) install -U pip wheel $(PYTHON_PIP_INSTALL_OPTIONS) -r $(PYTHON_REQUIREMENTS_DEV_FILE) ; \
 	fi
 
 # Cleans up the local mess.
 clean:
-	rm -rf build
-	rm -rf dist
-
-# Setup the local virtualenv, or use the one provided by the current environment.
-$(VIRTUAL_ENV):
-	virtualenv -p $(PYTHON) $(VIRTUAL_ENV)
-	$(PIP) install -U pip\>=8.1.2,\<9 wheel\>=0.29,\<1.0
-	ln -fs $(VIRTUAL_ENV)/bin/activate activate-$(PYTHON_BASENAME)
-
-lint: install-dev
-	$(VIRTUAL_ENV)/bin/pylint --py3k bonobo_selenium -f html > pylint.html
+	rm -rf build dist *.egg-info
 
 test: install-dev
 	$(PYTEST) $(PYTEST_OPTIONS) tests
 
-$(SPHINX_SOURCEDIR): install-dev
-	$(SPHINX_BUILD) -b html -D latex_paper_size=a4 $(SPHINX_OPTS) $(SPHINX_SOURCEDIR) $(SPHINX_BUILDDIR)/html
+format: install-dev
+	$(YAPF) $(YAPF_OPTIONS) .
+	$(YAPF) $(YAPF_OPTIONS) Projectfile

Projectfile

@@ -1,43 +1,26 @@
 # bonobo-selenium (see github.com/python-bonobo/bonobo-selenium)
 
-name = 'bonobo_selenium'
-description = 'Bonobo Selenium Extension'
-license = 'Apache License, Version 2.0'
+from edgy.project import require
 
-url = 'https://bonobo-project.org/'
-download_url = 'https://github.com/python-bonobo/bonobo-selenium/tarball/{version}'
+pytest = require('pytest')
+python = require('python')
+yapf = require('yapf')
 
-author = 'Romain Dorgueil'
-author_email = 'romain@dorgueil.net'
+python.setup(
+    name='bonobo_selenium',
+    description='Bonobo Selenium Extension',
+    license='Apache License, Version 2.0',
+    url='https://bonobo-project.org/with/selenium',
+    download_url='https://github.com/python-bonobo/bonobo-selenium/tarball/{version}',
+    author='Romain Dorgueil',
+    author_email='romain@dorgueil.net', )
 
-enable_features = {
-    'make',
-    'sphinx',
-    'pytest',
-    'git',
-    'pylint',
-    'python',
-}
+bonobo_version = '>=0.4,<0.5'
+python.add_requirements(
+    'bonobo ' + bonobo_version,
+    'selenium >=3.4,<3.5',
+    dev=[
+        'bonobo[dev] ' + bonobo_version,
+    ], )
 
-install_requires = [
-    'bonobo',
-    'selenium >=3.0.2,<3.1',
-]
-
-extras_require = {
-    'dev': [
-        'coverage >=4.2,<4.3',
-        'mock >=2.0,<2.1',
-        'nose >=1.3,<1.4',
-        'pylint >=1.6,<1.7',
-        'pytest >=3,<4',
-        'pytest-cov >=2.4,<2.5',
-        'sphinx',
-        'sphinx_rtd_theme',
-        'yapf',
-    ],
-}
-
-@listen('edgy.project.feature.make.on_generate', priority=10)
-def on_make_generate_docker_targets(event):
-    event.makefile['SPHINX_SOURCEDIR'] = 'docs'
+# vim: ft=python:

bonobo_selenium/__init__.py

@@ -1,6 +1,6 @@
 import selenium.webdriver
 
-from bonobo import service
+from bonobo._version import __version__
 
 USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_3) AppleWebKit/601.4.4 (KHTML, like Gecko) Version/9.0.3 Safari/601.4.4'
 
@@ -23,16 +23,18 @@ def create_profile(use_tor=False):
 
 def create_browser(profile):
     _browser = selenium.webdriver.Firefox(profile)
-    _browser.implicitly_wait(10)
-    _browser.set_page_load_timeout(10)
+    # _browser.implicitly_wait(10)
+    # _browser.set_page_load_timeout(10)
     return _browser
 
+def create_chrome_browser():
+    browser = selenium.webdriver.Chrome()
+    return browser
 
-@service
-def browser():
-    return create_browser(create_profile(use_tor=False))
 
-
-@service
-def torbrowser():
-    return create_browser(create_profile(use_tor=True))
+__all__ = [
+    'USER_AGENT',
+    '__version__',
+    'create_browser',
+    'create_profile',
+]

bonobo_selenium/_version.py

@@ -0,0 +1 @@
+__version__ = '0.1.0'

requirements-dev.txt

@@ -1 +1,22 @@
 -e .[dev]
+appdirs==1.4.3
+bonobo==0.4.1
+certifi==2017.4.17
+chardet==3.0.4
+colorama==0.3.9
+coverage==4.4.1
+enum34==1.1.6
+fs==2.0.3
+idna==2.5
+packaging==16.8
+pbr==3.0.1
+psutil==5.2.2
+py==1.4.34
+pyparsing==2.2.0
+pytest-cov==2.5.1
+pytest==3.1.2
+pytz==2017.2
+requests==2.17.3
+six==1.10.0
+stevedore==1.23.0
+urllib3==1.21.1

requirements.txt

@@ -1 +1,19 @@
 -e .
+appdirs==1.4.3
+bonobo==0.4.1
+certifi==2017.4.17
+chardet==3.0.4
+colorama==0.3.9
+enum34==1.1.6
+fs==2.0.3
+idna==2.5
+packaging==16.8
+pbr==3.0.1
+psutil==5.2.2
+pyparsing==2.2.0
+pytz==2017.2
+requests==2.17.3
+selenium==3.4.3
+six==1.10.0
+stevedore==1.23.0
+urllib3==1.21.1

setup.py

@@ -2,38 +2,59 @@
 # All changes will be overwritten.
 
 from setuptools import setup, find_packages
+from codecs import open
+from os import path
+
+here = path.abspath(path.dirname(__file__))
+
+# Py3 compatibility hacks, borrowed from IPython.
+try:
+    execfile
+except NameError:
+
+    def execfile(fname, globs, locs=None):
+        locs = locs or globs
+        exec(compile(open(fname).read(), fname, "exec"), globs, locs)
 
-tolines = lambda c: list(filter(None, map(lambda s: s.strip(), c.split('\n'))))
 
-def read(filename, flt=None):
-    with open(filename) as f:
-        content = f.read().strip()
-        return flt(content) if callable(flt) else content
+# Get the long description from the README file
+try:
+    with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
+        long_description = f.read()
+except:
+    long_description = ''
+
+# Get the classifiers from the classifiers file
+tolines = lambda c: list(filter(None, map(lambda s: s.strip(), c.split('\n'))))
+try:
+    with open(path.join(here, 'classifiers.txt'), encoding='utf-8') as f:
+        classifiers = tolines(f.read())
+except:
+    classifiers = []
 
+version_ns = {}
 try:
-    version = read('version.txt')
-except:  # pylint: disable=bare-except
+    execfile(path.join(here, 'bonobo_selenium/_version.py'), version_ns)
+except EnvironmentError:
     version = 'dev'
+else:
+    version = version_ns.get('__version__', 'dev')
 
 setup(
-    name = 'bonobo_selenium',
-    description = 'Bonobo Selenium Extension',
-    license = 'Apache License, Version 2.0',
-    install_requires = ['bonobo', 'selenium >=3.0.2,<3.1'],
-    version = version,
-    long_description = read('README.rst'),
-    classifiers = read('classifiers.txt', tolines),
-    packages = find_packages(exclude=['ez_setup', 'example', 'test']),
-    include_package_data = True,
-    extras_require = {'dev': ['coverage >=4.2,<4.3',
-         'mock >=2.0,<2.1',
-         'nose >=1.3,<1.4',
-         'pylint >=1.6,<1.7',
-         'pytest >=3,<4',
-         'pytest-cov >=2.4,<2.5',
-         'sphinx',
-         'sphinx_rtd_theme',
-         'yapf']},
-    url = 'https://bonobo-project.org/',
-    download_url = 'https://github.com/python-bonobo/bonobo-selenium/tarball/{version}'.format(version=version),
-)
+    author='Romain Dorgueil',
+    author_email='romain@dorgueil.net',
+    description='Bonobo Selenium Extension',
+    license='Apache License, Version 2.0',
+    name='bonobo_selenium',
+    version=version,
+    long_description=long_description,
+    classifiers=classifiers,
+    packages=find_packages(exclude=['ez_setup', 'example', 'test']),
+    include_package_data=True,
+    install_requires=['bonobo (>= 0.4, < 0.5)', 'selenium (>= 3.4, < 3.5)'],
+    extras_require={
+        'dev':
+        ['bonobo (>= 0.4, < 0.5)', 'coverage (>= 4.4, < 5.0)', 'pytest (>= 3.1, < 4.0)', 'pytest-cov (>= 2.5, < 3.0)']
+    },
+    url='https://bonobo-project.org/with/selenium',
+    download_url='https://github.com/python-bonobo/bonobo-selenium/tarball/{version}'.format(version=version), )