We'd love to accept your patches and contributions to this project. There are just a few small guidelines you need to follow.
Contributions to this project must be accompanied by a Contributor License Agreement. You (or your employer) retain the copyright to your contribution; this simply gives us permission to use and redistribute your contributions as part of the project. Head over to https://cla.developers.google.com/ to see your current agreements on file or to sign a new one.
You generally only need to submit a CLA once, so if you've already submitted one (even if it was for a different project), you probably don't need to do it again.
All submissions, including submissions by project members, require review. We use GitHub pull requests for this purpose. Consult GitHub Help for more information on using pull requests.
The preferred manner for submitting pull requests is for users to fork the OpenFermion-Cirq repo and then use a branch from this fork to create a pull request to the main OpenFermion-Cirq repo.
The basic process for setting up a fork is
- Fork the OpenFermion-Cirq repo (Fork button in upper right corner of
repo page).
Forking creates a new github repo at the location
https://github.com/USERNAME/openfermion-cirq
whereUSERNAME
is your github id. - Clone the fork you created to your local machine at the directory
where you would like to store your local copy of the code.
git clone git@github.com:USERNAME/openfermion-cirq.git
- Add a remote called
upstream
to git. This remote will represent the main git repo for OpenFermion-Cirq (as opposed to the clone, which you just created, which will be theorigin
remote). This remote can be used to sync your local git repos with the main git repo for OpenFermion-Cirq.To verify the remote rungit remote add upstream https://github.com/quantumlib/openfermion-cirq.git
git remote -v
and you should see both theorigin
andupstream
remotes. - Sync up your local git with the
upstream
remote:You can check the branches that are on thegit fetch upstream
upstream
remote by runninggit remote -va
. Most importantly you should seeupstream/master
listed. - Merge the upstream master into your local master so that
it is up to date
At this point your local git master should be synced with the master from the main OpenFermion-Cirq repo.
git checkout master git merge upstream/master
The process of doing work which you would like to contribute is then to
- Checkout master and create a new branch from this master
where
git checkout master -b new_branch_name
new_branch_name
is the name of your new branch. - Do your work and commit your changes to this branch.
- If you have drifted out of sync with the master from the
main OpenFermion-Cirq repo you may need to merge in changes. To do this,
first update your local master and then merge the local master
into your branch:
You may need to fix merge conflicts for both of these merge commands.
# Update your local master. git fetch upstream git checkout master git merge upstream/master # Merge local master into your branch. git checkout new_branch_name git merge master
- Finally, push your change to your clone
git push origin new_branch_name
- Now when you navigate to the OpenFermion-Cirq page on github, https://github.com/quantumlib/openfermion-cirq you should see the option to create a new pull request from your clone repository. Alternatively you can create the pull request by navigating to the "Pull requests" tab in the page, and selecting the appropriate branches.
- The reviewer will comment on your code and may ask for changes, you can perform these locally, and then push the new commit following the same process as above.
When a pull request is created or updated, various automatic checks will run to ensure that the change won't break OpenFermion-Cirq and meets our coding standards.
The continuous integration tooling checks the following:
- Tests. Existing tests must continue to pass (or be updated) when new changes are introduced. We use pytest to run our tests.
- Coverage.
Code should be covered by tests.
We use pytest-cov to compute coverage, and custom tooling to filter down the output to only include new or changed code.
We don't require 100% coverage, but any uncovered code must be annotated with
# coverage: ignore
. To ignore coverage of a single line, place# coverage: ignore
at the end of the line. To ignore coverage for an entire block, start the block with a# coverage: ignore
comment on its own line. - Lint.
Code should meet common style standards for python and be free of error-prone constructs.
We use pylint to check for lint.
To see which lint checks we enforce, see the continuous-integration/.pylintrc file.
When pylint produces a false positive, it can be squashed with annotations like
# pylint: disable=unused-import
. - Types.
Code should have type annotations.
We use mypy to check that type annotations are correct.
When type checking produces a false positive, it can be ignored with annotations like
# type: ignore
.
You can also run the continuous integration checks for yourself locally. Simply run the following command from a terminal at the root of your clone of OpenFermion-Cirq's repo, with your local changes:
bash continuous-integration/simple_check.sh
You can run a subset of the checks using the --only
flag.
This flag value can be pylint
, typecheck
, pytest
, pytest2
, or incremental-coverage
.