Skip to content

Commit 96b9b96

Browse files
authored
Merge pull request #13 from Axelrod-Python/streamline-contribution-guidelines
Streamline the contribution guidelines.
2 parents b43c060 + 8916775 commit 96b9b96

File tree

2 files changed

+13
-140
lines changed

2 files changed

+13
-140
lines changed

CONTRIBUTING.rst

Lines changed: 9 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,6 @@
22
Contributing
33
============
44

5-
Contributions are welcome, and they are greatly appreciated! Every
6-
little bit helps, and credit will always be given.
7-
8-
Bug reports
9-
===========
10-
11-
When `reporting a bug <https://github.com/meatballs/axelrod-fortran/issues>`_ please include:
12-
13-
* Your operating system name and version.
14-
* Any details about your local setup that might be helpful in troubleshooting.
15-
* Detailed steps to reproduce the bug.
16-
17-
Documentation improvements
18-
==========================
19-
20-
Axelrod Fortran could always use more documentation, whether as part of the
21-
official Axelrod Fortran docs, in docstrings, or even on the web in blog posts,
22-
articles, and such.
23-
24-
Feature requests and feedback
25-
=============================
26-
27-
The best way to send feedback is to file an issue at https://github.com/meatballs/axelrod-fortran/issues.
28-
29-
If you are proposing a feature:
30-
31-
* Explain in detail how it would work.
32-
* Keep the scope as narrow as possible, to make it easier to implement.
33-
* Remember that this is a volunteer-driven project, and that code contributions are welcome :)
34-
35-
Development
36-
===========
37-
385
To set up `axelrod-fortran` for local development:
396

407
1. Fork `axelrod-fortran <https://github.com/meatballs/axelrod-fortran>`_
@@ -49,42 +16,18 @@ To set up `axelrod-fortran` for local development:
4916

5017
Now you can make your changes locally.
5118

52-
4. When you're done making changes, run all the checks, doc builder and spell checker with `tox <http://tox.readthedocs.io/en/latest/install.html>`_ one command::
53-
54-
tox
55-
56-
5. Commit your changes and push your branch to GitHub::
57-
58-
git add .
59-
git commit -m "Your detailed description of your changes."
60-
git push origin name-of-your-bugfix-or-feature
61-
62-
6. Submit a pull request through the GitHub website.
63-
64-
Pull Request Guidelines
65-
-----------------------
66-
67-
If you need some code review or feedback while you're developing the code just make the pull request.
68-
69-
For merging, you should:
70-
71-
1. Include passing tests (run ``tox``) [1]_.
72-
2. Update documentation when there's new API, functionality etc.
73-
3. Add a note to ``CHANGELOG.rst`` about the changes.
74-
4. Add yourself to ``AUTHORS.rst``.
75-
76-
.. [1] If you don't have all the necessary python versions available locally you can rely on Travis - it will
77-
`run the tests <https://travis-ci.org/meatballs/axelrod-fortran/pull_requests>`_ for each change you add in the pull request.
19+
4. To install a development version of the library::
7820

79-
It will be slower though ...
21+
python setup.py develop
8022

81-
Tips
82-
----
23+
For this to work you also need the original Fortan code installed.
24+
Instructions for this are available:
25+
https://github.com/Axelrod-Python/TourExec
8326

84-
To run a subset of tests::
27+
5. To run tests, `py.test` is used as a test runner::
8528

86-
tox -e envname -- py.test -k test_myfeature
29+
pip install pytest
8730

88-
To run all the test environments in *parallel* (you need to ``pip install detox``)::
31+
To run the tests::
8932

90-
detox
33+
pytest

README.rst

Lines changed: 4 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -2,54 +2,6 @@
22
Overview
33
========
44

5-
.. start-badges
6-
7-
.. list-table::
8-
:stub-columns: 1
9-
10-
* - docs
11-
- |docs|
12-
* - tests
13-
- | |travis|
14-
| |codecov|
15-
* - package
16-
- | |version| |wheel| |supported-versions| |supported-implementations|
17-
| |commits-since|
18-
19-
.. |docs| image:: https://readthedocs.org/projects/axelrod-fortran/badge/?style=flat
20-
:target: https://readthedocs.org/projects/axelrod-fortran
21-
:alt: Documentation Status
22-
23-
.. |travis| image:: https://travis-ci.org/meatballs/axelrod-fortran.svg?branch=master
24-
:alt: Travis-CI Build Status
25-
:target: https://travis-ci.org/meatballs/axelrod-fortran
26-
27-
.. |codecov| image:: https://codecov.io/github/meatballs/axelrod-fortran/coverage.svg?branch=master
28-
:alt: Coverage Status
29-
:target: https://codecov.io/github/meatballs/axelrod-fortran
30-
31-
.. |version| image:: https://img.shields.io/pypi/v/axelrod-fortran.svg
32-
:alt: PyPI Package latest release
33-
:target: https://pypi.python.org/pypi/axelrod-fortran
34-
35-
.. |commits-since| image:: https://img.shields.io/github/commits-since/meatballs/axelrod-fortran/v0.1.0.svg
36-
:alt: Commits since latest release
37-
:target: https://github.com/meatballs/axelrod-fortran/compare/v0.1.0...master
38-
39-
.. |wheel| image:: https://img.shields.io/pypi/wheel/axelrod-fortran.svg
40-
:alt: PyPI Wheel
41-
:target: https://pypi.python.org/pypi/axelrod-fortran
42-
43-
.. |supported-versions| image:: https://img.shields.io/pypi/pyversions/axelrod-fortran.svg
44-
:alt: Supported versions
45-
:target: https://pypi.python.org/pypi/axelrod-fortran
46-
47-
.. |supported-implementations| image:: https://img.shields.io/pypi/implementation/axelrod-fortran.svg
48-
:alt: Supported implementations
49-
:target: https://pypi.python.org/pypi/axelrod-fortran
50-
51-
52-
.. end-badges
535

546
Python wrapper for strategies originally written in Fortran
557

@@ -62,31 +14,9 @@ Installation
6214

6315
pip install axelrod-fortran
6416

65-
Documentation
66-
=============
67-
68-
https://axelrod-fortran.readthedocs.io/
69-
70-
Development
71-
===========
72-
73-
To run the all tests run::
74-
75-
tox
7617

77-
Note, to combine the coverage data from all the tox environments run:
78-
79-
.. list-table::
80-
:widths: 10 90
81-
:stub-columns: 1
82-
83-
- - Windows
84-
- ::
85-
86-
set PYTEST_ADDOPTS=--cov-append
87-
tox
88-
89-
- - Other
90-
- ::
18+
Contributing
19+
============
9120

92-
PYTEST_ADDOPTS=--cov-append tox
21+
Please see `CONTRIBUTING.rst` for details about installing for development and
22+
running the test suite.

0 commit comments

Comments
 (0)