Skip to content

Commit

Permalink
Merge pull request #47 from saxbophone/develop
Browse files Browse the repository at this point in the history
v0.7.3
  • Loading branch information
saxbophone committed Nov 2, 2018
2 parents 9a1d74f + f8ee357 commit fe68011
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 33 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
language: python
python:
- "2.7"
- "3.3"
- "3.4"
- "3.5"
- "3.6"
- "pypy3.5"
Expand Down
16 changes: 14 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,32 +1,44 @@
.DEFAULT_GOAL := tests
.PHONY: install-deps clean lint test cover tests

.PHONY: install-deps
install-deps:
pip install -r python_requirements/base.txt
pip install -r python_requirements/test.txt

.PHONY: clean
clean:
rm -rf basest/*.py[cod] tests/*.py[cod] *.py[cod] *__pycache__*
rm -rf basest.egg-info build dist

.PHONY: lint
lint:
flake8 basest tests setup.py stress_test.py
isort -rc -c basest tests
isort -c setup.py stress_test.py

.PHONY: fix-lint
fix-lint:
isort -rc basest tests
isort setup.py stress_test.py

.PHONY: test
test:
coverage run --source='basest' tests/__main__.py

.PHONY: cover
cover:
coverage report -m --fail-under=100

.PHONY: tests
tests: clean lint test cover

.PHONY: stress-test
stress-test:
python stress_test.py

.PHONY: package
package:
python setup.py sdist bdist_wheel

.PHONY: release
release: package
twine upload dist/*
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ So, I hope you find this library fun, useful or both!
## Installation

#### Python Versions Supported
This library is designed to work with the following **CPython** versions: **2.7.x**, **3.3.x or greater**.
This library is designed to work with **Python 2.7** and **Python 3.3 _or greater_**.

It is tested against Python **2.7**, **3.5**, **3.6** and **PyPy 3.5**.

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

`pip install basest`

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

## Usage
Here is a short overview of the interfaces defined in this library, where to import them from and how to use them.
Expand Down
4 changes: 1 addition & 3 deletions basest/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http:https://mozilla.org/MPL/2.0/.
#
from __future__ import (
absolute_import, division, print_function, unicode_literals
)
from __future__ import absolute_import, division, print_function

from . import core, encoders, exceptions

Expand Down
4 changes: 1 addition & 3 deletions basest/core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http:https://mozilla.org/MPL/2.0/.
#
from __future__ import (
absolute_import, division, print_function, unicode_literals
)
from __future__ import absolute_import, division, print_function

from .best_ratio import best_ratio
from .decode import decode, decode_raw
Expand Down
4 changes: 1 addition & 3 deletions basest/encoders/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http:https://mozilla.org/MPL/2.0/.
#
from __future__ import (
absolute_import, division, print_function, unicode_literals
)
from __future__ import absolute_import, division, print_function

from .encoder import Encoder

Expand Down
2 changes: 0 additions & 2 deletions python_requirements/base.txt

This file was deleted.

24 changes: 10 additions & 14 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http:https://mozilla.org/MPL/2.0/.
#
from __future__ import (
absolute_import, division, print_function, unicode_literals
)
from __future__ import absolute_import, division, print_function

import os

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

setup(
name='basest',
version='0.7.2',
description=(
'Arbitrary base binary-to-text encoder (any base to any base)'
),
version='0.7.3',
description='Arbitrary base binary-to-text encoder (any base to any base)',
long_description=open(
os.path.join(os.path.dirname(__file__), 'README.md')
).read(),
Expand All @@ -46,9 +42,11 @@ def parse_requirements(filepath):
'Intended Audience :: System Administrators',
'Intended Audience :: Telecommunications Industry',
'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Topic :: Communications',
Expand All @@ -60,11 +58,9 @@ def parse_requirements(filepath):
'Topic :: Utilities',
],
keywords='number base encoder decoder conversion encoding decoding',
packages=find_packages(),
install_requires=parse_requirements('python_requirements/base.txt'),
extras_require={
'test': parse_requirements('python_requirements/test.txt'),
},
packages=find_packages(exclude=['tests']),
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*',
install_requires=[],
package_data={
'': ['README.md', 'LICENSE'],
},
Expand Down

0 comments on commit fe68011

Please sign in to comment.