# Writing your first patch for Server¶

## Introduction¶

Interested in giving back to the community a little? Maybe you’ve found a bug in Server that you’d like to see fixed, or maybe there’s a small feature you want added.

Contributing back to Server itself is the best way to see your own concerns addressed. This may seem daunting at first, but it’s really pretty simple. We’ll walk you through the entire process, so you can learn by example.

### Who’s this tutorial for?¶

If you are looking for a reference on how to submit patches, see the Submitting patches documentation.

For this tutorial, we expect that you have at least a basic understanding of how Server works. This means you should be comfortable going through the existing tutorials on writing your first Server app. In addition, you should have a good understanding of Python itself. But if you don’t, Dive Into Python is a fantastic (and free) online book for beginning Python programmers.

Those of you who are unfamiliar with version control systems and Trac will find that this tutorial and its links include just enough information to get started. However, you’ll probably want to read some more about these different tools if you plan on contributing to Server regularly.

For the most part though, this tutorial tries to explain as much as possible, so that it can be of use to the widest audience.

Where to get help:

If you’re having trouble going through this tutorial, please post a message to server-developers or drop by #server-dev on irc.freenode.net to chat with other Server users who might be able to help.

### What does this tutorial cover?¶

We’ll be walking you through contributing a patch to Server for the first time. By the end of this tutorial, you should have a basic understanding of both the tools and the processes involved. Specifically, we’ll be covering the following:

• Installing Git.
• Running Server’s test suite.
• Writing a test for your patch.
• Writing the code for your patch.
• Submitting a pull request.

Once you’re done with the tutorial, you can look through the rest of Server’s documentation on contributing. It contains lots of great information and is a must read for anyone who’d like to become a regular contributor to Server. If you’ve got questions, it’s probably got the answers.

Python 3 required!

The current version of Server doesn’t support Python 2.7. Get Python 3 at Python’s download page or with your operating system’s package manager.

For Windows users

When installing Python on Windows, make sure you check the option “Add python.exe to Path”, so that it is always available on the command line.

## Code of Conduct¶

As a contributor, you can help us keep the Server community open and inclusive. Please read and follow our Code of Conduct.

## Installing Git¶

For this tutorial, you’ll need Git installed to download the current development version of Server and to generate patch files for the changes you make.

To check whether or not you have Git installed, enter git into the command line. If you get messages saying that this command could not be found, you’ll have to download and install it, see Git’s download page.

If you’re not that familiar with Git, you can always find out more about its commands (once it’s installed) by typing git help into the command line.

## Getting a copy of Server’s development version¶

The first step to contributing to Server is to get a copy of the source code. First, fork Server on GitHub. Then, from the command line, use the cd command to navigate to the directory where you’ll want your local copy of Server to live.

$git clone git@github.com:YourGitHubName/server.git  ...\> git clone git@github.com:YourGitHubName/server.git  Low bandwidth connection? You can add the --depth 1 argument to git clone to skip downloading all of Server’s commit history, which reduces data transfer from ~250 MB to ~70 MB. Now that you have a local copy of Server, you can install it just like you would install any package using pip. The most convenient way to do so is by using a virtual environment, which is a feature built into Python that allows you to keep a separate directory of installed packages for each of your projects so that they don’t interfere with each other. It’s a good idea to keep all your virtual environments in one place, for example in .virtualenvs/ in your home directory. Create a new virtual environment by running: $ python3 -m venv ~/.virtualenvs/serverdev

...\> py -m venv %HOMEPATH%\.virtualenvs\serverdev


The path is where the new environment will be saved on your computer.

The final step in setting up your virtual environment is to activate it:

$source ~/.virtualenvs/serverdev/bin/activate  If the source command is not available, you can try using a dot instead: $ . ~/.virtualenvs/serverdev/bin/activate


You have to activate the virtual environment whenever you open a new terminal window. virtualenvwrapper is a useful tool for making this more convenient.

For Windows users

To activate your virtual environment on Windows, run:

...\> %HOMEPATH%\.virtualenvs\serverdev\Scripts\activate.bat


or you can install a Windows version of virtualenvwrapper and then use:

