Skip to content

Commit daf688d

Browse files
committed
Merge branch 'release-0.0.5'
2 parents 0ecf45c + dc3c149 commit daf688d

File tree

6 files changed

+80
-60
lines changed

6 files changed

+80
-60
lines changed

CHANGELOG.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22
33

44
.. Keep the current version number on line number 5
5+
0.0.5
6+
=====
7+
8+
2020-03-27
9+
10+
* Use 'subprocess.check_call'
11+
* Add 'CONTRIBUTING.rst'
12+
* Fix project dependency name 'importlib-metadata'
13+
* Fix linting
14+
15+
516
0.0.4
617
=====
718

CONTRIBUTING.rst

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
..
2+
3+
4+
Hacking
5+
=======
6+
7+
This project makes extensive use of `tox`_, `pytest`_, and `GNU Make`_.
8+
9+
10+
Development environment
11+
-----------------------
12+
13+
Use following command to create a Python virtual environment with all
14+
necessary dependencies::
15+
16+
tox --recreate -e develop
17+
18+
This creates a Python virtual environment in the ``.tox/develop`` directory. It
19+
can be activated with the following command::
20+
21+
. .tox/develop/bin/activate
22+
23+
24+
Run test suite
25+
--------------
26+
27+
In a Python virtual environment run the following command::
28+
29+
make review
30+
31+
Outside of a Python virtual environment run the following command::
32+
33+
tox --recreate
34+
35+
36+
Build and package
37+
-----------------
38+
39+
In a Python virtual environment run the following command::
40+
41+
make package
42+
43+
Outside of a Python virtual environment run the following command::
44+
45+
tox --recreate -e package
46+
47+
48+
.. Links
49+
50+
.. _`GNU Make`: https://www.gnu.org/software/make/
51+
.. _`pytest`: https://pytest.org/
52+
.. _`tox`: https://tox.readthedocs.io/
53+
54+
55+
.. EOF

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ check:
4141

4242
.PHONY: lint
4343
lint:
44-
python3 -m pytest --pep8 --pylint -m 'pep8 or pylint'
44+
python3 -m pytest --pycodestyle --pylint -m 'pycodestyle or pylint'
4545

4646

47-
.PHONY: pep8
48-
pep8:
49-
python3 -m pytest --pep8 -m pep8
47+
.PHONY: pycodestyle
48+
pycodestyle:
49+
python3 -m pytest --pycodestyle -m pycodestyle
5050

5151

5252
.PHONY: pylint
@@ -65,7 +65,7 @@ pytest:
6565

6666
.PHONY: review
6767
review: check
68-
python3 -m pytest --pep8 --pylint
68+
python3 -m pytest --pycodestyle --pylint
6969

7070

7171
.PHONY: clean

README.rst

Lines changed: 6 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -71,60 +71,16 @@ Details
7171
Similar applications
7272
--------------------
7373

74-
* Shiv https://shiv.readthedocs.io
75-
76-
* Pex https://pex.readthedocs.io
77-
78-
79-
Hacking
80-
=======
81-
82-
This project makes extensive use of `tox`_, `pytest`_, and `GNU Make`_.
83-
84-
85-
Development environment
86-
-----------------------
87-
88-
Use following command to create a Python virtual environment with all
89-
necessary dependencies::
90-
91-
tox --recreate -e develop
92-
93-
This creates a Python virtual environment in the ``.tox/develop`` directory. It
94-
can be activated with the following command::
95-
96-
. .tox/develop/bin/activate
97-
98-
99-
Run test suite
100-
--------------
101-
102-
In a Python virtual environment run the following command::
103-
104-
make review
105-
106-
Outside of a Python virtual environment run the following command::
107-
108-
tox --recreate
109-
110-
111-
Build and package
112-
-----------------
113-
114-
In a Python virtual environment run the following command::
115-
116-
make package
117-
118-
Outside of a Python virtual environment run the following command::
119-
120-
tox --recreate -e package
74+
* `shiv`_
75+
* `pex`_
76+
* `superzippy`_
12177

12278

12379
.. Links
12480
125-
.. _`GNU Make`: https://www.gnu.org/software/make/
126-
.. _`pytest`: https://pytest.org/
127-
.. _`tox`: https://tox.readthedocs.io/
81+
.. _`shiv`: https://pypi.org/project/shiv/
82+
.. _`pex`: https://pypi.org/project/pex/
83+
.. _`superzippy`: https://pypi.org/project/superzippy/
12884

12985

13086
.. EOF

setup.cfg

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ url = https://pypi.org/project/zapp
2727

2828
[options]
2929
install_requires =
30-
importlib_metadata
30+
importlib-metadata
3131
setuptools
3232
wheel
3333
package_dir =
@@ -47,10 +47,8 @@ package =
4747
twine
4848
wheel
4949
test =
50-
astroid<2.3
51-
pylint<2.4
5250
pytest
53-
pytest-pep8
51+
pytest-pycodestyle
5452
pytest-pylint
5553

5654

src/zapp/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def _pip_install(venv_context, requirements, target_dir=None):
4141
if target_dir:
4242
command.extend(['--target', target_dir])
4343
command.extend(requirements)
44-
subprocess.run(command)
44+
subprocess.check_call(command)
4545

4646

4747
def _install_to_dir(target_dir, requirements):

0 commit comments

Comments
 (0)