diff --git a/CHANGES b/CHANGES new file mode 100644 index 0000000..b34e2bb --- /dev/null +++ b/CHANGES @@ -0,0 +1,15 @@ + History of changes to pytest-dependency + ======================================= + +* Version 0.1.0 (2017-01-29) + + + Initial release as an independent Python module. + + This code was first developed as part of a larger package, + python-icat, at Helmholtz-Zentrum Berlin für Materialien und + Energie, see https://icatproject.org/user-documentation/python-icat/ + + +# Local Variables: +# mode: org +# End: diff --git a/MANIFEST.in b/MANIFEST.in index bdd2ea9..c6c2424 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,6 @@ -include MANIFEST.in +include CHANGES include LICENSE.txt +include MANIFEST.in include README.rst include doc/html/*.html include doc/html/*.js diff --git a/README.rst b/README.rst index 8d26c0c..d860612 100644 --- a/README.rst +++ b/README.rst @@ -42,9 +42,8 @@ step: $ patch -p1 < python2_6.patch -It removes the use of certain language features (dict comprehensions, -curly braces notation of sets, bytes string literal prefix 'b') that -were introduced in Python 2.7. +It removes the use of certain language features (dict comprehensions) +that were introduced in Python 2.7. Copyright and License @@ -52,7 +51,7 @@ Copyright and License - Copyright 2013-2015 Helmholtz-Zentrum Berlin für Materialien und Energie GmbH -- Copyright 2016 Rolf Krahl +- Copyright 2016-2017 Rolf Krahl Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may diff --git a/doc/src/index.rst b/doc/src/index.rst index 4ed10f1..8affb4d 100644 --- a/doc/src/index.rst +++ b/doc/src/index.rst @@ -5,20 +5,56 @@ This pytest plugin manages dependencies of tests. It allows to mark some tests as dependent from other tests. These tests will then be skipped if any of the dependencies did fail or has been skipped. +Note that there is no real documentation yet, this just repeats the +content of the README file. + System requirements ------------------- - + Python 2.6, 2.7, or 3.1 and newer. - + `pytest`_ 2.8.0 or newer. ++ Python 2.6, 2.7, or 3.1 and newer. + Python 2.6 requires patching the sources, see below. ++ `setuptools`_. ++ `pytest`_ 2.8.0 or newer. + + +Installation +------------ + +1. Download the sources, unpack, and change into the source directory. + +2. Build (optional):: + + $ python setup.py build + +3. Test (optional):: + + $ python -m pytest + +4. Install:: + + $ python setup.py install + +The last step might require admin privileges in order to write into +the site-packages directory of your Python installation. + +If you are using Python 2.6, apply python2_6.patch after the first +step: + +1a. Patch:: + + $ patch -p1 < python2_6.patch + +It removes the use of certain language features (dict comprehensions) +that were introduced in Python 2.7. Copyright and License --------------------- - - Copyright 2013-2015 - Helmholtz-Zentrum Berlin für Materialien und Energie GmbH - - Copyright 2016 Rolf Krahl +- Copyright 2013-2015 + Helmholtz-Zentrum Berlin für Materialien und Energie GmbH +- Copyright 2016-2017 Rolf Krahl Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may @@ -33,4 +69,5 @@ implied. See the License for the specific language governing permissions and limitations under the License. +.. _setuptools: http://pypi.python.org/pypi/setuptools/ .. _pytest: http://pytest.org/ diff --git a/setup.py b/setup.py index 53f7fcc..7ee81ac 100755 --- a/setup.py +++ b/setup.py @@ -27,17 +27,17 @@ 'Framework :: Pytest', 'Intended Audience :: Developers', 'Topic :: Software Development :: Testing', - "Programming Language :: Python", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.6", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.1", - "Programming Language :: Python :: 3.2", - "Programming Language :: Python :: 3.3", - "Programming Language :: Python :: 3.4", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", + 'Programming Language :: Python', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.1', + 'Programming Language :: Python :: 3.2', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', 'Operating System :: OS Independent', 'License :: OSI Approved :: Apache Software License', ],