Skip to content

Commit

Permalink
pw 0.9 will be Python 3-only.
Browse files Browse the repository at this point in the history
  • Loading branch information
catch22 committed Sep 14, 2016
1 parent 9f1a7e1 commit a77d98a
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 21 deletions.
1 change: 0 additions & 1 deletion .travis-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
click
colorama
ushlex
pyperclip
pytest
PyYAML
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
language: python
python:
- "2.7"
- "3.4"
- "pypy"
- "3.5"

install:
- "sudo apt-get update -qq"
- "sudo apt-get install -qq xclip gnupg2"
- "pip install --upgrade -r .travis-requirements.txt"
- "pip install --editable ."
- "pip install -e ."

before_script:
- "export DISPLAY=:99.0"
Expand Down
2 changes: 1 addition & 1 deletion pw/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import absolute_import, division, print_function
from .store import Store, Entry

__version__ = '0.8.2.dev0'
__version__ = '0.9.0.dev0'
3 changes: 0 additions & 3 deletions pw/_yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
from .store import Entry
import sys, warnings

if sys.version_info[0] < 3:
str = unicode

EXTENSIONS = ['.yaml', '.yml']


Expand Down
5 changes: 1 addition & 4 deletions pw/store.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
import os.path, sys
from collections import namedtuple
from io import StringIO
if sys.version_info[0] < 3:
from ushlex import shlex
else:
from shlex import shlex
from shlex import shlex
from . import _gpg

Entry = namedtuple('Entry', ['key', 'user', 'password', 'notes'])
Expand Down
11 changes: 2 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@
except ImportError:
pass

# install_requirements
install_requires = ['click>=5.1', 'colorama', 'pyperclip>=1.5.11']
if sys.version_info < (3, 0):
install_requires += ['ushlex']

# package metadata
setup(
name='pw',
Expand All @@ -38,15 +33,13 @@
'console_scripts': ['pw = pw.__main__:pw']
},
classifiers=[
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3 :: Only',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Development Status :: 4 - Beta',
'Environment :: Console',
'License :: OSI Approved :: MIT License',
],
long_description=long_description,
install_requires=install_requires,
install_requires=['click>=5.1', 'colorama', 'pyperclip>=1.5.11'],
tests_require=['pytest', 'PyYAML'])

0 comments on commit a77d98a

Please sign in to comment.