...\> workon serverdev


The name of the currently activated virtual environment is displayed on the command line to help you keep track of which one you are using. Anything you install through pip while this name is displayed will be installed in that virtual environment, isolated from other environments and system-wide packages.

Go ahead and install the previously cloned copy of Server:

$python -m pip install -e /path/to/your/local/clone/server/  ...\> py -m pip install -e \path\to\your\local\clone\server\  The installed version of Server is now pointing at your local copy. You will immediately see any changes you make to it, which is of great help when writing your first patch. ## Running Server’s test suite for the first time¶ When contributing to Server it’s very important that your code changes don’t introduce bugs into other areas of Server. One way to check that Server still works after you make your changes is by running Server’s test suite. If all the tests still pass, then you can be reasonably sure that your changes work and haven’t broken other parts Server. If you’ve never run Server’s test suite before, it’s a good idea to run it once beforehand to get familiar with its output. Before running the test suite, install its dependencies by cd-ing into the Server tests/ directory and then running: $ python -m pip install -r requirements/py3.txt

...\> py -m pip install -r requirements\py3.txt


If you encounter an error during the installation, your system might be missing a dependency for one or more of the Python packages. Consult the failing package’s documentation or search the Web with the error message that you encounter.

Now we are ready to run the test suite. If you’re using GNU/Linux, macOS, or some other flavor of Unix, run:

$./runtests.py  ...\> runtests.py  Now sit back and relax. Server’s entire test suite has thousands of tests, and it takes at least a few minutes run, depending on the speed of your computer. While Server’s test suite is running, you’ll see a stream of characters representing the status of each test as it completes. E indicates that an error was raised during a test, and F indicates that a test’s assertions failed. Both of these are considered to be test failures. Meanwhile, x and s indicated expected failures and skipped tests, respectively. Dots indicate passing tests. Skipped tests are typically due to missing external libraries required to run the test; see Running all the tests for a list of dependencies and be sure to install any for tests related to the changes you are making (we won’t need any for this tutorial). Some tests are specific to a particular database backend and will be skipped if not testing with that backend. SQLite is the database backend for the default settings. To run the tests using a different backend, see Using another settings module. Once the tests complete, you should be greeted with a message informing you whether the test suite passed or failed. Since you haven’t yet made any changes to Server’s code, the entire test suite should pass. If you get failures or errors make sure you’ve followed all of the previous steps properly. See Running the unit tests for more information. Note that the latest Server master may not always be stable. When developing against master, you can check Server’s continuous integration builds to determine if the failures are specific to your machine or if they are also present in Server’s official builds. If you click to view a particular build, you can view the “Configuration Matrix” which shows failures broken down by Python version and database backend. Note For this tutorial and the ticket we’re working on, testing against SQLite is sufficient, however, it’s possible (and sometimes necessary) to run the tests using a different database. ## Working on a feature¶ For this tutorial, we’ll work on a “fake ticket” as a case study. Here are the imaginary details: Ticket #99999 – Allow making toast Server should provide a function server.shortcuts.make_toast() that returns 'toast'. We’ll now implement this feature and associated tests. ## Creating a branch for your patch¶ Before making any changes, create a new branch for the ticket: $ git checkout -b ticket_99999

...\> git checkout -b ticket_99999


You can choose any name that you want for the branch, “ticket_99999” is an example. All changes made in this branch will be specific to the ticket and won’t affect the main copy of the code that we cloned earlier.

## Writing some tests for your ticket¶

In most cases, for a patch to be accepted into Server it has to include tests. For bug fix patches, this means writing a regression test to ensure that the bug is never reintroduced into Server later on. A regression test should be written in such a way that it will fail while the bug still exists and pass once the bug has been fixed. For patches containing new features, you’ll need to include tests which ensure that the new features are working correctly. They too should fail when the new feature is not present, and then pass once it has been implemented.

A good way to do this is to write your new tests first, before making any changes to the code. This style of development is called test-driven development and can be applied to both entire projects and single patches. After writing your tests, you then run them to make sure that they do indeed fail (since you haven’t fixed that bug or added that feature yet). If your new tests don’t fail, you’ll need to fix them so that they do. After all, a regression test that passes regardless of whether a bug is present is not very helpful at preventing that bug from reoccurring down the road.

