Skip to content
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
18 changes: 12 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
language: python
sudo: false
python:
- "2.6"
- "2.7"
install:
- "3.4"
before_install:
- "./.travis_python_dep.sh"
install: true
#- pip install pep8 --use-mirrors
#- pip install pyflakes --use-mirrors
- pip install robotframework
- pip install selenium
- pip install decorator
- pip install docutils
# Installation is done at before_install
##- pip install robotframework==3.0b1
##- pip install selenium
##- pip install decorator
##- pip install docutils
##- pip install future
# Mockito is only used when in Python 2.7
##- pip install mockito
#- "if [[ ${BROWSER} == 'ie' ]]; then pip install ie_only_pkg; fi"
before_script:
- "export DISPLAY=:99.0"
Expand Down
17 changes: 17 additions & 0 deletions .travis_python_dep.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash
set -ev
PYTHON_VERSION=`python -c "import sys; print(sys.version[:3])"`
if [ "${PYTHON_VERSION}" = "2.7" ]; then
pip install robotframework
pip install selenium
pip install decorator
pip install docutils
pip install future
pip install mockito
elif [ "${PYTHON_VERSION}" = "3.4" ]; then
pip install robotframework==3.0b1
pip install selenium
pip install decorator
pip install docutils
pip install future
fi
11 changes: 6 additions & 5 deletions build_dist.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env python

from __future__ import print_function
import os, sys, shutil, subprocess, argparse

THIS_DIR = os.path.dirname(os.path.abspath(__file__))
Expand Down Expand Up @@ -33,15 +34,15 @@ def clear_dist_folder():

def run_doc_gen():
import generate
print
print()
generate.main()

def run_register(args):
if args.release:
_run_setup(args.py_27_path, "register", [], False)

def run_builds(args):
print
print()
if not args.winonly:
_run_setup(args.py_27_path, "sdist", [ "--formats=gztar,zip" ], args.release)
_run_setup(args.py_26_path, "bdist_egg", [], args.release)
Expand All @@ -50,12 +51,12 @@ def run_builds(args):
_run_setup(args.py_27_path, "bdist_wininst", [ "--plat-name=win32" ], args.release)
_run_setup(args.py_27_path, "bdist_wininst", [ "--plat-name=win-amd64" ], args.release)
else:
print
print()
print("Windows binary installers cannot be built on this platform!")

def run_demo_packaging():
import package
print
print()
package.main()

def _run_setup(py_path, type, params, upload):
Expand All @@ -66,7 +67,7 @@ def _run_setup(py_path, type, params, upload):
if upload:
setup_args.append("upload")

print
print()
print("Running: %s" % ' '.join(setup_args))
returncode = subprocess.call(setup_args)
if returncode != 0:
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from past.builtins import execfile
#!/usr/bin/env python

import sys
Expand Down
7 changes: 4 additions & 3 deletions src/Selenium2Library/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from __future__ import absolute_import
import os
from keywords import *
from version import VERSION
from utils import LibraryListener
from .keywords import *
from .version import VERSION
from .utils import LibraryListener

__version__ = VERSION

Expand Down
25 changes: 13 additions & 12 deletions src/Selenium2Library/keywords/__init__.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
from _logging import _LoggingKeywords
from _runonfailure import _RunOnFailureKeywords
from _browsermanagement import _BrowserManagementKeywords
from _element import _ElementKeywords
from _tableelement import _TableElementKeywords
from _formelement import _FormElementKeywords
from _selectelement import _SelectElementKeywords
from _javascript import _JavaScriptKeywords
from _cookie import _CookieKeywords
from _screenshot import _ScreenshotKeywords
from _waiting import _WaitingKeywords
from _alert import _AlertKeywords
from __future__ import absolute_import
from ._logging import _LoggingKeywords
from ._runonfailure import _RunOnFailureKeywords
from ._browsermanagement import _BrowserManagementKeywords
from ._element import _ElementKeywords
from ._tableelement import _TableElementKeywords
from ._formelement import _FormElementKeywords
from ._selectelement import _SelectElementKeywords
from ._javascript import _JavaScriptKeywords
from ._cookie import _CookieKeywords
from ._screenshot import _ScreenshotKeywords
from ._waiting import _WaitingKeywords
from ._alert import _AlertKeywords

__all__ = [
"_LoggingKeywords",
Expand Down
Loading