Skip to content

Commit 449dc20

Browse files
committed
Releases packaging improvements.
1 parent bb81dc2 commit 449dc20

File tree

5 files changed

+25
-11
lines changed

5 files changed

+25
-11
lines changed

Diff for: .gitignore

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
*.pyc
2+
__pycache__
23
*.egg-info
3-
build
4-
dist
4+
/build
5+
/dist
56
/bin
67
/include
78
/lib
@@ -12,3 +13,5 @@ nosetests.xml
1213
.tox
1314
.idea
1415
.cache
16+
/.noseids
17+
/.venv

Diff for: Makefile

+11-7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ PY := .venv/bin/python
44
PIP := .venv/bin/pip
55
PEP8 := .venv/bin/pep8
66
NOSE := .venv/bin/nosetests
7+
TWINE := twine
78

89
# ###########
910
# Tests rule!
@@ -12,22 +13,24 @@ NOSE := .venv/bin/nosetests
1213
test: venv develop $(NOSE)
1314
$(NOSE) --with-id -s tests
1415

15-
$(NOSE):
16-
$(PIP) install nose pep8 coverage
16+
$(NOSE): setup
1717

1818
# #######
1919
# INSTALL
2020
# #######
2121
.PHONY: all
22-
all: venv develop
22+
all: setup develop
2323

2424
venv: .venv/bin/python
2525

26+
setup: venv
27+
$(PIP) install -r requirements-dev.txt
28+
2629
.venv/bin/python:
2730
virtualenv .venv
2831

29-
.PHONY: clean_venv
30-
clean_venv:
32+
.PHONY: clean
33+
clean:
3134
rm -rf .venv
3235

3336
develop: .venv/lib/python*/site-packages/readability-lxml.egg-link
@@ -48,11 +51,12 @@ clean_all: clean_venv
4851
# ###########
4952
.PHONY: dist
5053
dist:
51-
$(PY) setup.py sdist
54+
$(PY) setup.py sdist bdist_wheel
55+
$(TWINE) check dist/*
5256

5357
.PHONY: upload
5458
upload:
55-
$(PY) setup.py sdist upload
59+
$(TWINE) upload dist/*
5660

5761
.PHONY: version_update
5862
version_update:

Diff for: README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Change Log
5252
- 0.3 Added Document.encoding, positive\_keywords and negative\_keywords
5353

5454
Licensing
55-
--------
55+
---------
5656

5757
This code is under `the Apache License
5858
2.0 <http://www.apache.org/licenses/LICENSE-2.0>`__ license.

Diff for: requirements-dev.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
lxml
2+
chardet
3+
nose
4+
pep8
5+
coverage
6+
timeout_decorator

Diff for: setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ def find_version(*file_paths):
4848
version=find_version("readability", "__init__.py"),
4949
author="Yuri Baburov",
5050
author_email="[email protected]",
51-
description="fast html to text parser (article readability tool) with python3 support",
51+
description="fast html to text parser (article readability tool) with python 3 support",
5252
test_suite="tests.test_article_only",
5353
long_description=open("README.rst").read(),
54+
long_description_content_type='text/x-rst',
5455
license="Apache License 2.0",
5556
url="http://github.com/buriy/python-readability",
5657
packages=["readability", "readability.compat"],

0 commit comments

Comments
 (0)