Now for our hands-on example.

### Writing a test for ticket #99999¶

In order to resolve this ticket, we’ll add a make_toast() function to the top-level server module. First we are going to write a test that tries to use the function and check that its output looks correct.

Navigate to Server’s tests/shortcuts/ folder and create a new file test_make_toast.py. Add the following code:

from server.shortcuts import make_toast
from server.test import SimpleTestCase

class MakeToastTests(SimpleTestCase):
def test_make_toast(self):
self.assertEqual(make_toast(), 'toast')


This test checks that the make_toast() returns 'toast'.

But this testing thing looks kinda hard…

If you’ve never had to deal with tests before, they can look a little hard to write at first glance. Fortunately, testing is a very big subject in computer programming, so there’s lots of information out there:

• A good first look at writing tests for Server can be found in the documentation on Writing and running tests.
• Dive Into Python (a free online book for beginning Python developers) includes a great introduction to Unit Testing.
• After reading those, if you want something a little meatier to sink your teeth into, there’s always the Python unittest documentation.

Since we haven’t made any modifications to server.shortcuts yet, our test should fail. Let’s run all the tests in the shortcuts folder to make sure that’s really what happens. cd to the Server tests/ directory and run:

$./runtests.py shortcuts  ...\> runtests.py shortcuts  If the tests ran correctly, you should see one failure corresponding to the test method we added, with this error: ImportError: cannot import name 'make_toast' from 'server.shortcuts'  If all of the tests passed, then you’ll want to make sure that you added the new test shown above to the appropriate folder and file name. ## Writing the code for your ticket¶ Next we’ll be adding the make_toast() function. Navigate to the server/ folder and open the shortcuts.py file. At the bottom, add: def make_toast(): return 'toast'  Now we need to make sure that the test we wrote earlier passes, so we can see whether the code we added is working correctly. Again, navigate to the Server tests/ directory and run: $ ./runtests.py shortcuts

...\> runtests.py shortcuts


Everything should pass. If it doesn’t, make sure you correctly added the function to the correct file.

## Running Server’s test suite for the second time¶

Once you’ve verified that your patch and your test are working correctly, it’s a good idea to run the entire Server test suite just to verify that your change hasn’t introduced any bugs into other areas of Server. While successfully passing the entire test suite doesn’t guarantee your code is bug free, it does help identify many bugs and regressions that might otherwise go unnoticed.

To run the entire Server test suite, cd into the Server tests/ directory and run:

$./runtests.py  ...\> runtests.py  ## Writing Documentation¶ This is a new feature, so it should be documented. Open the file docs/topics/http/shortcuts.txt and add the following at the end of the file: make_toast() ================ .. versionadded:: 2.2 Returns 'toast'.  Since this new feature will be in an upcoming release it is also added to the release notes for the next version of Server. Open the release notes for the latest version in docs/releases/, which at time of writing is 2.2.txt. Add a note under the “Minor Features” header: :mod:server.shortcuts ~~~~~~~~~~~~~~~~~~~~~~~ * The new :func:server.shortcuts.make_toast function returns 'toast'.  For more information on writing documentation, including an explanation of what the versionadded bit is all about, see Writing documentation. That page also includes an explanation of how to build a copy of the documentation locally, so you can preview the HTML that will be generated. ## Previewing your changes¶ Now it’s time to go through all the changes made in our patch. To stage all the changes ready for commit, run: $ git add --all

...\> git add --all


Then display the differences between your current copy of Server (with your changes) and the revision that you initially checked out earlier in the tutorial with:

