contributing.txt 23 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613
  1. ===================================
  2. Writing your first patch for Django
  3. ===================================
  4. Introduction
  5. ============
  6. Interested in giving back to the community a little? Maybe you've found a bug
  7. in Django that you'd like to see fixed, or maybe there's a small feature you
  8. want added.
  9. Contributing back to Django itself is the best way to see your own concerns
  10. addressed. This may seem daunting at first, but it's a well-traveled path with
  11. documentation, tooling, and a community to support you. We'll walk you through
  12. the entire process, so you can learn by example.
  13. Who's this tutorial for?
  14. ------------------------
  15. .. seealso::
  16. If you are looking for a reference on how to submit patches, see the
  17. :doc:`/internals/contributing/writing-code/submitting-patches`
  18. documentation.
  19. For this tutorial, we expect that you have at least a basic understanding of
  20. how Django works. This means you should be comfortable going through the
  21. existing tutorials on :doc:`writing your first Django app</intro/tutorial01>`.
  22. In addition, you should have a good understanding of Python itself. But if you
  23. don't, `Dive Into Python`__ is a fantastic (and free) online book for
  24. beginning Python programmers.
  25. Those of you who are unfamiliar with version control systems and Trac will find
  26. that this tutorial and its links include just enough information to get started.
  27. However, you'll probably want to read some more about these different tools if
  28. you plan on contributing to Django regularly.
  29. For the most part though, this tutorial tries to explain as much as possible,
  30. so that it can be of use to the widest audience.
  31. .. admonition:: Where to get help:
  32. If you're having trouble going through this tutorial, please post a message
  33. to |django-developers| or drop by `#django-dev on irc.freenode.net`__ to
  34. chat with other Django users who might be able to help.
  35. __ https://diveinto.org/python3/table-of-contents.html
  36. __ irc://irc.freenode.net/django-dev
  37. What does this tutorial cover?
  38. ------------------------------
  39. We'll be walking you through contributing a patch to Django for the first time.
  40. By the end of this tutorial, you should have a basic understanding of both the
  41. tools and the processes involved. Specifically, we'll be covering the following:
  42. * Installing Git.
  43. * Downloading a copy of Django's development version.
  44. * Running Django's test suite.
  45. * Writing a test for your patch.
  46. * Writing the code for your patch.
  47. * Testing your patch.
  48. * Submitting a pull request.
  49. * Where to look for more information.
  50. Once you're done with the tutorial, you can look through the rest of
  51. :doc:`Django's documentation on contributing</internals/contributing/index>`.
  52. It contains lots of great information and is a must read for anyone who'd like
  53. to become a regular contributor to Django. If you've got questions, it's
  54. probably got the answers.
  55. .. admonition:: Python 3 required!
  56. The current version of Django doesn't support Python 2.7. Get Python 3 at
  57. `Python's download page <https://www.python.org/downloads/>`_ or with your
  58. operating system's package manager.
  59. .. admonition:: For Windows users
  60. When installing Python on Windows, make sure you check the option "Add
  61. python.exe to Path", so that it is always available on the command line.
  62. Code of Conduct
  63. ===============
  64. As a contributor, you can help us keep the Django community open and inclusive.
  65. Please read and follow our `Code of Conduct <https://www.djangoproject.com/conduct/>`_.
  66. Installing Git
  67. ==============
  68. For this tutorial, you'll need Git installed to download the current
  69. development version of Django and to generate patch files for the changes you
  70. make.
  71. To check whether or not you have Git installed, enter ``git`` into the command
  72. line. If you get messages saying that this command could not be found, you'll
  73. have to download and install it, see `Git's download page`__.
  74. If you're not that familiar with Git, you can always find out more about its
  75. commands (once it's installed) by typing ``git help`` into the command line.
  76. __ https://git-scm.com/download
  77. Getting a copy of Django's development version
  78. ==============================================
  79. The first step to contributing to Django is to get a copy of the source code.
  80. First, `fork Django on GitHub <https://github.com/django/django/fork>`__. Then,
  81. from the command line, use the ``cd`` command to navigate to the directory
  82. where you'll want your local copy of Django to live.
  83. Download the Django source code repository using the following command:
  84. .. console::
  85. $ git clone https://github.com/YourGitHubName/django.git
  86. .. admonition:: Low bandwidth connection?
  87. You can add the ``--depth 1`` argument to ``git clone`` to skip downloading
  88. all of Django's commit history, which reduces data transfer from ~250 MB
  89. to ~70 MB.
  90. Now that you have a local copy of Django, you can install it just like you would
  91. install any package using ``pip``. The most convenient way to do so is by using
  92. a *virtual environment*, which is a feature built into Python that allows you
  93. to keep a separate directory of installed packages for each of your projects so
  94. that they don't interfere with each other.
  95. It's a good idea to keep all your virtual environments in one place, for
  96. example in ``.virtualenvs/`` in your home directory.
  97. Create a new virtual environment by running:
  98. .. console::
  99. $ python3 -m venv ~/.virtualenvs/djangodev
  100. The path is where the new environment will be saved on your computer.
  101. The final step in setting up your virtual environment is to activate it:
  102. .. code-block:: console
  103. $ source ~/.virtualenvs/djangodev/bin/activate
  104. If the ``source`` command is not available, you can try using a dot instead:
  105. .. code-block:: console
  106. $ . ~/.virtualenvs/djangodev/bin/activate
  107. You have to activate the virtual environment whenever you open a new
  108. terminal window. virtualenvwrapper__ is a useful tool for making this
  109. more convenient.
  110. .. admonition:: For Windows users
  111. To activate your virtual environment on Windows, run:
  112. .. code-block:: doscon
  113. ...\> %HOMEPATH%\.virtualenvs\djangodev\Scripts\activate.bat
  114. or you can install :ref:`a Windows version of virtualenvwrapper
  115. <virtualenvwrapper-win>` and then use:
  116. .. code-block:: doscon
  117. ...\> workon djangodev
  118. __ https://virtualenvwrapper.readthedocs.io/en/latest/
  119. The name of the currently activated virtual environment is displayed on the
  120. command line to help you keep track of which one you are using. Anything you
  121. install through ``pip`` while this name is displayed will be installed in that
  122. virtual environment, isolated from other environments and system-wide packages.
  123. Go ahead and install the previously cloned copy of Django:
  124. .. console::
  125. $ python -m pip install -e /path/to/your/local/clone/django/
  126. The installed version of Django is now pointing at your local copy. You will
  127. immediately see any changes you make to it, which is of great help when writing
  128. your first patch.
  129. Running Django's test suite for the first time
  130. ==============================================
  131. When contributing to Django it's very important that your code changes don't
  132. introduce bugs into other areas of Django. One way to check that Django still
  133. works after you make your changes is by running Django's test suite. If all
  134. the tests still pass, then you can be reasonably sure that your changes
  135. work and haven't broken other parts of Django. If you've never run Django's test
  136. suite before, it's a good idea to run it once beforehand to get familiar with
  137. its output.
  138. Before running the test suite, install its dependencies by ``cd``-ing into the
  139. Django ``tests/`` directory and then running:
  140. .. console::
  141. $ python -m pip install -r requirements/py3.txt
  142. If you encounter an error during the installation, your system might be missing
  143. a dependency for one or more of the Python packages. Consult the failing
  144. package's documentation or search the Web with the error message that you
  145. encounter.
  146. Now we are ready to run the test suite. If you're using GNU/Linux, macOS, or
  147. some other flavor of Unix, run:
  148. .. console::
  149. $ ./runtests.py
  150. Now sit back and relax. Django's entire test suite has thousands of tests, and
  151. it takes at least a few minutes run, depending on the speed of your computer.
  152. While Django's test suite is running, you'll see a stream of characters
  153. representing the status of each test as it completes. ``E`` indicates that an
  154. error was raised during a test, and ``F`` indicates that a test's assertions
  155. failed. Both of these are considered to be test failures. Meanwhile, ``x`` and
  156. ``s`` indicated expected failures and skipped tests, respectively. Dots indicate
  157. passing tests.
  158. Skipped tests are typically due to missing external libraries required to run
  159. the test; see :ref:`running-unit-tests-dependencies` for a list of dependencies
  160. and be sure to install any for tests related to the changes you are making (we
  161. won't need any for this tutorial). Some tests are specific to a particular
  162. database backend and will be skipped if not testing with that backend. SQLite
  163. is the database backend for the default settings. To run the tests using a
  164. different backend, see :ref:`running-unit-tests-settings`.
  165. Once the tests complete, you should be greeted with a message informing you
  166. whether the test suite passed or failed. Since you haven't yet made any changes
  167. to Django's code, the entire test suite **should** pass. If you get failures or
  168. errors make sure you've followed all of the previous steps properly. See
  169. :ref:`running-unit-tests` for more information.
  170. Note that the latest Django master may not always be stable. When developing
  171. against master, you can check `Django's continuous integration builds`__ to
  172. determine if the failures are specific to your machine or if they are also
  173. present in Django's official builds. If you click to view a particular build,
  174. you can view the "Configuration Matrix" which shows failures broken down by
  175. Python version and database backend.
  176. __ https://djangoci.com
  177. .. note::
  178. For this tutorial and the ticket we're working on, testing against SQLite
  179. is sufficient, however, it's possible (and sometimes necessary) to
  180. :ref:`run the tests using a different database
  181. <running-unit-tests-settings>`.
  182. Working on a feature
  183. ====================
  184. For this tutorial, we'll work on a "fake ticket" as a case study. Here are the
  185. imaginary details:
  186. .. admonition:: Ticket #99999 -- Allow making toast
  187. Django should provide a function ``django.shortcuts.make_toast()`` that
  188. returns ``'toast'``.
  189. We'll now implement this feature and associated tests.
  190. Creating a branch for your patch
  191. ================================
  192. Before making any changes, create a new branch for the ticket:
  193. .. console::
  194. $ git checkout -b ticket_99999
  195. You can choose any name that you want for the branch, "ticket_99999" is an
  196. example. All changes made in this branch will be specific to the ticket and
  197. won't affect the main copy of the code that we cloned earlier.
  198. Writing some tests for your ticket
  199. ==================================
  200. In most cases, for a patch to be accepted into Django it has to include tests.
  201. For bug fix patches, this means writing a regression test to ensure that the
  202. bug is never reintroduced into Django later on. A regression test should be
  203. written in such a way that it will fail while the bug still exists and pass
  204. once the bug has been fixed. For patches containing new features, you'll need
  205. to include tests which ensure that the new features are working correctly.
  206. They too should fail when the new feature is not present, and then pass once it
  207. has been implemented.
  208. A good way to do this is to write your new tests first, before making any
  209. changes to the code. This style of development is called
  210. `test-driven development`__ and can be applied to both entire projects and
  211. single patches. After writing your tests, you then run them to make sure that
  212. they do indeed fail (since you haven't fixed that bug or added that feature
  213. yet). If your new tests don't fail, you'll need to fix them so that they do.
  214. After all, a regression test that passes regardless of whether a bug is present
  215. is not very helpful at preventing that bug from reoccurring down the road.
  216. Now for our hands-on example.
  217. __ https://en.wikipedia.org/wiki/Test-driven_development
  218. Writing a test for ticket #99999
  219. --------------------------------
  220. In order to resolve this ticket, we'll add a ``make_toast()`` function to the
  221. top-level ``django`` module. First we are going to write a test that tries to
  222. use the function and check that its output looks correct.
  223. Navigate to Django's ``tests/shortcuts/`` folder and create a new file
  224. ``test_make_toast.py``. Add the following code::
  225. from django.shortcuts import make_toast
  226. from django.test import SimpleTestCase
  227. class MakeToastTests(SimpleTestCase):
  228. def test_make_toast(self):
  229. self.assertEqual(make_toast(), 'toast')
  230. This test checks that the ``make_toast()`` returns ``'toast'``.
  231. .. admonition:: But this testing thing looks kinda hard...
  232. If you've never had to deal with tests before, they can look a little hard
  233. to write at first glance. Fortunately, testing is a *very* big subject in
  234. computer programming, so there's lots of information out there:
  235. * A good first look at writing tests for Django can be found in the
  236. documentation on :doc:`/topics/testing/overview`.
  237. * Dive Into Python (a free online book for beginning Python developers)
  238. includes a great `introduction to Unit Testing`__.
  239. * After reading those, if you want something a little meatier to sink
  240. your teeth into, there's always the Python :mod:`unittest` documentation.
  241. __ https://www.diveinto.org/python3/unit-testing.html
  242. Running your new test
  243. ---------------------
  244. Since we haven't made any modifications to ``django.shortcuts`` yet, our test
  245. should fail. Let's run all the tests in the ``shortcuts`` folder to make sure
  246. that's really what happens. ``cd`` to the Django ``tests/`` directory and run:
  247. .. console::
  248. $ ./runtests.py shortcuts
  249. If the tests ran correctly, you should see one failure corresponding to the test
  250. method we added, with this error::
  251. ImportError: cannot import name 'make_toast' from 'django.shortcuts'
  252. If all of the tests passed, then you'll want to make sure that you added the
  253. new test shown above to the appropriate folder and file name.
  254. Writing the code for your ticket
  255. ================================
  256. Next we'll be adding the ``make_toast()`` function.
  257. Navigate to the ``django/`` folder and open the ``shortcuts.py`` file. At the
  258. bottom, add::
  259. def make_toast():
  260. return 'toast'
  261. Now we need to make sure that the test we wrote earlier passes, so we can see
  262. whether the code we added is working correctly. Again, navigate to the Django
  263. ``tests/`` directory and run:
  264. .. console::
  265. $ ./runtests.py shortcuts
  266. Everything should pass. If it doesn't, make sure you correctly added the
  267. function to the correct file.
  268. Running Django's test suite for the second time
  269. ===============================================
  270. Once you've verified that your patch and your test are working correctly, it's
  271. a good idea to run the entire Django test suite to verify that your change
  272. hasn't introduced any bugs into other areas of Django. While successfully
  273. passing the entire test suite doesn't guarantee your code is bug free, it does
  274. help identify many bugs and regressions that might otherwise go unnoticed.
  275. To run the entire Django test suite, ``cd`` into the Django ``tests/``
  276. directory and run:
  277. .. console::
  278. $ ./runtests.py
  279. Writing Documentation
  280. =====================
  281. This is a new feature, so it should be documented. Open the file
  282. ``docs/topics/http/shortcuts.txt`` and add the following at the end of the
  283. file::
  284. ``make_toast()``
  285. ================
  286. .. versionadded:: 2.2
  287. Returns ``'toast'``.
  288. Since this new feature will be in an upcoming release it is also added to the
  289. release notes for the next version of Django. Open the release notes for the
  290. latest version in ``docs/releases/``, which at time of writing is ``2.2.txt``.
  291. Add a note under the "Minor Features" header::
  292. :mod:`django.shortcuts`
  293. ~~~~~~~~~~~~~~~~~~~~~~~
  294. * The new :func:`django.shortcuts.make_toast` function returns ``'toast'``.
  295. For more information on writing documentation, including an explanation of what
  296. the ``versionadded`` bit is all about, see
  297. :doc:`/internals/contributing/writing-documentation`. That page also includes
  298. an explanation of how to build a copy of the documentation locally, so you can
  299. preview the HTML that will be generated.
  300. Previewing your changes
  301. =======================
  302. Now it's time to go through all the changes made in our patch. To stage all the
  303. changes ready for commit, run:
  304. .. console::
  305. $ git add --all
  306. Then display the differences between your current copy of Django (with your
  307. changes) and the revision that you initially checked out earlier in the
  308. tutorial with:
  309. .. console::
  310. $ git diff --cached
  311. Use the arrow keys to move up and down.
  312. .. code-block:: diff
  313. diff --git a/django/shortcuts.py b/django/shortcuts.py
  314. index 7ab1df0e9d..8dde9e28d9 100644
  315. --- a/django/shortcuts.py
  316. +++ b/django/shortcuts.py
  317. @@ -156,3 +156,7 @@ def resolve_url(to, *args, **kwargs):
  318. # Finally, fall back and assume it's a URL
  319. return to
  320. +
  321. +
  322. +def make_toast():
  323. + return 'toast'
  324. diff --git a/docs/releases/2.2.txt b/docs/releases/2.2.txt
  325. index 7d85d30c4a..81518187b3 100644
  326. --- a/docs/releases/2.2.txt
  327. +++ b/docs/releases/2.2.txt
  328. @@ -40,6 +40,11 @@ database constraints. Constraints are added to models using the
  329. Minor features
  330. --------------
  331. +:mod:`django.shortcuts`
  332. +~~~~~~~~~~~~~~~~~~~~~~~
  333. +
  334. +* The new :func:`django.shortcuts.make_toast` function returns ``'toast'``.
  335. +
  336. :mod:`django.contrib.admin`
  337. ~~~~~~~~~~~~~~~~~~~~~~~~~~~
  338. diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt
  339. index 7b3a3a2c00..711bf6bb6d 100644
  340. --- a/docs/topics/http/shortcuts.txt
  341. +++ b/docs/topics/http/shortcuts.txt
  342. @@ -271,3 +271,12 @@ This example is equivalent to::
  343. my_objects = list(MyModel.objects.filter(published=True))
  344. if not my_objects:
  345. raise Http404("No MyModel matches the given query.")
  346. +
  347. +``make_toast()``
  348. +================
  349. +
  350. +.. function:: make_toast()
  351. +
  352. +.. versionadded:: 2.2
  353. +
  354. +Returns ``'toast'``.
  355. diff --git a/tests/shortcuts/test_make_toast.py b/tests/shortcuts/test_make_toast.py
  356. new file mode 100644
  357. index 0000000000..6f4c627b6e
  358. --- /dev/null
  359. +++ b/tests/shortcuts/test_make_toast.py
  360. @@ -0,0 +1,7 @@
  361. +from django.shortcuts import make_toast
  362. +from django.test import SimpleTestCase
  363. +
  364. +
  365. +class MakeToastTests(SimpleTestCase):
  366. + def test_make_toast(self):
  367. + self.assertEqual(make_toast(), 'toast')
  368. When you're done previewing the patch, hit the ``q`` key to return to the
  369. command line. If the patch's content looked okay, it's time to commit the
  370. changes.
  371. Committing the changes in the patch
  372. ===================================
  373. To commit the changes:
  374. .. console::
  375. $ git commit
  376. This opens up a text editor to type the commit message. Follow the :ref:`commit
  377. message guidelines <committing-guidelines>` and write a message like:
  378. .. code-block:: text
  379. Fixed #99999 -- Added a shortcut function to make toast.
  380. Pushing the commit and making a pull request
  381. ============================================
  382. After committing the patch, send it to your fork on GitHub (substitute
  383. "ticket_99999" with the name of your branch if it's different):
  384. .. console::
  385. $ git push origin ticket_99999
  386. You can create a pull request by visiting the `Django GitHub page
  387. <https://github.com/django/django/>`_. You'll see your branch under "Your
  388. recently pushed branches". Click "Compare & pull request" next to it.
  389. Please don't do it for this tutorial, but on the next page that displays a
  390. preview of the patch, you would click "Create pull request".
  391. Next steps
  392. ==========
  393. Congratulations, you've learned how to make a pull request to Django! Details
  394. of more advanced techniques you may need are in
  395. :doc:`/internals/contributing/writing-code/working-with-git`.
  396. Now you can put those skills to good use by helping to improve Django's
  397. codebase.
  398. More information for new contributors
  399. -------------------------------------
  400. Before you get too into writing patches for Django, there's a little more
  401. information on contributing that you should probably take a look at:
  402. * You should make sure to read Django's documentation on
  403. :doc:`claiming tickets and submitting patches
  404. </internals/contributing/writing-code/submitting-patches>`.
  405. It covers Trac etiquette, how to claim tickets for yourself, expected
  406. coding style for patches, and many other important details.
  407. * First time contributors should also read Django's :doc:`documentation
  408. for first time contributors</internals/contributing/new-contributors/>`.
  409. It has lots of good advice for those of us who are new to helping out
  410. with Django.
  411. * After those, if you're still hungry for more information about
  412. contributing, you can always browse through the rest of
  413. :doc:`Django's documentation on contributing</internals/contributing/index>`.
  414. It contains a ton of useful information and should be your first source
  415. for answering any questions you might have.
  416. Finding your first real ticket
  417. ------------------------------
  418. Once you've looked through some of that information, you'll be ready to go out
  419. and find a ticket of your own to write a patch for. Pay special attention to
  420. tickets with the "easy pickings" criterion. These tickets are often much
  421. simpler in nature and are great for first time contributors. Once you're
  422. familiar with contributing to Django, you can move on to writing patches for
  423. more difficult and complicated tickets.
  424. If you just want to get started already (and nobody would blame you!), try
  425. taking a look at the list of `easy tickets that need patches`__ and the
  426. `easy tickets that have patches which need improvement`__. If you're familiar
  427. with writing tests, you can also look at the list of
  428. `easy tickets that need tests`__. Remember to follow the guidelines about
  429. claiming tickets that were mentioned in the link to Django's documentation on
  430. :doc:`claiming tickets and submitting patches
  431. </internals/contributing/writing-code/submitting-patches>`.
  432. __ https://code.djangoproject.com/query?status=new&status=reopened&has_patch=0&easy=1&col=id&col=summary&col=status&col=owner&col=type&col=milestone&order=priority
  433. __ https://code.djangoproject.com/query?status=new&status=reopened&needs_better_patch=1&easy=1&col=id&col=summary&col=status&col=owner&col=type&col=milestone&order=priority
  434. __ https://code.djangoproject.com/query?status=new&status=reopened&needs_tests=1&easy=1&col=id&col=summary&col=status&col=owner&col=type&col=milestone&order=priority
  435. What's next after creating a pull request?
  436. ------------------------------------------
  437. After a ticket has a patch, it needs to be reviewed by a second set of eyes.
  438. After submitting a pull request, update the ticket metadata by setting the
  439. flags on the ticket to say "has patch", "doesn't need tests", etc, so others
  440. can find it for review. Contributing doesn't necessarily always mean writing a
  441. patch from scratch. Reviewing existing patches is also a very helpful
  442. contribution. See :doc:`/internals/contributing/triaging-tickets` for details.