Thanks Dave. --Aqeel
On Mon, Mar 14, 2016 at 3:28 PM, Dave Page <dp...@pgadmin.org> wrote: > Thanks - committed with some minor tweaks: > > - Avoid packaging *.pyc and pgadmin4.db > - Add some more keywords > - Minor re-arrangement of setup_pip.py and the Makefile. > > Thanks again! > > On Mon, Mar 14, 2016 at 6:33 AM, Muhammad Aqeel > <muhammad.aq...@enterprisedb.com> wrote: > > Sorry for broken patch. > > PFA the corrected patch. > > > > --Aqeel > > > > On Fri, Mar 11, 2016 at 5:51 PM, Dave Page <dp...@pgadmin.org> wrote: > >> > >> EBROKENPATCH > >> > >> (pgadmin4)piranha:pgAdmin4 dpage$ git apply > >> ~/Downloads/pgadmin4_pip_framework_v5.patch > >> /Users/dpage/Downloads/pgadmin4_pip_framework_v5.patch:41: trailing > >> whitespace. > >> python pkg/pip/setup_pip.py bdist_wheel > >> /Users/dpage/Downloads/pgadmin4_pip_framework_v5.patch:45: trailing > >> whitespace. > >> all: install-pip-requirements pip > >> /Users/dpage/Downloads/pgadmin4_pip_framework_v5.patch:47: trailing > >> whitespace. > >> install-pip-requirements: > >> /Users/dpage/Downloads/pgadmin4_pip_framework_v5.patch:59: trailing > >> whitespace. > >> pip: > >> /Users/dpage/Downloads/pgadmin4_pip_framework_v5.patch:73: trailing > >> whitespace. > >> fi > >> error: Makefile: No such file or directory > >> error: pkg/pip/setup_pip.py: No such file or directory > >> > >> On Fri, Mar 11, 2016 at 11:19 AM, Muhammad Aqeel > >> <muhammad.aq...@enterprisedb.com> wrote: > >> > PFA the updated patch. > >> > > >> > On Wed, Mar 9, 2016 at 10:25 PM, Dave Page <dp...@pgadmin.org> wrote: > >> >> > >> >> Hi > >> >> > >> >> On Wed, Mar 9, 2016 at 2:24 PM, Muhammad Aqeel > >> >> <muhammad.aq...@enterprisedb.com> wrote: > >> >> > Hi, > >> >> > > >> >> > PFA the patch to build PIP package for pgAdmin4 web component. It > >> >> > builds > >> >> > PIP > >> >> > wheel file based on Python version in PATH. > >> >> > > >> >> > This pip package build setup is supported for python version 2.6 > and > >> >> > above. > >> >> > The pip package can easily be built with a make statement. > >> >> > > >> >> > Makefile has following targets. > >> >> > - install-required: To install packages required to build PIP > >> >> > package. > >> >> > - all: To build PIP package > >> >> > - install-pip: To install built PIP package > >> >> > - clean: To clean the sources. > >> >> > >> >> Let's try to keep the Makefile target names specific to what we're > >> >> building, e.g. > >> >> > >> >> install-pip-requirements: To install packages required to build PIP > >> >> package (not sure that's the best name though) > >> >> install-pip: To install built PIP package > >> >> pip: To build the PIP package > >> > > >> > > >> > Done. > >> >> > >> >> > >> >> Eventually the "all" target will likely build the runtime and maybe > >> >> other packages as well, so for now, it should probably look something > >> >> like: > >> >> > >> >> all: install-pip-requirements pip > >> > > >> > > >> > Done. > >> >> > >> >> > >> >> Similarly, "clean" will eventually do other things too, so we can > >> >> create "clean-pip", which can be called with other further clean > >> >> targets by "clean". > >> > > >> > > >> > Done. > >> > > >> >> > >> >> > >> >> > setup_pgadmin4.py file contains all the Meta information needed to > >> >> > build > >> >> > the > >> >> > PIP package. > >> >> > >> >> I think that should be moved to pkg/pip, where it can later live > >> >> alongside directories like win32, osx and rpm etc. Would setup_pip.py > >> >> be a better name as well? > >> > > >> > > >> > Done. > >> > > >> >> > >> >> > >> >> > The version for the pip package is picked up from web/config.py > file. > >> >> > >> >> Urgh - don't try to parse that file from a Python script. It's a > >> >> Python script itself, so you can just import it - e.g. > >> >> > >> >> import config > >> >> version = config.APP_VERSION > >> > > >> > > >> > Done. > >> > > >> >> > >> >> > >> >> Thanks! > >> >> > >> >> -- > >> >> Dave Page > >> >> Blog: http://pgsnake.blogspot.com > >> >> Twitter: @pgsnake > >> >> > >> >> EnterpriseDB UK: http://www.enterprisedb.com > >> >> The Enterprise PostgreSQL Company > >> > > >> > > >> > >> > >> > >> -- > >> Dave Page > >> Blog: http://pgsnake.blogspot.com > >> Twitter: @pgsnake > >> > >> EnterpriseDB UK: http://www.enterprisedb.com > >> The Enterprise PostgreSQL Company > > > > > > > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company >
