##// END OF EJS Templates
docs: align use of 'my.ini' as configfile placeholder
docs: align use of 'my.ini' as configfile placeholder

File last commit:

r7026:1969f7df default
r7310:0955a02f default
Show More
contributing.rst
316 lines | 12.9 KiB | text/x-rst | RstLexer
/ docs / contributing.rst
docs updates
r811 .. _contributing:
docs
r2095 =========================
Bradley M. Kuhn
Rename some strings examples and commands in documentation
r4192 Contributing to Kallithea
docs updates
r811 =========================
Mads Kiilerich
docs: rework stuff...
r4902 Kallithea is developed and maintained by its users. Please join us and scratch
your own itch.
Infrastructure
--------------
docs updates
r811
Søren Løvborg
docs: spelling, grammar, content and typography
r5425 The main repository is hosted on Our Own Kallithea (aka OOK) at
https://kallithea-scm.org/repos/kallithea/, our self-hosted instance
of Kallithea.
docs and readme update
r1062
Søren Løvborg
docs: spelling, grammar, content and typography
r5425 For now, we use Bitbucket_ for `pull requests`_ and `issue tracking`_. The
issue tracker is for tracking bugs, not for support, discussion, or ideas --
please use the `mailing list`_ or :ref:`IRC <readme>` to reach the community.
Mads Kiilerich
docs: rework stuff...
r4902
We use Weblate_ to translate the user interface messages into languages other
than English. Join our project on `Hosted Weblate`_ to help us.
Andrew Shadura
docs: include translation howto into the docco
r4960 To register, you can use your Bitbucket or GitHub account. See :ref:`translations`
for more details.
updated contributing docs
r3993
Mads Kiilerich
docs: consistent spacing around headings...
r5433
Mads Kiilerich
docs: rework stuff...
r4902 Getting started
---------------
docs and readme update
r1062
Karl Goetz
docs/contributing: make contribution information more accessible...
r6690 To get started with Kallithea development::
merged changes from stable into beta
r2032
Mads Kiilerich
docs: rework stuff...
r4902 hg clone https://kallithea-scm.org/repos/kallithea
cd kallithea
virtualenv ../kallithea-venv
source ../kallithea-venv/bin/activate
Mads Kiilerich
docs: add advice of upgrading pip and setuptools in new virtualenvs...
r5519 pip install --upgrade pip setuptools
Thomas De Schampheleire
docs: recommend --upgrade for all pip installations in a virtualenv...
r6703 pip install --upgrade -e .
pip install --upgrade -r dev_requirements.txt
domruf
move package.json to root directory...
r7026 npm install # install dependencies - both tools and data
npm run less # for generating css from less
Mads Kiilerich
gearbox: make a make-config sub-command available again...
r6510 gearbox make-config my.ini
Mads Kiilerich
gearbox: replace paster with something TurboGears2-ish that still works with the Pylons stack...
r6509 gearbox setup-db -c my.ini --user=user --email=user@example.com --password=password --repos=/tmp
gearbox serve -c my.ini --reload &
Mads Kiilerich
docs: rework stuff...
r4902 firefox http://127.0.0.1:5000/
merged changes from stable into beta
r2032
Karl Goetz
docs/contributing: make contribution information more accessible...
r6690 If you plan to use Bitbucket_ for sending contributions, you can also fork
Kallithea on Bitbucket_ first (https://bitbucket.org/conservancy/kallithea) and
then replace the clone step above by a clone of your fork. In this case, please
Andrew Shadura
docs: fix broken references
r6705 see :ref:`contributing-guidelines` below for configuring your fork correctly.
Karl Goetz
docs/contributing: make contribution information more accessible...
r6690
Contribution flow
-----------------
Starting from an existing Kallithea clone, make sure it is up to date with the
latest upstream changes::
hg pull
hg update
Review the :ref:`contributing-guidelines` and :ref:`coding-guidelines`.
If you are new to Mercurial, refer to Mercurial `Quick Start`_ and `Beginners
Guide`_ on the Mercurial wiki.
Now, make some changes and test them (see :ref:`contributing-tests`). Don't
forget to add new tests to cover new functionality or bug fixes.
For documentation changes, run ``make html`` from the ``docs`` directory to
generate the HTML result, then review them in your browser.
Before submitting any changes, run the cleanup script::
./scripts/run-all-cleanup
When you are completely ready, you can send your changes to the community for
review and inclusion. Most commonly used methods are sending patches to the
mailing list (via ``hg email``) or by creating a pull request on Bitbucket_.
.. _contributing-tests:
Mads Kiilerich
docs: rework stuff...
r4902
merged changes from stable into beta
r2032
Mads Kiilerich
docs: rework stuff...
r4902 Running tests
-------------
Thomas De Schampheleire
docs/contributing: move installation of dev_requirements to default instructions...
r6691 After finishing your changes make sure all tests pass cleanly. Run the testsuite
by invoking ``py.test`` from the project root::
Mads Kiilerich
docs: make the default method for running tests more visible...
r5922
py.test
Mads Kiilerich
setup: move test dependencies to dev_requirements.txt to make them optional...
r5989 Note that testing on Python 2.6 also requires ``unittest2``.
domruf
test: add warning about not mounting /tmp noexec
r6570 Note that on unix systems, the temporary directory (``/tmp`` or where
``$TMPDIR`` points) must allow executable files; Git hooks must be executable,
and the test suite creates repositories in the temporary directory. Linux
systems with /tmp mounted noexec will thus fail.
Mads Kiilerich
docs: make the default method for running tests more visible...
r5922 You can also use ``tox`` to run the tests with all supported Python versions
(currently Python 2.6--2.7).
updated contributing docs
r3993
Mads Kiilerich
tests: move test.ini to kallithea/tests/
r5416 When running tests, Kallithea uses `kallithea/tests/test.ini` and populates the
SQLite database specified there.
Thomas De Schampheleire
docs/contributing: cleanup test section
r4920
It is possible to avoid recreating the full test database on each invocation of
the tests, thus eliminating the initial delay. To achieve this, run the tests as::
updated contributing docs
r3993
Mads Kiilerich
gearbox: replace paster with something TurboGears2-ish that still works with the Pylons stack...
r6509 gearbox serve -c kallithea/tests/test.ini --pid-file=test.pid --daemon
Thomas De Schampheleire
pytest migration: update documentation...
r5681 KALLITHEA_WHOOSH_TEST_DISABLE=1 KALLITHEA_NO_TMP_PATH=1 py.test
updated contributing docs
r3993 kill -9 $(cat test.pid)
Thomas De Schampheleire
pytest migration: update documentation...
r5681 In these commands, the following variables are used::
KALLITHEA_WHOOSH_TEST_DISABLE=1 - skip whoosh index building and tests
KALLITHEA_NO_TMP_PATH=1 - disable new temp path for tests, used mostly for testing_vcs_operations
You can run individual tests by specifying their path as argument to py.test.
py.test also has many more options, see `py.test -h`. Some useful options
Thomas De Schampheleire
docs/contributing: explicitly mention some useful options to nosetests
r4927 are::
Thomas De Schampheleire
pytest migration: update documentation...
r5681 -k EXPRESSION only run tests which match the given substring
timeless@gmail.com
spelling: evaluable
r5798 expression. An expression is a python evaluable
Thomas De Schampheleire
pytest migration: update documentation...
r5681 expression where all names are substring-matched
against test names and their parent classes. Example:
-x, --exitfirst exit instantly on first error or failed test.
--lf rerun only the tests that failed at the last run (or
all if none failed)
--ff run all tests but run the last failures first. This
may re-order tests and thus lead to repeated fixture
setup/teardown
--pdb start the interactive Python debugger on errors.
-s, --capture=no don't capture stdout (any stdout output will be
printed immediately)
Thomas De Schampheleire
docs/contributing: cleanup test section
r4920
Eivind Tagseth
tests: add simple (skipped) unit tests for graph_data that may be used to measure performance...
r6682 Performance tests
^^^^^^^^^^^^^^^^^
A number of performance tests are present in the test suite, but they are
not run in a standard test run. These tests are useful to
evaluate the impact of certain code changes with respect to performance.
To run these tests::
env TEST_PERFORMANCE=1 py.test kallithea/tests/performance
Thomas De Schampheleire
docs: mention pytest-profiling...
r6684 To analyze performance, you could install pytest-profiling_, which enables the
--profile and --profile-svg options to py.test.
.. _pytest-profiling: https://github.com/manahl/pytest-plugins/tree/master/pytest-profiling
Karl Goetz
docs/contributing: make contribution information more accessible...
r6690 .. _contributing-guidelines:
Mads Kiilerich
docs: consistent spacing around headings...
r5433
Søren Løvborg
docs: separate coding/contribution guidelines...
r6277 Contribution guidelines
-----------------------
Mads Kiilerich
docs: rework stuff...
r4902
Kallithea is GPLv3 and we assume all contributions are made by the
committer/contributor and under GPLv3 unless explicitly stated. We do care a
lot about preservation of copyright and license information for existing code
that is brought into the project.
Søren Løvborg
docs: separate coding/contribution guidelines...
r6277 Contributions will be accepted in most formats -- such as pull requests on
Bitbucket, something hosted on your own Kallithea instance, or patches sent by
email to the `kallithea-general`_ mailing list.
When contributing via Bitbucket, please make your fork of
https://bitbucket.org/conservancy/kallithea/ `non-publishing`_ -- it is one of
the settings on "Repository details" page. This ensures your commits are in
"draft" phase and makes it easier for you to address feedback and for project
maintainers to integrate your changes.
.. _non-publishing: https://www.mercurial-scm.org/wiki/Phases#Publishing_Repository
Make sure to test your changes both manually and with the automatic tests
before posting.
We care about quality and review and keeping a clean repository history. We
might give feedback that requests polishing contributions until they are
"perfect". We might also rebase and collapse and make minor adjustments to your
changes when we apply them.
We try to make sure we have consensus on the direction the project is taking.
Everything non-sensitive should be discussed in public -- preferably on the
mailing list. We aim at having all non-trivial changes reviewed by at least
one other core developer before pushing. Obvious non-controversial changes will
be handled more casually.
Thomas De Schampheleire
docs/contributing: clarify that Kallithea now also has a stable branch
r6692 There is a main development branch ("default") which is generally stable so that
it can be (and is) used in production. There is also a "stable" branch that is
almost exclusively reserved for bug fixes or trivial changes. Experimental
changes should live elsewhere (for example in a pull request) until they are
ready.
Søren Løvborg
docs: separate coding/contribution guidelines...
r6277
Karl Goetz
docs/contributing: make contribution information more accessible...
r6690 .. _coding-guidelines:
Søren Løvborg
docs: separate coding/contribution guidelines...
r6277
Coding guidelines
-----------------
Mads Kiilerich
docs: rework stuff...
r4902 We don't have a formal coding/formatting standard. We are currently using a mix
av6
docs: update links to Mercurial's website and wiki...
r6297 of Mercurial's (https://www.mercurial-scm.org/wiki/CodingStyle), pep8, and
Konstantin Veretennicov
docs: run-all-cleanup superseded whitespaceleanup.sh
r5934 consistency with existing code. Run ``scripts/run-all-cleanup`` before
committing to ensure some basic code formatting consistency.
Mads Kiilerich
docs: rework stuff...
r4902
We support both Python 2.6.x and 2.7.x and nothing else. For now we don't care
about Python 3 compatibility.
Mads Kiilerich
js: drop excanvas used for IE 8 support
r5308 We try to support the most common modern web browsers. IE9 is still supported
to the extent it is feasible, IE8 is not.
Mads Kiilerich
docs: rework stuff...
r4902
We primarily support Linux and OS X on the server side but Windows should also work.
Søren Løvborg
docs: spelling, grammar, content and typography
r5425 HTML templates should use 2 spaces for indentation ... but be pragmatic. We
Mads Kiilerich
docs: rework stuff...
r4902 should use templates cleverly and avoid duplication. We should use reasonable
Søren Løvborg
docs: spelling, grammar, content and typography
r5425 semantic markup with element classes and IDs that can be used for styling and testing.
Mads Kiilerich
docs: rework stuff...
r4902 We should only use inline styles in places where it really is semantic (such as
Søren Løvborg
docs: spelling, grammar, content and typography
r5425 ``display: none``).
Mads Kiilerich
docs: rework stuff...
r4902
Søren Løvborg
docs: spelling, grammar, content and typography
r5425 JavaScript must use ``;`` between/after statements. Indentation 4 spaces. Inline
multiline functions should be indented two levels -- one for the ``()`` and one for
``{}``.
Variables holding jQuery objects should be named with a leading ``$``.
Mads Kiilerich
docs: rework stuff...
r4902
Commit messages should have a leading short line summarizing the changes. For
Søren Løvborg
docs: spelling, grammar, content and typography
r5425 bug fixes, put ``(Issue #123)`` at the end of this line.
Mads Kiilerich
docs: rework stuff...
r4902
Mads Kiilerich
docs: contributing.rst clarification of American English and Title Casing
r5432 Use American English grammar and spelling overall. Use `English title case`_ for
page titles, button labels, headers, and 'labels' for fields in forms.
.. _English title case: https://en.wikipedia.org/wiki/Capitalization#Title_case
Søren Løvborg
docs: add code guidelines on template helpers and the SQLAlchemy session
r6278 Template helpers (that is, everything in ``kallithea.lib.helpers``)
should only be referenced from templates. If you need to call a
helper from the Python code, consider moving the function somewhere
else (e.g. to the model).
Notes on the SQLAlchemy session
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Mads Kiilerich
docs: rework stuff...
r4902
Søren Løvborg
docs: add code guidelines on template helpers and the SQLAlchemy session
r6278 Each HTTP request runs inside an independent SQLAlchemy session (as well
Mads Kiilerich
docs: clarify that Session usually should be called - methods should not be used directly...
r6579 as in an independent database transaction). ``Session`` is the session manager
and factory. ``Session()`` will create a new session on-demand or return the
current session for the active thread. Many database operations are methods on
such session instances - only ``Session.remove()`` should be called directly on
the manager.
Database model objects
Søren Løvborg
docs: add code guidelines on template helpers and the SQLAlchemy session
r6278 (almost) always belong to a particular SQLAlchemy session, which means
that SQLAlchemy will ensure that they're kept in sync with the database
(but also means that they cannot be shared across requests).
Mads Kiilerich
docs: rework stuff...
r4902
Søren Løvborg
docs: add code guidelines on template helpers and the SQLAlchemy session
r6278 Objects can be added to the session using ``Session().add``, but this is
rarely needed:
Mads Kiilerich
docs: rework stuff...
r4902
Søren Løvborg
docs: add code guidelines on template helpers and the SQLAlchemy session
r6278 * When creating a database object by calling the constructor directly,
it must explicitly be added to the session.
* When creating an object using a factory function (like
``create_repo``), the returned object has already (by convention)
been added to the session, and should not be added again.
Mads Kiilerich
docs: rework stuff...
r4902
Søren Løvborg
docs: add code guidelines on template helpers and the SQLAlchemy session
r6278 * When getting an object from the session (via ``Session().query`` or
any of the utility functions that look up objects in the database),
it's already part of the session, and should not be added again.
SQLAlchemy monitors attribute modifications automatically for all
objects it knows about and syncs them to the database.
docs update
r1123
Søren Løvborg
docs: add code guidelines on template helpers and the SQLAlchemy session
r6278 SQLAlchemy also flushes changes to the database automatically; manually
calling ``Session().flush`` is usually only necessary when the Python
code needs the database to assign an "auto-increment" primary key ID to
a freshly created model object (before flushing, the ID attribute will
be ``None``).
docs update
r1123
Thomas De Schampheleire
backend: add TurboGears2 DebugBar support...
r6524 TurboGears2 DebugBar
^^^^^^^^^^^^^^^^^^^^
It is possible to enable the TurboGears2-provided DebugBar_, a toolbar overlayed
over the Kallithea web interface, allowing you to see:
* timing information of the current request, including profiling information
* request data, including GET data, POST data, cookies, headers and environment
variables
* a list of executed database queries, including timing and result values
DebugBar is only activated when ``debug = true`` is set in the configuration
file. This is important, because the DebugBar toolbar will be visible for all
users, and allow them to see information they should not be allowed to see. Like
is anyway the case for ``debug = true``, do not use this in production!
To enable DebugBar, install ``tgext.debugbar`` and ``kajiki`` (typically via
``pip``) and restart Kallithea (in debug mode).
Mads Kiilerich
docs: consistent spacing around headings...
r5433
Mads Kiilerich
docs: rework stuff...
r4902 "Roadmap"
---------
Thomas De Schampheleire
docs/contributing: move 'roadmap' to the wiki...
r4928 We do not have a road map but are waiting for your contributions. Refer to the
Søren Løvborg
docs: spelling, grammar, content and typography
r5425 wiki_ for some ideas of places we might want to go -- contributions in these
Thomas De Schampheleire
docs/contributing: move 'roadmap' to the wiki...
r4928 areas are very welcome.
Mads Kiilerich
docs: rework stuff...
r4902
Thank you for your contribution!
--------------------------------
.. _Weblate: http://weblate.org/
Søren Løvborg
docs: spelling, grammar, content and typography
r5425 .. _issue tracking: https://bitbucket.org/conservancy/kallithea/issues?status=new&status=open
.. _pull requests: https://bitbucket.org/conservancy/kallithea/pull-requests
docs update
r1123 .. _bitbucket: http://bitbucket.org/
Mads Kiilerich
docs: rework stuff...
r4902 .. _mailing list: http://lists.sfconservancy.org/mailman/listinfo/kallithea-general
Søren Løvborg
docs: spelling, grammar, content and typography
r5425 .. _kallithea-general: http://lists.sfconservancy.org/mailman/listinfo/kallithea-general
Mads Kiilerich
docs: rework stuff...
r4902 .. _Hosted Weblate: https://hosted.weblate.org/projects/kallithea/kallithea/
Thomas De Schampheleire
docs/contributing: move 'roadmap' to the wiki...
r4928 .. _wiki: https://bitbucket.org/conservancy/kallithea/wiki/Home
Thomas De Schampheleire
backend: add TurboGears2 DebugBar support...
r6524 .. _DebugBar: https://github.com/TurboGears/tgext.debugbar
Karl Goetz
docs/contributing: make contribution information more accessible...
r6690 .. _Quick Start: https://www.mercurial-scm.org/wiki/QuickStart
.. _Beginners Guide: https://www.mercurial-scm.org/wiki/BeginnersGuides