widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands-website/fix-installation into lp:widelands-website.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/fix-installation/+merge/286797

This will partially fix the installation.

I can't run the setup, because some of the imported modules don't match the Django version in the requirements file. Since my ssl login is also broken and I can't have a peek at the actual website, I couldn't find out which Django version I actually need.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/fix-installation into lp:widelands-website.

=== modified file 'README.txt'
--- README.txt	2015-09-20 12:24:47 +0000
+++ README.txt	2016-02-22 13:15:59 +0000
@@ -11,7 +11,7 @@
 Example:
 On Ubuntu, installing all required tools and dependencies in two commands::
 
-   $ sudo apt-get install python-dev python-virtualenv python-pip mercurial bzr subversion git-core sqlite3
+   $ sudo apt-get install python-dev python-virtualenv python-pip mercurial bzr subversion git-core sqlite3 libmysqlclient-dev
    $ sudo apt-get build-dep python-numpy
 
 Setting up the local environment
@@ -23,7 +23,7 @@
 
 This will make sure that your virtual environment is not tainted with python
 packages from your global site packages. Very important!
-Now, we create and activate our environment:: 
+Now, we create and activate our environment::
 
    $ virtualenv --no-site-packages wlwebsite
    $ cd wlwebsite
@@ -42,12 +42,12 @@
 Installation of the third party libraries should be easy, given you have
 development tools installed and in your path. The two difficult packages are
 PIL and numpy; you can also try to migrate them over from your global site dir
-or add your global site dir to your PYTHONPATH. 
+or add your global site dir to your PYTHONPATH.
 Installation via pip should work like this::
 
    $ pip install -r pip_requirements.txt
 
-This will take a while. If no errors are shown we should be fine. 
+This will take a while. If no errors are shown we should be fine.
 
 Setting up the website
 ----------------------
@@ -62,14 +62,14 @@
 
    $ ln -s local_urls.py.sample local_urls.py
    $ ln -s local_settings.py.sample local_settings.py
-   
+
 There has to be some corrections to get into the admin pages:
 
 Either copy the folders "media" and "templates"
 
    from: ~/wlwebsite/django/contrib/admin
    to:   ~/wlwebsite/lib/python2.7/site-packages/django/contrib/admin/
-   
+
 or create symlinks:
 
    $ ln -s ~/wlwebsite/django/contrib/admin/templates/ ~/wlwebsite/lib/python2.7/site-packages/django/contrib/admin/templates
@@ -93,7 +93,7 @@
    $ ./manage.py runserver
 
 Open your browser to http://localhost:8000. You should see something that
-resembles the widelands homepage quite closely. All content is missing though. 
+resembles the widelands homepage quite closely. All content is missing though.
 
 Some important settings
 ^^^^^^^^^^^^^^^^^^^^^^^
@@ -114,7 +114,7 @@
    $ ./manage.py runserver 169.254.1.0:8000
 
 See also http://docs.djangoproject.com/en/dev/ref/django-admin/#runserver-port-or-address-port
-for further details. 
+for further details.
 
 Setting up the online help / encyclopedia
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

=== modified file 'pip_requirements.txt'
--- pip_requirements.txt	2015-07-04 07:35:29 +0000
+++ pip_requirements.txt	2016-02-22 13:15:59 +0000
@@ -8,7 +8,7 @@
 -e hg+https://django-tracking.googlecode.com/hg/#egg=tracking
 Markdown==2.6.2
 BeautifulSoup==3.2
--e hg+http://bitbucket.org/ubernostrum/django-registration/@1086c6a#egg=registration
+-e git://github.com/ubernostrum/django-registration/#egg=registration
 -e svn+http://django-tagging.googlecode.com/svn/trunk/#egg=tagging
 -e git://github.com/dcramer/django-ratings.git#egg=djangoratings
 django-threadedcomments==0.5.2