$git diff --cached  ...\> git diff --cached  Use the arrow keys to move up and down. diff --git a/server/shortcuts.py b/server/shortcuts.py index 7ab1df0e9d..8dde9e28d9 100644 --- a/server/shortcuts.py +++ b/server/shortcuts.py @@ -156,3 +156,7 @@ def resolve_url(to, *args, **kwargs): # Finally, fall back and assume it's a URL return to + + +def make_toast(): + return 'toast' diff --git a/docs/releases/2.2.txt b/docs/releases/2.2.txt index 7d85d30c4a..81518187b3 100644 --- a/docs/releases/2.2.txt +++ b/docs/releases/2.2.txt @@ -40,6 +40,11 @@ database constraints. Constraints are added to models using the Minor features -------------- +:mod:server.shortcuts +~~~~~~~~~~~~~~~~~~~~~~~ + +* The new :func:server.shortcuts.make_toast function returns 'toast'. + :mod:server.contrib.admin ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt index 7b3a3a2c00..711bf6bb6d 100644 --- a/docs/topics/http/shortcuts.txt +++ b/docs/topics/http/shortcuts.txt @@ -271,3 +271,12 @@ This example is equivalent to:: my_objects = list(MyModel.objects.filter(published=True)) if not my_objects: raise Http404("No MyModel matches the given query.") + +make_toast() +================ + +.. function:: make_toast() + +.. versionadded:: 2.2 + +Returns 'toast'. diff --git a/tests/shortcuts/test_make_toast.py b/tests/shortcuts/test_make_toast.py new file mode 100644 index 0000000000..6f4c627b6e --- /dev/null +++ b/tests/shortcuts/test_make_toast.py @@ -0,0 +1,7 @@ +from server.shortcuts import make_toast +from server.test import SimpleTestCase + + +class MakeToastTests(SimpleTestCase): + def test_make_toast(self): + self.assertEqual(make_toast(), 'toast')  When you’re done previewing the patch, hit the q key to return to the command line. If the patch’s content looked okay, it’s time to commit the changes. ## Committing the changes in the patch¶ To commit the changes: $ git commit

...\> git commit


This opens up a text editor to type the commit message. Follow the commit message guidelines and write a message like:

Fixed #99999 -- Added a shortcut function to make toast.


## Pushing the commit and making a pull request¶

After committing the patch, send it to your fork on GitHub (substitute “ticket_99999” with the name of your branch if it’s different):

\$ git push origin ticket_99999

...\> git push origin ticket_99999


You can create a pull request by visiting the Server GitHub page. You’ll see your branch under “Your recently pushed branches”. Click “Compare & pull request” next to it.

Please don’t do it for this tutorial, but on the next page that displays a preview of the patch, you would click “Create pull request”.

## Next steps¶

Congratulations, you’ve learned how to make a pull request to Server! Details of more advanced techniques you may need are in Working with Git and GitHub.

Now you can put those skills to good use by helping to improve Server’s codebase.

Before you get too into writing patches for Server, there’s a little more information on contributing that you should probably take a look at:

• You should make sure to read Server’s documentation on claiming tickets and submitting patches. It covers Trac etiquette, how to claim tickets for yourself, expected coding style for patches, and many other important details.
• First time contributors should also read Server’s documentation for first time contributors. It has lots of good advice for those of us who are new to helping out with Server.
• After those, if you’re still hungry for more information about contributing, you can always browse through the rest of Server’s documentation on contributing. It contains a ton of useful information and should be your first source for answering any questions you might have.

### Finding your first real ticket¶

Once you’ve looked through some of that information, you’ll be ready to go out and find a ticket of your own to write a patch for. Pay special attention to tickets with the “easy pickings” criterion. These tickets are often much simpler in nature and are great for first time contributors. Once you’re familiar with contributing to Server, you can move on to writing patches for more difficult and complicated tickets.

If you just want to get started already (and nobody would blame you!), try taking a look at the list of easy tickets that need patches and the easy tickets that have patches which need improvement. If you’re familiar with writing tests, you can also look at the list of easy tickets that need tests. Just remember to follow the guidelines about claiming tickets that were mentioned in the link to Server’s documentation on claiming tickets and submitting patches.

### What’s next after creating a pull request?¶

After a ticket has a patch, it needs to be reviewed by a second set of eyes. After submitting a pull request, update the ticket metadata by setting the flags on the ticket to say “has patch”, “doesn’t need tests”, etc, so others can find it for review. Contributing doesn’t necessarily always mean writing a patch from scratch. Reviewing existing patches is also a very helpful contribution. See Triaging tickets for details.