From 55768637389e05ce3998632d579f6aac481983a9 Mon Sep 17 00:00:00 2001 From: sinoroc Date: Thu, 10 Oct 2019 17:41:22 +0200 Subject: [PATCH 1/8] Set version 0.0.5.dev0 --- CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 44669e2..dd441ad 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,10 @@ .. Keep the current version number on line number 5 +0.0.5.dev0 +========== + + 0.0.4 ===== From 316f369132d4af8863e60b9cf1148e5b30b47e7b Mon Sep 17 00:00:00 2001 From: sinoroc Date: Tue, 19 Nov 2019 23:51:24 +0100 Subject: [PATCH 2/8] Set 'check' when using subprocess.run --- src/zapp/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zapp/core.py b/src/zapp/core.py index 611e855..83189de 100644 --- a/src/zapp/core.py +++ b/src/zapp/core.py @@ -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.run(command, check=True) def _install_to_dir(target_dir, requirements): From 2357f75b1e08b85ef4fd9336fef41c537ea6012f Mon Sep 17 00:00:00 2001 From: sinoroc Date: Tue, 19 Nov 2019 23:52:37 +0100 Subject: [PATCH 3/8] Fix linting --- Makefile | 10 +++++----- setup.cfg | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 42086f8..f1bafb2 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -65,7 +65,7 @@ pytest: .PHONY: review review: check - python3 -m pytest --pep8 --pylint + python3 -m pytest --pycodestyle --pylint .PHONY: clean diff --git a/setup.cfg b/setup.cfg index 19c3843..9b86d5e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -47,10 +47,8 @@ package = twine wheel test = - astroid<2.3 - pylint<2.4 pytest - pytest-pep8 + pytest-pycodestyle pytest-pylint From ebd8ec1f81c2b5dcf7041384c5f61c2e15011605 Mon Sep 17 00:00:00 2001 From: sinoroc Date: Fri, 17 Jan 2020 17:19:16 +0100 Subject: [PATCH 4/8] Fix project dependency name 'importlib-metadata' --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 9b86d5e..7f1d15d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,7 +27,7 @@ url = https://pypi.org/project/zapp [options] install_requires = - importlib_metadata + importlib-metadata setuptools wheel package_dir = From 05c004360427d438230d2d373980b87ea76622ec Mon Sep 17 00:00:00 2001 From: sinoroc Date: Thu, 26 Mar 2020 17:44:51 +0100 Subject: [PATCH 5/8] Add 'CONTRIBUTING.rst' --- CONTRIBUTING.rst | 55 +++++++++++++++++++++++++++++++++++++++++++++++ README.rst | 56 ++++++------------------------------------------ 2 files changed, 61 insertions(+), 50 deletions(-) create mode 100644 CONTRIBUTING.rst diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 0000000..b715fc0 --- /dev/null +++ b/CONTRIBUTING.rst @@ -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 diff --git a/README.rst b/README.rst index 3ac71e6..b34abac 100644 --- a/README.rst +++ b/README.rst @@ -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/ +.. _`pytest`: https://pypi.org/project/pex/ +.. _`superzippy`: https://pypi.org/project/superzippy/ .. EOF From 3844e3b55829905b5cecd6963a1f0936b281f5d2 Mon Sep 17 00:00:00 2001 From: sinoroc Date: Fri, 27 Mar 2020 14:44:49 +0100 Subject: [PATCH 6/8] Use 'subprocess.check_call' --- src/zapp/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zapp/core.py b/src/zapp/core.py index 83189de..da27eb5 100644 --- a/src/zapp/core.py +++ b/src/zapp/core.py @@ -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, check=True) + subprocess.check_call(command) def _install_to_dir(target_dir, requirements): From e164035ac495c8ed9b8581dda8d17d2d4476550e Mon Sep 17 00:00:00 2001 From: sinoroc Date: Fri, 27 Mar 2020 20:16:45 +0100 Subject: [PATCH 7/8] Fix link in 'README.rst' --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index b34abac..ea8e8d9 100644 --- a/README.rst +++ b/README.rst @@ -79,7 +79,7 @@ Similar applications .. Links .. _`shiv`: https://pypi.org/project/shiv/ -.. _`pytest`: https://pypi.org/project/pex/ +.. _`pex`: https://pypi.org/project/pex/ .. _`superzippy`: https://pypi.org/project/superzippy/ From dc3c1492271824136b94be2ea9c7a123cfac0746 Mon Sep 17 00:00:00 2001 From: sinoroc Date: Fri, 27 Mar 2020 20:18:56 +0100 Subject: [PATCH 8/8] Prepare release version 0.0.5 --- CHANGELOG.rst | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index dd441ad..f40211e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,8 +2,15 @@ .. Keep the current version number on line number 5 -0.0.5.dev0 -========== +0.0.5 +===== + +2020-03-27 + +* Use 'subprocess.check_call' +* Add 'CONTRIBUTING.rst' +* Fix project dependency name 'importlib-metadata' +* Fix linting 0.0.4