Skip to content

Latest commit

 

History

History
373 lines (252 loc) · 14.8 KB

Contributing.md

File metadata and controls

373 lines (252 loc) · 14.8 KB

Guidelines for contributing to EDMC

Work on Issues

If you are not part of the core development team then you should only be performing work that addresses an open issue.

So, if what you think needs doing isn't currently referred to in an open issue, then you should first open an issue please use the correct template if applicable.

Check with us first

Whilst we welcome all efforts to improve the program it's best to ensure that you're not duplicating, or worse, wasting effort.

There is sometimes a misconception that Open Source means that the primary project is obliged to accept Pull Requests. That is not so. While you are 100% free to make changes in your own fork, we will only accept changes that are consistent with our vision for EDMC. Fundamental changes in particular need to be agreed in advance.

Version conventions

Please see Version Strings for a description of the currently used version strings.

Historically a A.BC form was used, based on an internal A.B.C.D version string. This was changed to simply A.B.C.D throughout for 4.0.0.0, 4.0.1.0 and 4.0.2.0. It would also continue for any other increment of only the 'C' (Patch) component.

Going forwards we will always use the full Semantic Version and 'folder style' tag names, e.g. Release/Major.Minor.Patch.

Currently the only file that defines the version code-wise is config.py. Changelog.md and edmarketconnector.xml are another matter handled as part of the release process.

Git branch structure and tag conventions

Somewhat based on git-flow, but our particular take on it:

Branches

stable

This will either have HEAD pointing to the latest stable release code or might have extra code merged in for a hotfix that will shortly be in the next stable release. If you want the latest stable release code then use the appropriate Release/A.B.C tag!

beta

If we run any pre-release betas with actual builds released, not just a branch to be run from source, then this branch will contain that code. As per stable above, this branch might be ahead of the latest pre-release due to merging of hotfixes. Use the appropriate tag if you want to be sure of the code you checkout. If there hasn't yet been a new beta version this could be far behind all of: main, develop, stable.

develop

This is the branch where all current development is integrated. No commits should be made directly to this as the work should be done in a separate branch used in a Pull Request before being merged as part of resolving that Pull Request.

main

Yes, we've renamed this from master. See "Using 'main' as the primary branch in Git" for instructions on ensuring you're cleanly using it in any local clone.

This branch should contain anything from develop that is considered well tested and ready for the next stable merge.

master

This is no longer used. If the branch is even present then it's no longer updated. You should be using main instead.

releases

Currently the version of the edmarketconnector.xml 'appcast' file in this branch is what live clients check to be notified of new versions. This can potentially be replaced with the stable branch's version, but some care will be necessary to ensure no users are left behind (their client checking the releases branch which then no longer exists). For the time being this should always be kept in sync with stable as each new release is made.

Tags

Stable Releases

All stable releases MUST have a tag of the form Release/Major.Minor.Patch on the commit that was HEAD when the installer for it was built.

Pre-Releases

Tags for pre-releases should be of one of two forms, following Version Strings conventions.

  • Initial beta releases should have versions of the form:

    Major.Minor.Patch-beta<serial>

    with the <serial> starting with 1 and incrementing with each new beta pre-release.

  • Release candidates should have versions of the form:

    Major.Minor.Patch-rc<serial>

    with the <serial> starting with 1 and incrementing with each new release candidate.

The tag should thus be Release/Major.Minor.Patch-(beta|rc)<serial>.

The Semantic Versioning +<build metadata> should never be a part of the tag.

Work in progress conventions

Remember, you should always be working versus a single issue, even if the work is part of a Milestone or Project. There might be cases where issues aren't duplicates, but your work still addresses more than one. In that case pick one for the naming scheme below, but mention all in commit messages and the Pull Request.

In all cases the branch should be named as per the scheme <class>/<issue number>-<title>:

  • <class> - We have several classes of WIP branch:

    • fix - For working on bug fixes, e.g. fix/184-crash-in-startup
    • enhancement - For enhancing an existing feature, e.g. enhancement/192-add-thing-to-wotsit
    • feature - For working on new features, e.g. feature/284-allow-users-to-frob

  • <issue-number> is for easy reference when citing the issue number in commit messages. If you're somehow doing work that's not versus an issue then don't put the <issue number>- part in.

  • <title> is intended to allow anyone to quickly know what the branch is addressing. Try to choose something succinct for <title>, it's just there for easy reference, it doesn't need to be the entire title of the appropriate issue.

Which branch you base your work on will depend on which class of WIP it is. If you're fixing a bug in the latest stable then it's best to base your branch on its HEAD. If it's a fix for a beta release then base off of beta's HEAD. If you're working on a new feature then you'd want to base the work on develop's HEAD.

Important: Please under no circumstance merge from the source branch after you have started work in your WIP branch. If there are any non-trivial conflicts when we merge your Pull Request then we might ask you to rebase your WIP branch on the latest version of the source branch. Otherwise we'll work out how to best merge your changes via comments in the Pull Request.

Linting

We use flake8 for linting all python source.

While working on your changes, please ensure that they pass a check from flake8 using our configuration and plugins. If you installed requirements-dev.txt with pip, you should simply be able to run flake8 your_files_here to lint your files.

Note that if your PR does not cleanly (or mostly cleanly) pass a linting scan, your PR may be put on hold pending fixes.

Unit testing

Where possible please write unit tests for your PRs, especially in the case of bug fixes, having regression tests help ensure that we don't accidentally re-introduce a bug down the line.

We use the pytest for unit testing.

