Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Authors
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was an AUTHORS.rst before, but I decided to take it out. We can link to this page instead:

https://github.com/kennethreitz/python-guide/contributors

-------

* `Kenneth Reitz <http://kennethreitz.com/>`_ (follow on `Twitter <http://twitter.com/#!/kennethreitz>`_ & `GitHub <https://github.com/kennethreitz>`_)
* `Aaron Weinberger <http://clipper.ship.edu/~aw9994/>`_ (follow on `GitHub <https://github.com/aaronw>`_)
* `Kamil Kisiel <http://www.kamilkisiel.net/>`_ (follow on `Twitter <https://twitter.com/#!/kisielk>`_ & `GitHub <https://github.com/kisielk>`_)
* `Seyi Ogunyemi <http://www.micrypt.com/>`_ (follow on `Twitter <https://twitter.com/#!/micrypt>`_ & `GitHub <https://github.com/micrypt>`_)
* `Alex Gaynor <http://alexgaynor.net>`_ (follow on `Twitter <http://twitter.com/#!/alex_gaynor>`_ & `Github <https://github.com/alex>`_)
* `nstielau <http://dev.nuclearrooster.com/>`_ (follow on `GitHub <https://github.com/nstielau>`_)
* `Adam Brenecki <http://adam.brenecki.id.au/>`_ (follow on `Twitter <https://twitter.com/#!/adambrenecki>`_ & `GitHub <https://github.com/adambrenecki>`_)
* `Nanda Kishore <http://google.com/profiles/madhav>`_ (follow on `GitHub <https://github.com/madhav>`_)
* `Donald Stufft <http://dstufft.com/>`_ (follow on `Twitter <https://twitter.com/#!/dstufft>`_ and `GitHub <https://github.com/dstufft>`_)
* `Brent O'Connor <http://www.epicserve.com/>`_ (follow on `Twitter <http://twitter.com/#!/epicserve>`_ & `GitHub <https://github.com/epicserve>`_)
* `Dalton Barreto <http://daltonmatos.com/>`_ (follow on `Twitter <https://twitter.com/#!/daltonmatos>`_ & `GitHub <https://github.com/daltonmatos>`_)
* `Daniel Schauenberg <http://unwiredcouch.com/>`_ (follow on `Twitter <http://twitter.com/#!/mrtazz>`_ & `GitHub <https://github.com/mrtazz>`_)
* `Mike Thornton <http://devdetails.com/>`_ (follow on `GitHub <https://github.com/six8>`_)
3 changes: 1 addition & 2 deletions docs/intro/duction.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
Introduction
============

Someone should write a general blurb introducing the Python language here.

.. todo:: write a general blurb introducing the Python language

About This Guide
----------------
Expand Down
8 changes: 2 additions & 6 deletions docs/intro/learning.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,9 @@ Advanced
Pro Python
~~~~~~~~~~

TODO: Write about this book

`Pro Python <http://propython.com/>`_
.. todo:: Write about `Pro Python <http://propython.com/>`_

Expert Python Programming
~~~~~~~~~~~~~~~~~~~~~~~~~

TODO: Write about this book

`Expert Python Programming <http://www.packtpub.com/expert-python-programming/book>`_
.. todo:: Write about `Expert Python Programming <http://www.packtpub.com/expert-python-programming/book>`_
3 changes: 2 additions & 1 deletion docs/notes/contribute.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ If you'd like to contribute, there's plenty to do. Here's a short todo_ list.


.. _GitHub: http://github.com/kennethreitz/python-guide/
.. _AUTHORS: http://github.com/kennethreitz/python-guide/blob/master/AUTHORS
.. _AUTHORS: http://github.com/kennethreitz/python-guide/blob/master/AUTHORS.rst
.. _todo: https://github.com/kennethreitz/python-guide/blob/master/TODO.rst

.. include:: ../../AUTHORS.rst
2 changes: 1 addition & 1 deletion docs/notes/license.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
License
-------

TBD.
.. todo:: Determine License
12 changes: 11 additions & 1 deletion docs/scenarios/admin.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,24 @@ Systems Administration
Fabric
------

.. todo:: Write about Fabric

Chef
----

.. todo:: Write about Chef

Puppet
------

.. todo:: Write about Puppet

Blueprint
---------
---------

.. todo:: Write about Blueprint

Buildout
--------

.. todo:: Write about Buildout
15 changes: 10 additions & 5 deletions docs/scenarios/ci.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,28 @@ Continuous Integration
Why?
----

