Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website
This is merged and deployed. Now we can definitely work on porting to python3 :) I had to change the init-file to let gunicorn find the moved file wlwebsite_wsgi.py -- https://code.launchpad.net/~widelands-dev/widelands-website/mv_main_files/+merge/365634 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/mv_main_files/+merge/365634 -- Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website
Thanks, all fixed, also the smiley thing(s). I'll do the merge eventually this evening. -- https://code.launchpad.net/~widelands-dev/widelands-website/mv_main_files/+merge/365634 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website
Review: Approve Tested and working :) Just 1 small nit for the English language. Diff comments: > === modified file 'README.txt' > --- README.txt2018-12-30 11:45:03 + > +++ README.txt2019-04-07 10:02:44 + > @@ -125,60 +126,63 @@ > See also > https://docs.djangoproject.com/en/dev/ref/django-admin/#examples-of-using-different-ports-and-addresses > for further details. > > + > Dependencies between website and widelands source code > == > > -Some parts of the website need access to the source code of widelands: > - > -* Online help/Encyclopedia > -* Possibility to upload a map onto the local website > -* Source code documentation > - > -You will need the widelands source code for this, see > +Some parts of the website need access to the source code of widelands, other > +parts need some widelands executables. > + > +Source code only > + > + > +The documentation is made out of the source code. To get a copy, see: > > https://wl.widelands.org/wiki/BzrPrimer/ > > After the source code is downloaded, adjust the path of > > -WIDELANDS_SVN_DIR > - > -in local_settings.py to the path where the widelands source code is found. > - > -Setting up the online help / encyclopedia > -- > - > -You will need graphviz to generate the graphs for the online help. On Ubuntu > run: > +WIDELANDS_SVN_DIR = '/path/to/widelands/trunk' > + > +in mainpage/local_settings.py to the path where the widelands source code > can be > +found. Then run: > + > + $ ./manage.py create_docs > + > +After finishing without errors, type localhost:8000/documentation/index.html > +in your browsers addressbar or click on "Development -> Documentation". > + > +Widelands executables > +- > + > +Widelands executables are needed to: > + > +* Upload maps to the website > +* Create the Encylopdia > + > +Either install widelands as a program to your operating system, or create > the > +binarys by compiling the source code. If you want to compile, run: binarys -> binaries > + > + $ ./compile.sh -r > + > +inside of the WIDELANDS_SVN_DIR to create a release build. > + > +Uploading maps should work now. > + > +Creating the encyclopdia needs graphviz to generate the graphs. On Ubuntu > run: > > $ sudo apt-get install graphviz > > -To generate the online help database switch to your local environment and > run: > +To generate the online help switch to your local environment and run: > > $ ./manage.py update_help > > -After that you can create the overview pdf files with > +Now you can create the economy graphs: > > $ ./manage.py update_help_pdf > > -Setting up widelands source code documentation > --- > - > -There is a small helper script to get the documenation. Be sure > -you have set WIDELANDS_SVN_DIR set in local_settings.py. Run: > - > - $ ./manage.py create_docs > - > -After finishing without errors, type localhost:8000/documentation/index.html > -in your browsers addressbar or click on "Development -> Documentation". > - > - > -Uploading a map to the local website > - > - > -Compile the widelands binaries by using the compile.sh script > - > - $ ./compile.sh > - > -Now you should be able to upload a map onto your local website. > +You can access the encyclopdia by clicking on 'The Game -> Encyclopedia' now. > + > > Contact > === -- https://code.launchpad.net/~widelands-dev/widelands-website/mv_main_files/+merge/365634 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website
Looks like it works fine on alpha. -- https://code.launchpad.net/~widelands-dev/widelands-website/mv_main_files/+merge/365634 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website. Commit message: Moved main files into folder mainpage Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1762164 in Widelands Website: "Update website code to use python 3.x" https://bugs.launchpad.net/widelands-website/+bug/1762164 For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/mv_main_files/+merge/365634 Python3 is more restrictive with relative imports. Moving the mainfiles into the directory 'mainpage' is made to perform this. In python terms: The folder widelands (containing manage.py) will no longer be a 'package'. Running manage.py will call anything inside the package 'mainpage' and thus relative imports will work again. This reflects also the initial structure of a django project, like shown here: https://docs.djangoproject.com/en/2.2/intro/reusable-apps/#your-project-and-your-reusable-app Running the 2to3 script (for porting python2 to python3 code) produces less faulty code in regard to imports after this change. I have also moved the privacy template to his origin (privacy_policy). Should be tested on alpha. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website. === modified file 'README.txt' --- README.txt 2018-12-30 11:45:03 + +++ README.txt 2019-04-07 09:29:16 + @@ -57,6 +57,7 @@ This will take a while. If no errors are shown we should be fine. + Setting up the website == @@ -68,8 +69,8 @@ those files and modify them to your needs - most likely everything works directly, but you might want to edit the bd variable in local_settings.py:: - $ ln -s local_urls.py.sample local_urls.py - $ ln -s local_settings.py.sample local_settings.py + $ ln -s local_urls.py.sample mainpage/local_urls.py + $ ln -s local_settings.py.sample mainpage/local_settings.py Setting up the database --- @@ -125,60 +126,63 @@ See also https://docs.djangoproject.com/en/dev/ref/django-admin/#examples-of-using-different-ports-and-addresses for further details. + Dependencies between website and widelands source code == -Some parts of the website need access to the source code of widelands: - -* Online help/Encyclopedia -* Possibility to upload a map onto the local website -* Source code documentation - -You will need the widelands source code for this, see +Some parts of the website need access to the source code of widelands, other +parts need some widelands executables. + +Source code only + + +The documentation is made out of the source code. To get a copy, see: https://wl.widelands.org/wiki/BzrPrimer/ After the source code is downloaded, adjust the path of -WIDELANDS_SVN_DIR - -in local_settings.py to the path where the widelands source code is found. - -Setting up the online help / encyclopedia -- - -You will need graphviz to generate the graphs for the online help. On Ubuntu run: +WIDELANDS_SVN_DIR = '/path/to/widelands/trunk' + +in mainpage/local_settings.py to the path where the widelands source code can be +found. Then run: + + $ ./manage.py create_docs + +After finishing without errors, type localhost:8000/documentation/index.html +in your browsers addressbar or click on "Development -> Documentation". + +Widelands executables +- + +Widelands executables are needed to: + +* Upload maps to the website +* Create the Encylopdia + +Either install widelands as a program to your operating system, or create the +binarys by compiling the source code. If you want to compile, run: + + $ ./compile.sh -r + +inside of the WIDELANDS_SVN_DIR to create a release build. + +Uploading maps should work now. + +Creating the encyclopdia needs graphviz to generate the graphs. On Ubuntu run: $ sudo apt-get install graphviz -To generate the online help database switch to your local environment and run: +To generate the online help switch to your local environment and run: $ ./manage.py update_help -After that you can create the overview pdf files with +Now you can create the economy graphs: $ ./manage.py update_help_pdf -Setting up widelands source code documentation --- - -There is a small helper script to get the documenation. Be sure -you have set WIDELANDS_SVN_DIR set in local_settings.py. Run: - - $ ./manage.py create_docs - -After finishing without errors, type localhost:8000/documentation/index.html -in your browsers addressbar or click on "Development -> Documentation". - - -Uploading a map to the local website - - -Compile the widelands binaries by using the compile.sh script -
