diff --git a/.bumpversion.cfg b/.bumpversion.cfg index e9c4d09..879c9d0 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,20 +1,20 @@ [bumpversion] commit = True tag = True message = "Release {new_version}" -current_version = 2.0.0 +current_version = 2.0.1 [bumpversion:file:setup.py] search = version='{current_version}' replace = version='{new_version}' [bumpversion:file:src/mirakuru/__init__.py] [bumpversion:file:README.rst] [bumpversion:file:CHANGES.rst] search = unreleased ---------- replace = {new_version} ---------- diff --git a/CHANGES.rst b/CHANGES.rst index b55fc21..581172f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,167 +1,172 @@ CHANGELOG ========= +2.0.1 +---------- + +- [repackage] - mark python 3.5 as required. Should disallow installing on python 2 + 2.0.0 ---------- - [feature] Add UnixSocketExecutor for executors that communicate with Unix Sockets - [feature] Mirakuru is now fully type hinted - [feature] Drop support for python 2 - [feature] Allow for configuring process outputs to pipe to - [feature] OutputExecutor can now check for banner in stderr - [feature] HTTPEecutor now can check status on different method. Along with properly configured payload and headers. - [feature] Ability to set custom env vars for orchestrated process - [feature] Ability to set custom cwd path for orchestrated process - [enhancement] psutil is no longer required on cygwin 1.1.0 ---------- - [enhancement] Executor's timeout to be set for both executor's start and stop - [enhancement] It's no longer possible to hang indefinitely on the start or stop. Timeout is set to 3600 seconds by default, with values possible between `0` and `sys.maxsize` with the latter still bit longer than `2924712086` centuries. 1.0.0 ---------- - [enhancement] Do not fail if processes child throw EPERM error during clean up phase - [enhancement] Run subprocesses in shell by default on Windows - [ehnancement] Do not pass preexec_fn on windows 0.9.0 ---------- - [enhancement] Fallback to kill through SIGTERM on Windows, since SIGKILL is not available - [enhancement] detect cases where during stop process already exited, and simply clean up afterwards 0.8.3 ---------- - [enhancement] when killing the process ignore OsError with errno `no such process` as the process have already died. - [enhancement] small context manager code cleanup 0.8.2 ---------- - [bugfix] atexit cleanup_subprocesses() function now reimports needed functions 0.8.1 ---------- - [bugfix] Handle IOErrors from psutil (#112) - [bugfix] Pass global vars to atexit cleanup_subprocesses function (#111) 0.8.0 ---------- - [feature] Kill all running mirakuru subprocesses on python exit. - [enhancement] Prefer psutil library (>=4.0.0) over calling 'ps xe' command to find leaked subprocesses. 0.7.0 ---------- - [feature] HTTPExecutor enriched with the 'status' argument. It allows to define which HTTP status code(s) signify that a HTTP server is running. - [feature] Changed executor methods to return itself to allow method chaining. - [feature] Context Manager to return Executor instance, allows creating Executor instance on the fly. - [style] Migrated `%` string formating to `format()`. - [style] Explicitly numbered replacement fields in string. - [docs] Added documentation for timeouts. 0.6.1 ---------- - [refactoring] Moved source to src directory. - [fix, feature] Python 3.5 fixes. - [fix] Docstring changes for updated pep257. 0.6.0 ---------- - [fix] Modify MANIFEST to prune tests folder. - [feature] HTTPExecutor will now set the default 80 if not present in a URL. - [feature] Detect subprocesses exiting erroneously while polling the checks and error early. - [fix] Make test_forgotten_stop pass by preventing the shell from optimizing forking out. 0.5.0 ---------- - [style] Corrected code to conform with W503, D210 and E402 linters errors as reported by pylama `6.3.1`. - [feature] Introduced a hack that kills all subprocesses of executor process. It requires 'ps xe -ww' command being available in OS otherwise logs error. - [refactoring] Classes name convention change. Executor class got renamed into SimpleExecutor and StartCheckExecutor class got renamed into Executor. 0.4.0 ------- - [feature] Ability to set up custom signal for stopping and killing processes managed by executors. - [feature] Replaced explicit parameters with keywords for kwargs handled by basic Executor init method. - [feature] Executor now accepts both list and string as a command. - [fix] Even it's not recommended to import all but `from mirakuru import *` didn't worked. Now it's fixed. - [tests] increased tests coverage. Even test cover 100% of code it doesn't mean they cover 100% of use cases! - [code quality] Increased Pylint code evaluation. 0.3.0 ------- - [feature] Introduced PidExecutor that waits for specified file to be created. - [feature] Provided PyPy compatibility. - [fix] Closing all resources explicitly. 0.2.0 ------- - [fix] Kill all children processes of Executor started with shell=True. - [feature] Executors are now context managers - to start executors for given context. - [feature] Executor.stopped - context manager for stopping executors for given context. - [feature] HTTPExecutor and TCPExecutor before .start() check whether port is already used by other processes and raise AlreadyRunning if detects it. - [refactoring] Moved python version conditional imports into compat.py module. 0.1.4 ------- - [fix] Fixed an issue where setting shell to True would execute only part of the command. 0.1.3 ------- - [fix] Fixed an issue where OutputExecutor would hang, if started process stopped producing output. 0.1.2 ------- - [fix] Removed leftover sleep from TCPExecutor._wait_for_connection. 0.1.1 ------- - [fix] Fixed `MANIFEST.in`. - Updated packaging options. 0.1.0 ------- - Exposed process attribute on Executor. - Exposed port and host on TCPExecutor. - Exposed URL on HTTPExecutor. - Simplified package structure. - Simplified executors operating API. - Updated documentation. - Added docblocks for every function. - Applied license headers. - Stripped orchestrators. - Forked off from `summon_process`. diff --git a/README.rst b/README.rst index c6022de..98a9a84 100644 --- a/README.rst +++ b/README.rst @@ -1,123 +1,123 @@ mirakuru ======== Mirakuru is a process orchestration tool designed for functional and integration tests. Maybe you want to be able to start a database before you start your program or maybe you just need to set additional services up for your tests. This is where you should consider using **mirakuru** to add superpowers to your program or tests. .. image:: https://img.shields.io/pypi/v/mirakuru.svg :target: https://pypi.python.org/pypi/mirakuru/ :alt: Latest PyPI version -.. image:: https://readthedocs.org/projects/mirakuru/badge/?version=v2.0.0 - :target: http://mirakuru.readthedocs.io/en/v2.0.0/ +.. image:: https://readthedocs.org/projects/mirakuru/badge/?version=v2.0.1 + :target: http://mirakuru.readthedocs.io/en/v2.0.1/ :alt: Documentation Status .. image:: https://img.shields.io/pypi/wheel/mirakuru.svg :target: https://pypi.python.org/pypi/mirakuru/ :alt: Wheel Status .. image:: https://img.shields.io/pypi/pyversions/mirakuru.svg :target: https://pypi.python.org/pypi/mirakuru/ :alt: Supported Python Versions .. image:: https://img.shields.io/pypi/l/mirakuru.svg :target: https://pypi.python.org/pypi/mirakuru/ :alt: License Package status -------------- -.. image:: https://travis-ci.org/ClearcodeHQ/mirakuru.svg?branch=v2.0.0 +.. image:: https://travis-ci.org/ClearcodeHQ/mirakuru.svg?branch=v2.0.1 :target: https://travis-ci.org/ClearcodeHQ/mirakuru :alt: Tests -.. image:: https://coveralls.io/repos/ClearcodeHQ/mirakuru/badge.png?branch=v2.0.0 - :target: https://coveralls.io/r/ClearcodeHQ/mirakuru?branch=v2.0.0 +.. image:: https://coveralls.io/repos/ClearcodeHQ/mirakuru/badge.png?branch=v2.0.1 + :target: https://coveralls.io/r/ClearcodeHQ/mirakuru?branch=v2.0.1 :alt: Coverage Status -.. image:: https://requires.io/github/ClearcodeHQ/mirakuru/requirements.svg?tag=v2.0.0 - :target: https://requires.io/github/ClearcodeHQ/mirakuru/requirements/?tag=v2.0.0 +.. image:: https://requires.io/github/ClearcodeHQ/mirakuru/requirements.svg?tag=v2.0.1 + :target: https://requires.io/github/ClearcodeHQ/mirakuru/requirements/?tag=v2.0.1 :alt: Requirements Status About ----- In a project that relies on multiple processes there might be a need to guard code with tests that verify interprocess communication. So one needs to set up all of required databases, auxiliary and application services to verify their cooperation. Synchronising (or orchestrating) test procedure with tested processes might be a hell. If so, then **mirakuru** is what you need. ``Mirakuru`` starts your process and waits for the clear indication that it's running. Library provides seven executors to fit different cases: * **SimpleExecutor** - starts a process and does not wait for anything. It is useful to stop or kill a process and its subprocesses. Base class for all the rest of executors. * **Executor** - base class for executors verifying if a process has started. * **OutputExecutor** - waits for a specified output to be printed by a process. * **TCPExecutor** - waits for the ability to connect through TCP with a process. * **UnixSocketExecutor** - waits for the ability to connect through Unix socket with a process * **HTTPExecutor** - waits for a successful HEAD request (and TCP before). * **PidExecutor** - waits for a specified .pid file to exist. .. code-block:: python from mirakuru import HTTPExecutor from httplib import HTTPConnection, OK def test_it_works(): # The ``./http_server`` here launches some HTTP server on the 6543 port, # but naturally it is not immediate and takes a non-deterministic time: executor = HTTPExecutor("./http_server", url="http://127.0.0.1:6543/") # Start the server and wait for it to run (blocking): executor.start() # Here the server should be running! conn = HTTPConnection("127.0.0.1", 6543) conn.request("GET", "/") assert conn.getresponse().status is OK executor.stop() A command by which executor spawns a process can be defined by either string or list. .. code-block:: python # command as string TCPExecutor('python -m smtpd -n -c DebuggingServer localhost:1025', host='localhost', port=1025) # command as list TCPExecutor( ['python', '-m', 'smtpd', '-n', '-c', 'DebuggingServer', 'localhost:1025'], host='localhost', port=1025 ) Authors ------- The project was firstly developed by `Mateusz Lenik `_ as the `summon_process `_. Later forked, renamed into **mirakuru** and tended to by The A Room @ `Clearcode `_ and `the other authors `_. License ------- ``mirakuru`` is licensed under LGPL license, version 3. Contributing and reporting bugs ------------------------------- Source code is available at: `ClearcodeHQ/mirakuru `_. Issue tracker is located at `GitHub Issues `_. Projects `PyPI page `_. When contributing, don't forget to add your name to the AUTHORS.rst file. diff --git a/setup.cfg b/setup.cfg index 0b2cc00..b570f82 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,10 +1,7 @@ -[wheel] -universal = 1 - [pycodestyle] max-line-length = 80 exclude = docs/*,build/*,venv/* [pydocstyle] ignore = D203,D212 -match = '(?!docs|build|venv).*\.py' \ No newline at end of file +match = '(?!docs|build|venv).*\.py' diff --git a/setup.py b/setup.py index ff90c60..9855ceb 100644 --- a/setup.py +++ b/setup.py @@ -1,91 +1,93 @@ # Copyright (C) 2014 by Clearcode # and associates (see AUTHORS). # This file is part of mirakuru. # mirakuru is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # mirakuru is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # You should have received a copy of the GNU Lesser General Public License # along with mirakuru. If not, see . """Mirakuru installation module.""" import os from setuptools import setup, find_packages here = os.path.dirname(__file__) requirements = [ # psutil is used to find processes leaked during termination. # It runs on many platforms but not Cygwin: # . 'psutil>=4.0.0; sys_platform != "cygwin"', ] tests_require = ( 'pytest==4.6.3', # tests framework used 'pytest-cov==2.7.1', # coverage reports to verify tests quality 'mock==3.0.5', # tests mocking tool 'python-daemon==2.2.3', # used in test for easy creation of daemons ) extras_require = { 'docs': ['sphinx'], 'tests': tests_require, } def read(fname): """ Read filename. :param str fname: name of a file to read """ return open(os.path.join(here, fname)).read() setup( name='mirakuru', - version='2.0.0', + version='2.0.1', description='Process executor for tests.', long_description=( read('README.rst') + '\n\n' + read('CHANGES.rst') ), keywords='process executor tests summon_process', url='https://github.com/ClearcodeHQ/mirakuru', author='Clearcode - The A Room', author_email='thearoom@clearcode.cc', license='LGPL', + python_requires='>=3.5', classifiers=[ 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'Intended Audience :: Developers', 'License :: OSI Approved :: ' 'GNU Lesser General Public License v3 or later (LGPLv3+)', 'Natural Language :: English', 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Software Development :: Testing', ], package_dir={'': 'src'}, packages=find_packages('src'), install_requires=requirements, tests_require=tests_require, test_suite='tests', include_package_data=True, zip_safe=False, extras_require=extras_require, ) diff --git a/src/mirakuru/__init__.py b/src/mirakuru/__init__.py index 9b6a2e1..0b0a573 100644 --- a/src/mirakuru/__init__.py +++ b/src/mirakuru/__init__.py @@ -1,53 +1,53 @@ # Copyright (C) 2014 by Clearcode # and associates (see AUTHORS). # This file is part of mirakuru. # mirakuru is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # mirakuru is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # You should have received a copy of the GNU Lesser General Public License # along with mirakuru. If not, see . """Mirakuru main module.""" import logging from mirakuru.base import Executor, SimpleExecutor from mirakuru.output import OutputExecutor from mirakuru.tcp import TCPExecutor from mirakuru.http import HTTPExecutor from mirakuru.pid import PidExecutor from mirakuru.exceptions import ( ExecutorError, TimeoutExpired, AlreadyRunning, ProcessExitedWithError, ) -__version__ = '2.0.0' +__version__ = '2.0.1' __all__ = ( 'Executor', 'SimpleExecutor', 'OutputExecutor', 'TCPExecutor', 'HTTPExecutor', 'PidExecutor', 'ExecutorError', 'TimeoutExpired', 'AlreadyRunning', 'ProcessExitedWithError', ) # Set default logging handler to avoid "No handler found" warnings. logging.getLogger(__name__).addHandler(logging.NullHandler())