Skip to content

Commit fe68011

Browse files
authored
Merge pull request #47 from saxbophone/develop
v0.7.3
2 parents 9a1d74f + f8ee357 commit fe68011

File tree

8 files changed

+32
-33
lines changed

8 files changed

+32
-33
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
language: python
22
python:
33
- "2.7"
4-
- "3.3"
5-
- "3.4"
64
- "3.5"
75
- "3.6"
86
- "pypy3.5"

Makefile

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,44 @@
11
.DEFAULT_GOAL := tests
2-
.PHONY: install-deps clean lint test cover tests
32

3+
.PHONY: install-deps
44
install-deps:
5-
pip install -r python_requirements/base.txt
65
pip install -r python_requirements/test.txt
76

7+
.PHONY: clean
88
clean:
99
rm -rf basest/*.py[cod] tests/*.py[cod] *.py[cod] *__pycache__*
1010
rm -rf basest.egg-info build dist
1111

12+
.PHONY: lint
1213
lint:
1314
flake8 basest tests setup.py stress_test.py
1415
isort -rc -c basest tests
1516
isort -c setup.py stress_test.py
1617

18+
.PHONY: fix-lint
19+
fix-lint:
20+
isort -rc basest tests
21+
isort setup.py stress_test.py
22+
23+
.PHONY: test
1724
test:
1825
coverage run --source='basest' tests/__main__.py
1926

27+
.PHONY: cover
2028
cover:
2129
coverage report -m --fail-under=100
2230

31+
.PHONY: tests
2332
tests: clean lint test cover
2433

34+
.PHONY: stress-test
2535
stress-test:
2636
python stress_test.py
2737

38+
.PHONY: package
2839
package:
2940
python setup.py sdist bdist_wheel
3041

42+
.PHONY: release
3143
release: package
3244
twine upload dist/*

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ So, I hope you find this library fun, useful or both!
1919
## Installation
2020

2121
#### Python Versions Supported
22-
This library is designed to work with the following **CPython** versions: **2.7.x**, **3.3.x or greater**.
22+
This library is designed to work with **Python 2.7** and **Python 3.3 _or greater_**.
23+
24+
It is tested against Python **2.7**, **3.5**, **3.6** and **PyPy 3.5**.
2325

2426
> :bulb: **Help Wanted**
2527
>
@@ -28,12 +30,11 @@ This library is designed to work with the following **CPython** versions: **2.7.
2830
> [Open an issue](https://github.com/saxbophone/basest-python/issues) if you are interested.
2931
3032
#### Install from PyPi (preferred)
31-
> **Note:** Package is currently not hosted on PyPi, but will be in the future.
3233

3334
`pip install basest`
3435

35-
#### Install from git repository (at master branch)
36-
`pip install git+git://github.com/saxbophone/basest-python`
36+
#### Install from git repository (bleeding edge copy from develop branch)
37+
`pip install git+git://github.com/saxbophone/basest-python@develop`
3738

3839
## Usage
3940
Here is a short overview of the interfaces defined in this library, where to import them from and how to use them.

basest/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
# License, v. 2.0. If a copy of the MPL was not distributed with this
77
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
88
#
9-
from __future__ import (
10-
absolute_import, division, print_function, unicode_literals
11-
)
9+
from __future__ import absolute_import, division, print_function
1210

1311
from . import core, encoders, exceptions
1412

basest/core/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
# License, v. 2.0. If a copy of the MPL was not distributed with this
77
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
88
#
9-
from __future__ import (
10-
absolute_import, division, print_function, unicode_literals
11-
)
9+
from __future__ import absolute_import, division, print_function
1210

1311
from .best_ratio import best_ratio
1412
from .decode import decode, decode_raw

basest/encoders/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
# License, v. 2.0. If a copy of the MPL was not distributed with this
77
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
88
#
9-
from __future__ import (
10-
absolute_import, division, print_function, unicode_literals
11-
)
9+
from __future__ import absolute_import, division, print_function
1210

1311
from .encoder import Encoder
1412

python_requirements/base.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

setup.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
# License, v. 2.0. If a copy of the MPL was not distributed with this
88
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
99
#
10-
from __future__ import (
11-
absolute_import, division, print_function, unicode_literals
12-
)
10+
from __future__ import absolute_import, division, print_function
1311

1412
import os
1513

@@ -26,10 +24,8 @@ def parse_requirements(filepath):
2624

2725
setup(
2826
name='basest',
29-
version='0.7.2',
30-
description=(
31-
'Arbitrary base binary-to-text encoder (any base to any base)'
32-
),
27+
version='0.7.3',
28+
description='Arbitrary base binary-to-text encoder (any base to any base)',
3329
long_description=open(
3430
os.path.join(os.path.dirname(__file__), 'README.md')
3531
).read(),
@@ -46,9 +42,11 @@ def parse_requirements(filepath):
4642
'Intended Audience :: System Administrators',
4743
'Intended Audience :: Telecommunications Industry',
4844
'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
45+
'Operating System :: OS Independent',
46+
'Programming Language :: Python',
47+
'Programming Language :: Python :: 2',
4948
'Programming Language :: Python :: 2.7',
50-
'Programming Language :: Python :: 3.3',
51-
'Programming Language :: Python :: 3.4',
49+
'Programming Language :: Python :: 3',
5250
'Programming Language :: Python :: 3.5',
5351
'Programming Language :: Python :: 3.6',
5452
'Topic :: Communications',
@@ -60,11 +58,9 @@ def parse_requirements(filepath):
6058
'Topic :: Utilities',
6159
],
6260
keywords='number base encoder decoder conversion encoding decoding',
63-
packages=find_packages(),
64-
install_requires=parse_requirements('python_requirements/base.txt'),
65-
extras_require={
66-
'test': parse_requirements('python_requirements/test.txt'),
67-
},
61+
packages=find_packages(exclude=['tests']),
62+
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*',
63+
install_requires=[],
6864
package_data={
6965
'': ['README.md', 'LICENSE'],
7066
},

0 commit comments

Comments
 (0)