Skip to content

Commit

Permalink
Add some missing setup arguments raised as warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffFranklin committed Nov 20, 2018
1 parent 8516b37 commit 8f69a56
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 15 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ build
dist
package-lock.json
webdriver-report
VERSION
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ python:
- '3.6'
node_js: node
install:
- git describe --tags > VERSION
- git describe --tags > webdriver_recorder/VERSION
- pip install -U pip setuptools
- pip install python-coveralls coverage
- npm install phantomjs-prebuilt
script:
- coverage run --source=. --omit='.eggs/*' setup.py test
- coveralls
before_deploy:
deploy:
skip_cleanup: true
provider: pypi
Expand Down
File renamed without changes.
29 changes: 16 additions & 13 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,35 @@
import re
from setuptools import setup
BASE_DIR = os.path.abspath(os.path.dirname(__file__))
VERSION_FILE = os.path.join(BASE_DIR, 'VERSION')
VERSION_FILE = os.path.join(BASE_DIR, 'webdriver_recorder', 'VERSION')

if os.path.isfile(VERSION_FILE):
# tag written to 'VERSION' via CI.
with open(VERSION_FILE) as fd:
VERSION = fd.read().strip()
VERSION = re.sub('^v', '', VERSION)
else:
VERSION = '0.0.1'
def strip_comments(line): return line.split('#')[0]
VERSION = ''.join(map(strip_comments, open(VERSION_FILE).readlines())).strip()
VERSION = re.sub('^v', '', VERSION)

desc = 'Enhances a selenium webdriver to record screenshots along the way'
with open(os.path.join(BASE_DIR, 'Readme.md')) as fd:
long_description = fd.read()
long_description = open(os.path.join(BASE_DIR, 'README.md')).read()


setup(name='uw-webdriver-recorder',
install_requires=['selenium', 'pytest', 'jinja2'],
url='https://github.com/UWIT-IAM/webdriver-recorder',
author='UW-IT Identity and Access Management',
author_email='[email protected]',
version=VERSION,
description=desc,
license='Apache License, Version 2.0',
long_description=long_description,
long_description_content_type="text/markdown",
packages=['webdriver_recorder'],
package_data={'webdriver_recorder': ['report.template.html']},
package_data={'webdriver_recorder': ['VERSION', '*.html']},
python_requires='>=3.4',
setup_requires=['pytest-runner'],
entry_points={'pytest11': [
'uw-webdriver-recorder = webdriver_recorder.plugin']},
classifiers=["Framework :: Pytest"]
classifiers=[
'License :: OSI Approved :: Apache Software License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3.6',
'Framework :: Pytest']
)
1 change: 1 addition & 0 deletions webdriver_recorder/VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.0.1 # gets overwritten by CI as 'git describe --tags', leave this as is.

0 comments on commit 8f69a56

Please sign in to comment.