Skip to content

Commit

Permalink
Merge branch 'release-0.0.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
sinoroc committed Mar 27, 2020
2 parents 0ecf45c + dc3c149 commit daf688d
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 60 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@

.. Keep the current version number on line number 5
0.0.5
=====

2020-03-27

* Use 'subprocess.check_call'
* Add 'CONTRIBUTING.rst'
* Fix project dependency name 'importlib-metadata'
* Fix linting


0.0.4
=====

Expand Down
55 changes: 55 additions & 0 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
..

Hacking
=======

This project makes extensive use of `tox`_, `pytest`_, and `GNU Make`_.


Development environment
-----------------------

Use following command to create a Python virtual environment with all
necessary dependencies::

tox --recreate -e develop

This creates a Python virtual environment in the ``.tox/develop`` directory. It
can be activated with the following command::

. .tox/develop/bin/activate


Run test suite
--------------

In a Python virtual environment run the following command::

make review

Outside of a Python virtual environment run the following command::

tox --recreate


Build and package
-----------------

In a Python virtual environment run the following command::

make package

Outside of a Python virtual environment run the following command::

tox --recreate -e package


.. Links
.. _`GNU Make`: https://www.gnu.org/software/make/
.. _`pytest`: https://pytest.org/
.. _`tox`: https://tox.readthedocs.io/


.. EOF
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ check:

.PHONY: lint
lint:
python3 -m pytest --pep8 --pylint -m 'pep8 or pylint'
python3 -m pytest --pycodestyle --pylint -m 'pycodestyle or pylint'


.PHONY: pep8
pep8:
python3 -m pytest --pep8 -m pep8
.PHONY: pycodestyle
pycodestyle:
python3 -m pytest --pycodestyle -m pycodestyle


.PHONY: pylint
Expand All @@ -65,7 +65,7 @@ pytest:

.PHONY: review
review: check
python3 -m pytest --pep8 --pylint
python3 -m pytest --pycodestyle --pylint


.PHONY: clean
Expand Down
56 changes: 6 additions & 50 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,60 +71,16 @@ Details
Similar applications
--------------------

* Shiv https://shiv.readthedocs.io

* Pex https://pex.readthedocs.io


Hacking
=======

This project makes extensive use of `tox`_, `pytest`_, and `GNU Make`_.


Development environment
-----------------------

Use following command to create a Python virtual environment with all
necessary dependencies::

tox --recreate -e develop

This creates a Python virtual environment in the ``.tox/develop`` directory. It
can be activated with the following command::

. .tox/develop/bin/activate


Run test suite
--------------

In a Python virtual environment run the following command::

make review

Outside of a Python virtual environment run the following command::

tox --recreate


Build and package
-----------------

In a Python virtual environment run the following command::

make package

Outside of a Python virtual environment run the following command::

tox --recreate -e package
* `shiv`_
* `pex`_
* `superzippy`_


.. Links
.. _`GNU Make`: https://www.gnu.org/software/make/
.. _`pytest`: https://pytest.org/
.. _`tox`: https://tox.readthedocs.io/
.. _`shiv`: https://pypi.org/project/shiv/
.. _`pex`: https://pypi.org/project/pex/
.. _`superzippy`: https://pypi.org/project/superzippy/


.. EOF
6 changes: 2 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ url = https://pypi.org/project/zapp

[options]
install_requires =
importlib_metadata
importlib-metadata
setuptools
wheel
package_dir =
Expand All @@ -47,10 +47,8 @@ package =
twine
wheel
test =
astroid<2.3
pylint<2.4
pytest
pytest-pep8
pytest-pycodestyle
pytest-pylint


Expand Down
2 changes: 1 addition & 1 deletion src/zapp/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def _pip_install(venv_context, requirements, target_dir=None):
if target_dir:
command.extend(['--target', target_dir])
command.extend(requirements)
subprocess.run(command)
subprocess.check_call(command)


def _install_to_dir(target_dir, requirements):
Expand Down

0 comments on commit daf688d

Please sign in to comment.