提交 43f6562f authored 作者: James Bergstra's avatar James Bergstra

updating to remove assembla and hg references

上级 9c8cf380
...@@ -40,7 +40,7 @@ setup.py install``. ...@@ -40,7 +40,7 @@ setup.py install``.
Those interested in bleeding-edge features should obtain the latest development Those interested in bleeding-edge features should obtain the latest development
version, available via:: version, available via::
hg clone http://hg.assembla.com/theano Theano git clone git://github.com/Theano/Theano.git
You can then place the checkout directory on your ``$PYTHONPATH`` or use You can then place the checkout directory on your ``$PYTHONPATH`` or use
``python setup.py develop`` to install a ``.pth`` into your ``site-packages`` ``python setup.py develop`` to install a ``.pth`` into your ``site-packages``
......
...@@ -150,6 +150,8 @@ If you are a developer of Theano, then check out the :ref:`dev_start_guide`. ...@@ -150,6 +150,8 @@ If you are a developer of Theano, then check out the :ref:`dev_start_guide`.
If you want the bleeding-edge without developing the code you can use If you want the bleeding-edge without developing the code you can use
pip for this pip for this
GIT_TODO: update these pip install instructions to use github.
.. code-block:: bash .. code-block:: bash
pip install --upgrade hg+http://hg.assembla.com/theano pip install --upgrade hg+http://hg.assembla.com/theano
...@@ -166,7 +168,7 @@ get the code using `Mercurial <http://mercurial.selenic.com/>`__: ...@@ -166,7 +168,7 @@ get the code using `Mercurial <http://mercurial.selenic.com/>`__:
.. code-block:: bash .. code-block:: bash
hg clone http://hg.assembla.com/theano Theano git clone git://github.com/Theano/Theano.git
From here, the easiest way to get started is From here, the easiest way to get started is
...@@ -547,7 +549,7 @@ used within a MinGW Shell (not available if you only installed Python(x,y)). ...@@ -547,7 +549,7 @@ used within a MinGW Shell (not available if you only installed Python(x,y)).
.. code-block:: bash .. code-block:: bash
hg clone http://hg.assembla.com/theano Theano git clone git://github.com/Theano/Theano.git
- Add (or edit) the ``PYTHONPATH`` environment variable (into Control - Add (or edit) the ``PYTHONPATH`` environment variable (into Control
Panel / System / Advanced / Environment Variables), so that it contains Panel / System / Advanced / Environment Variables), so that it contains
......
...@@ -22,33 +22,14 @@ To get up to speed, you'll need to ...@@ -22,33 +22,14 @@ To get up to speed, you'll need to
Accounts Accounts
-------- --------
To obtain developer access: register with `Assembla To obtain developer access: register with `GitHub
<http://www.assembla.com/>`_ and add yourself as a watcher on the `Theano <http://www.github.com/>`_ and create a fork of `Theano
space <http://www.assembla.com/spaces/theano>`_. Then send an email to an <http://www.github.com/Theano/Theano>`_. Hack in your patches / features to your own fork,
admin asking to be promoted to a member of the project. and send a pull request.
(Just the standard github workflow.)
If you don't get any feedback, bug us on the theano-dev mailing list.
Theano code
----------- For info on how to run your personal fork of Theano, see :ref:`install_bleeding_edge`.
*To get the source via Mercurial,* you must have `Mercurial
<http://mercurial.selenic.com/>`__ installed.
The code that makes up Theano is in a `single repository
<http://www.assembla.com/spaces/theano/trac_mercurial_tool>`__. As a developer,
you should clone this repository like this:
.. code-block:: bash
hg clone 'http://username:password@hg.assembla.com/theano' Theano
You can also clone the code anonymously:
.. code-block:: bash
hg clone http://hg.assembla.com/theano Theano
Then follow the :ref:`install_bleeding_edge`.
Details about ``PYTHONPATH`` Details about ``PYTHONPATH``
---------------------------- ----------------------------
......
...@@ -4,93 +4,4 @@ ...@@ -4,93 +4,4 @@
hg in a Nutshell hg in a Nutshell
================ ================
Hg is the chemical symbol for mercury. Deleted. We're not using hg anymore, we switched to git.
hg is the unix command that runs `Mercurial` the revision control system.
As a user of Theano, the commands you need to know are:
``hg clone 'https://hg.assembla.com/theano'``
Download the freshest version of the code from the remote repository.
``hg pull -u``
Update your files to the freshest versions from the remote repository.
As a developer of Theano, you may want to change the local code, and merge them
with the central version. This requires a bit more understanding of what's
going on. Working with hg means you have three logically seperate kinds of images of the
codebase: local files, local database, remote database(s).
Typically, your sequence of hg commands should look like this:
1. ``hg pull -u [remote address]``
(Copy from remote db -> local db -> local files)
#. ``<change local files>``
This will create differences between the local files and the local db.
Prefer using ``hg rm`` and ``hg mv`` to their unix counterparts.
#. ``hg st``
(Print out differences between local files and local db)
#. ``hg commit -m 'message about what you did' <files to which message applies>``
(Update the local db to match the files listed.)
#. ``hg pull -u``
(Download the remote db to the local db, and ``-u`` updates files too.)
#. ``[hg merge]``
(Downloading the remote db may have created a fork in the
local db. This command will try to merge any such fork, and it might bring up
an editor to merge some stuff manually. This step affects the local files, but
not the local db.)
#. ``[hg commit -m 'merge']``
(If you changed your files during the merge
operation, then you have to commit those changes, as usual.)
#. ``hg push [remote address]``
(Update the remote db to match the local db)
Note that *branching* in mercurial is as easy as ``cp <repo> <new name>`` in a
unix shell. If you want to make ``<repo>`` the default push location of your
new branch that do ``hg clone <repo> <new name>`` instead.
Failure to do these commands in the proper order can get you into a tricky
state, where you can't push because it would create a branch, and you can't pull
or update because it says it's done, and you can't commit because it says
nothing to commit, and you can't merge, and oh the pain.... so be careful!
If this happens to you, consider just re-cloning the repo and merging in your
old changes by hand.
For more info, check out the `homepage <http://www.selenic.com/mercurial/wiki/>`_ and `hg book <http://hgbook.red-bean.com/hgbook.html>`_.
Tip: Commit before pull
------------------------
"This is the general rule of thumb when using Mercurial: finish your work
and commit it before you start pulling in stuff from the outside world."
-Martin Geisler
(http://www.selenic.com/pipermail/mercurial/2008-April/018817.html)
Tip: Graph logs
---------------
Update your .hgrc::
[ui]
username = Foo Bar <barfoo@iro.umontreal.ca>
[extensions]
hgext.graphlog =
Now try::
hg glog
Troubleshooting
---------------
If you get message: "abort: push
creates new remote heads!", read `this thread
<http://www.selenic.com/pipermail/mercurial/2008-April/018804.html>`_
to understand.
...@@ -18,7 +18,7 @@ Get a fresh copy of the repository ...@@ -18,7 +18,7 @@ Get a fresh copy of the repository
Clone the code:: Clone the code::
hg clone http://hg.assembla.com/theano Theano-0.X git clone git://github.com/Theano/Theano.git
It does not have to be in your PYTHONPATH. It does not have to be in your PYTHONPATH.
......
...@@ -14,8 +14,6 @@ Wishlist: ...@@ -14,8 +14,6 @@ Wishlist:
- mailing list - mailing list
- reliability of hosting service - reliability of hosting service
Currently, [http://sharesource.org/ sharesource] and [http://www.assembla.com/ assembla] are the only hosting services that support mercurial that I know of. Sharesource is young, but supports all the required features. I'll make an account, and see what I can do with it...
Should we get a domain name? To my dismay, theano.org, theano.com and theano.net are all taken. The first two seem legit, but theano.net doesn't look like it has anything on it and expires on May 29, so maybe there's a chance we can snag it? -ob Should we get a domain name? To my dismay, theano.org, theano.com and theano.net are all taken. The first two seem legit, but theano.net doesn't look like it has anything on it and expires on May 29, so maybe there's a chance we can snag it? -ob
We could also get [http://www.theano.io]. -jpt We could also get [http://www.theano.io]. -jpt
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论