The files for a test should go in a sub-directory of tests/ named after the (principal) file that contains the code they are testing. e.g. for journal_lock.py the tests are in tests/journal_lock.py/test_journal_lock.py. The test_ prefix on test_journal_lock.py is necessary in order for pytest to recognise the file as containing tests to be run. The sub-directory avoids having a mess of files in tests, particularly when there might be supporting files, e.g. tests/config.py/_old_config.py or files containing test data.

Invoking just a bare pytest command will run all tests.

To run only a sub-set of tests you can use, e.g. pytest -k journal_lock. You might want to use pytest -rA -k journal_lock if you have any debug print() statements within the test code itself, so you can see the output even when the tests all succeed.

Adding --trace to a pytest invocation causes it to drop into a pdb prompt for each test, handy if you want to step through the testing code to be sure of anything.

Otherwise, see the pytest documentation.

General workflow

  1. You will need a GitHub account.
  2. Fork the repository on GitHub into your account there (hereafter referred to as 'your fork').
  3. In your local copy of your fork create an appropriate WIP branch.
  4. Develop the changes, testing as you go (no we don't have any actual tests yet).
    1. Be as sure as you can that the code works as you intend and hasn't introduced any other bugs or regressions.
    2. Test the codebase as a whole against any unit tests that do exist, and add your own as you can.
    3. Check your code against flake8 periodically.
  5. When you're sure the work is final:
    1. Push your WIP branch to your fork (you probably should have been doing this as you worked as a form of backup).
    2. Access the WIP branch on your fork on GitHub and create a Pull Request. Mention any Issue number(s) that it addresses.
  6. Await feedback in the form of comments on the Pull Request.

IMPORTANT: Once you have created the Pull Request any changes you make to that WIP branch and push to your fork will be reflected in the Pull Request. Ensure that only the changes for the issue(s) you are addressing are in the WIP branch. Any other work should occur in its own separate WIP branch. If needs be make one branch to work in and another for the Pull Request, merging or cherry-picking commits as needed.

Coding Conventions

In general, please follow PEP8

Adhere to the spelling conventions of the libraries and modules used in the project

Yes, this means using 'color' rather than 'colour', and in general will mean US, not British, spellings.

Control flow

Never oneline any control flow (if, else, for), as it makes spotting what happens next difficult.

Yes:

if something_true:
    one_thing_we_do()

No:

if something_true: one_thing_we_do()

Yes, some existing code still flouts this rule.

Scope changes

Always use Line breaks after scope changes. It makes seeing where scope has changed far easier on a quick skim

Yes:

  if True:
    do_something()

  else:
    raise UniverseBrokenException()

  return

No:

  if True:
    do_something()
  else:
    raise UniverseBrokenException()
  return

Use Type hints

Please do place type hints on the declarations of your functions, both their arguments and return types.

Use logging not print(), and definitely not sys.stdout.write()

EDMarketConnector.py sets up a logging.Logger for this under the appname, so:

import logging
from config import appname
logger = logging.getLogger(appname)

logger.info(f'Some message with a {variable}')

try:
    something
except Exception as e:  # Try to be more specific
    logger.error(f'Error in ... with ...', exc_info=e)

DO NOT use the following, as you might cause a circular import:

    from EDMarketConnector import logger

We have implemented a logging.Filter that adds support for the following in logging.Formatter() strings:

  1. %(qualname)s which gets the full <module>.ClassA(.ClassB...).func of the calling function.
  2. %(class)s which gets just the enclosing class name(s) of the calling function.

If you want to see how we did this, check EDMCLogging.py.

So don't worry about adding anything about the class or function you're logging from, it's taken care of.

Do use a pertinent message, even when using exc_info=... to log an exception. e.g. Logging will know you were in your get_foo() function but you should still tell it what actually (failed to have) happened in there.

Prefer fstrings to modulo-formatting and .format

fstrings are new in python 3.6, and allow for string interpolation rather than more opaque formatting calls.

As part of our flake8 linting setup we have included a linter that warns when you use either % or .format on string literals.

Docstrings

Doc strings are preferred on all new modules, functions, classes, and methods, as they help others understand your code. We use the sphinx formatting style, which for pycharm users is the default.

Mark hacks and workarounds with a specific comment

We often write hacks or workarounds to make EDMC work on a given version or around a specific bug. Please mark all hacks, workarounds, magic with one of the following comments, where applicable:

# HACK $elite-version-number | $date: $description
# MAGIC $elite-version-number | $date: $description
# WORKAROUND $elite-version-number | $date: $description

The description should cover exactly why the hack is needed, what it does, what is required / expected for it to be removed. Please be verbose here, more info about weird choices is always prefered over magic that we struggle to understand in six months.

Additionally, if your hack is over around 5 lines, please include a # HACK END or similar comment to indicate the end of the hack.

Git commit conventions

  • Please use the standard Git convention of a short title in the first line and fuller body text in subsequent lines.
  • Please reference issue numbers using the "hashtag" format #123 in your commit message wherever possible. This lets GitHub create two-way hyperlinks between the issue report and the commit. Certain text in a PR that fixes an issue can auto-close the issue when the PR is merged.
  • If in doubt, lean towards many small commits. This makes git bisect much more useful.
  • Please try at all costs to avoid a "mixed-up" commit, i.e. one that addresses more than one issue at once. One thing at a time is best.

Build process

See Releasing.md for the environment and procedure necessary for building the application into a .exe and Windows installer file.

Translations

See Translations.md for how to ensure any new phrases your code adds can be easily translated.

Acknowledgement

The overall structure, and some of the contents, of this document were taken from the EDDI Contributing.md.