summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJP <jpellerin@gmail.com>2012-01-04 06:05:25 -0800
committerJP <jpellerin@gmail.com>2012-01-04 06:05:25 -0800
commit45bd7d506efaecfb06761b836f6b90b8d6b7f5e1 (patch)
tree674dcb42aa965834491ccda13d1314aad05f5325
parent214cacd6321a9396c0722304887cfb7620e09863 (diff)
parent330dcbb9965577f2381ebfdaa27639fad3109814 (diff)
downloadnose-45bd7d506efaecfb06761b836f6b90b8d6b7f5e1.tar.gz
Merge pull request #486 from johnburnett/master
Updating docs to point to git/GitHub rather than hg/BitBucket.
-rw-r--r--doc/contributing.rst26
-rw-r--r--doc/developing.rst17
2 files changed, 15 insertions, 28 deletions
diff --git a/doc/contributing.rst b/doc/contributing.rst
index 1a74ca8..ac96fcb 100644
--- a/doc/contributing.rst
+++ b/doc/contributing.rst
@@ -2,26 +2,19 @@ Contributing to nose
====================
You'd like to contribute to nose? Great! Now that nose is hosted under
-`Mercurial <http://selenic.com/mercurial/>`__, contributing is even easier.
+`GitHub <http://github.com/>`__, contributing is even easier.
Get the code!
-------------
-Start by getting a local working copy of nose, either stable, from google code::
+Start by getting a local working copy of nose from github::
- hg clone http://python-nose.googlecode.com/hg/ nose-stable
-
-or unstable, from bitbucket::
-
- hg clone http://bitbucket.org/jpellerin/nose/ nose-unstable
+ git clone https://github.com/nose-devs/nose
If you plan to submit changes back to the core repository, you should set up a
-public repository of your own somewhere. `Bitbucket <http://bitbucket.org>`__
-is a good place to do that. Once you've set up your bitbucket nose repository,
-if working from **stable**, pull from your working copy of nose-stable, and push
-to bitbucket. That (with occasional merging) will be your normal practice for
-keeping your repository up to date. If you're on bitbucket and working from
-**unstable**, just **fork** http://bitbucket.org/jpellerin/nose/.
+public fork of your own somewhere (`GitHub <http://github.com/>`__ is a good
+place to do that). See GitHub's `help <http://help.github.com/>`__ for details
+on how to contribute to a Git hosted project like nose.
Running nose's tests
--------------------
@@ -42,11 +35,10 @@ low-traffic and mostly signal.
What to work on?
----------------
-You can find a list of open issues at nose's `google code repository
-<http://code.google.com/p/python-nose/issues>`__. If you'd like to
+You can find a list of open issues at nose's `issue tracker
+<http://github.com/nose-devs/nose/issues>`__. If you'd like to
work on an issue, leave a comment on the issue detailing how you plan
-to fix it, and where to find the Mercurial repository where you will
-publish your changes.
+to fix it, or simply submit a pull request.
I have a great idea for a plugin...
-----------------------------------
diff --git a/doc/developing.rst b/doc/developing.rst
index 3302ddf..32c5680 100644
--- a/doc/developing.rst
+++ b/doc/developing.rst
@@ -4,19 +4,14 @@ Developing with nose
Get the code
------------
-The stable branch of nose is hosted at `google code
-<http://code.google.com/p/python-nose/>`__. You should clone this
-branch if you're developing a plugin or working on bug fixes for nose::
+nose is hosted at `GitHub
+<http://github.com/nose-devs/nose/>`__. You should clone this
+repository if you're developing a plugin or working on bug fixes for nose::
- hg clone http://python-nose.googlecode.com/hg/ nose-stable
+ git clone https://github.com/nose-devs/nose
-The **unstable** branch of nose is hosted at `bitbucket
-<http://bitbucket.org/jpellerin/nose/>`__. You should **fork** this branch if
-you are developing new features for nose. Then clone your fork, and submit
-your changes as a pull request. If you just want to use unstable, you can
-clone the branch::
-
- hg clone http://bitbucket.org/jpellerin/nose/ nose-unstable
+You should **fork** this repository if you are developing new features for
+nose. Then submit your changes as a pull request.
Read