Martin Fowler, who first wrote about Continuous Integration (short: CI) together with Kent Beck, describes the CI as follows:
Martin Fowler, who first wrote about `Continuous Integration <http://martinfowler.com/articles/continuousIntegration.html>`_ (short: CI) together with Kent Beck, describes the CI as follows:

Continuous Integration is a software development practice where members of a team integrate their work frequently, usually each person integrates at least daily - leading to multiple integrations per day. Each integration is verified by an automated build (including test) to detect integration errors as quickly as possible. Many teams find that this approach leads to significantly reduced integration problems and allows a team to develop cohesive software more rapidly. This article is a quick overview of Continuous Integration summarizing the technique and its current usage.

Source: http://martinfowler.com/articles/continuousIntegration.html

Jenkins
-------

Jenkins CI (http://jenkins-ci.org) is an extensible continuous integration engine. Use it.
`Jenkins CI <http://jenkins-ci.org>`_ is an extensible continuous integration engine. Use it.



Buildbot
--------
Buildbot (http://buildbot.net/buildbot/docs/current) is a Python system to automate the compile/test cycle to validate code changes.
`Buildbot <http://buildbot.net/buildbot/docs/current>`_ is a Python system to automate the compile/test cycle to validate code changes.


Mule?
-----

.. todo:: Write about Mule

Tox
---

.. todo:: Write about `Tox <http://codespeak.net/~hpk/tox/>`_
3 changes: 2 additions & 1 deletion docs/scenarios/cli.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
Command Line Applications
=========================


.. todo:: Explain "Command Line Applications"

Clint
-----

.. todo:: Write about Clint
4 changes: 4 additions & 0 deletions docs/scenarios/db.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,7 @@ database-agnostic code without SQL.

pip install sqlalchemy

Django ORM
----------

.. todo:: Explain Django ORM
7 changes: 4 additions & 3 deletions docs/scenarios/gui.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@ http://developer.qt.nokia.com/wiki/PySideDownloads/

PyQt
----
*Note: If your software does not fully comply with the GPL you will need a commercial license!*
.. note:: If your software does not fully comply with the GPL you will need a commercial license!

http://www.riverbankcomputing.co.uk/software/pyqt/download

Cocoa
:::::
*Note: The Cocoa framework is only available on Mac OSX. Don't pick this if you're writing a cross-platform application!*
.. note:: The Cocoa framework is only available on Mac OSX. Don't pick this if you're writing a cross-platform application!

PyObjC
------
*Note: Only available on Mac OSX. Don't pick this if you're writing a cross-platform application.*
.. note:: Only available on Mac OSX. Don't pick this if you're writing a cross-platform application.

WXPython
::::::::
Expand Down
1 change: 1 addition & 0 deletions docs/scenarios/speed.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Speed

CPython, the most commonly used implementation of Python, is slow for CPU bound tasks. `PyPy`_ is fast.

.. todo:: Fill in stub for Speed comparisons

Context
:::::::
Expand Down
6 changes: 6 additions & 0 deletions docs/scenarios/web.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,13 @@ already exist to suit your needs.
Pyramid
-------

.. todo:: Explian Pyramid

Servers
:::::::

.. todo:: Explain Apache deployment

Apache + mod_wsgi
-----------------

Expand Down Expand Up @@ -107,6 +110,7 @@ setup for Nginx + gUnicorn can be found in the gUnicorn
Mongrel2 + Brubeck
------------------

.. todo:: Explain Mongrel2 + Brubeck

Mongrel2 + wsgid
----------------
Expand Down Expand Up @@ -209,6 +213,8 @@ Gondor publishes guides to deploying `Django projects
Shared Web Hosting
------------------

.. todo:: Fill in "Shared Web Hosting" stub

WebFaction
~~~~~~~~~~~

Expand Down
3 changes: 3 additions & 0 deletions docs/shipping/freezing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ Many applications you use every day do this:
- BitTorrent
-


.. todo:: Fill in "Freezing Your Code" stub

Windows
:::::::

Expand Down
6 changes: 5 additions & 1 deletion docs/shipping/packaging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Packaging Your Code

Packaging your code is important.

.. todo:: Write introduction for "Packaging Your Code"

For Python Developers
:::::::::::::::::::::
Expand All @@ -14,7 +15,7 @@ If you're writing an open source Python module, `PyPI <http://pypi.python.org>`_
Pip vs. easy_install
--------------------

Use pip. More details `here <http://stackoverflow.com/questions/3220404/why-use-pip-over-easy-install>`_
Use `pip <http://pypi.python.org/pypi/pip>`_. More details `here <http://stackoverflow.com/questions/3220404/why-use-pip-over-easy-install>`_


Personal PyPI
Expand Down Expand Up @@ -54,10 +55,13 @@ $ pip install http://127.0.0.1:9000/MyPackage.tar.gz
Chishop
+++++++

`Chishop <https://github.com/benliles/djangopypi>`_ is a simple PyPI server written in django which allows you to register/upload with distutils and install with easy_install/pip.

For Linux Distributions
::::::::::::::::::::::::

.. todo:: Fill in "For Linux Distributions" packaging stub

Useful Tools
------------

Expand Down
32 changes: 26 additions & 6 deletions docs/starting/dev-env.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,27 @@ the following lines into your vimrc::

.. todo:: add supertab notes

TextMate
--------

"`TextMate <http://macromates.com/>`_ brings Apple's approach to operating systems into the world of text editors. By bridging UNIX underpinnings and GUI, TextMate cherry-picks the best of both worlds to the benefit of expert scripters and novice users alike."

Sublime Text
------------

"`Sublime Text <http://www.sublimetext.com/>`_ is a sophisticated text editor for code, html and prose. You'll love the slick user interface and extraordinary features."

Sublime Text uses Python for its plugin API.

`Sublime Text 2 <http://www.sublimetext.com/blog/articles/sublime-text-2-beta>`_ is currently in beta.

IDEs
::::

PyCharm / IntelliJ IDEA
-----------------------

PyCharm is developed by JetBrains, also known for IntelliJ IDEA. Both share the same code base and most of PyCharm's features can be brought to IntelliJ with the free `Python Plug-In <http://plugins.intellij.net/plugin/?id=631/>`_..
`PyCharm <http://www.jetbrains.com/pycharm/>`_ is developed by JetBrains, also known for IntelliJ IDEA. Both share the same code base and most of PyCharm's features can be brought to IntelliJ with the free `Python Plug-In <http://plugins.intellij.net/plugin/?id=631/>`_.

Eclipse
-------
Expand All @@ -82,8 +95,7 @@ Spyder
Includes integration with `pyflakes <http://pypi.python.org/pypi/pyflakes>`_, `pylint <http://www.logilab.org/857>`_,
and `rope <http://rope.sourceforge.net/>`_.

Spyder is open-source (free), offers code completion, syntax highlighting, class and function browser, and object
inspection
Spyder is open-source (free), offers code completion, syntax highlighting, class and function browser, and object inspection.



Expand All @@ -100,7 +112,7 @@ It solves the "Project X depends on version 1.x but, Project Y needs 4.x" dilemm
virtualenvwrapper
-----------------

Virtualenvwrapper makes virtualenv a pleasure to use by wrapping the command line API with a nicer CLI.
`Virtualenvwrapper <http://pypi.python.org/pypi/virtualenvwrapper>`_ makes virtualenv a pleasure to use by wrapping the command line API with a nicer CLI.

::

Expand All @@ -121,9 +133,17 @@ Other Tools
IPython
-------

`IPython <http://ipython.org/>`_ provides a rich toolkit to help you make the most out of using Python interactively. Its main components are:

* Powerful Python shells (terminal- and Qt-based).
* A web-based notebook with the same core features but support for rich media, text, code, mathematical expressions and inline plots.
* Support for interactive data visualization and use of GUI toolkits.
* Flexible, embeddable interpreters to load into your own projects.
* Tools for high level and interactive parallel computing.

::

$ pip install ipython
pip install ipython
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$ should be there.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I wasn't sure. Some examples had them, some didn't. I prefer not to have them because it makes it easier to copy and paste commands without it, however taking the stance of using $ for prompt and >>> for python shell will make it more clear what the code is for. I'll start a styleguide for contributing to the docs so there is more consistency from the contributors.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would be great!

  • $ for prompt.
  • >>> for code that is being actively interpreted (in a repl)
  • just code for python code examples




Expand All @@ -132,6 +152,6 @@ BPython

::

$ pip install bpython
pip install bpython


2 changes: 1 addition & 1 deletion docs/writing/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Choosing a License
Open source.



.. todo:: Fill in License stub


Non-Restrictive
Expand Down
1 change: 1 addition & 0 deletions docs/writing/structure.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Structuring Your Project

Structuring your project properly is extremely important.

.. todo:: Fill in "Structuring Your Project" stub

Structure is Key
----------------
Expand Down