Context Navigation

← Previous Changeset
Next Changeset →

Changeset 711

Timestamp:

Jan 11, 2016, 3:45:05 AM (3 years ago)

Author:

cito

Message:

Flatten the directory structure of the project

Simplified the directory structure by flattening the "module" subdirectory out
to the root directory. That way, the setup.py script can now also access the
top-level docs subdirectory, so it could also install or build the docs.
There was nothing else in the root directory anyway, except the mkdocs and
mktar scripts which could be made unnecessary through setup.py.

Also made the setup script a bit clearer. Removed the note about MinGW for
Windows since the Microsoft compiler for Python 2.7 and Visual Studio Community
are now freely available including 64bit compilers, and produce less problems.

Note that the usual structure would have been to use a "pygresql" package
directory instead of the "module" directory. But since we install PyGreSQL
as two top-level modules "pg" and "pgdb" instead of a package "pygresql",
the flattened structure reflects that much better. For historical reasons
and people don't want to rewrite import statements, we will keep it that way.

Files:

: 2 deleted
: 4 edited
: 27 copied

branches/4.x (modified) (1 prop)
branches/4.x/GNUmakefile (copied) (copied from branches/4.x/module/GNUmakefile)
branches/4.x/MANIFEST.in (copied) (copied from branches/4.x/module/MANIFEST.in)
branches/4.x/PyGreSQL.spec (copied) (copied from branches/4.x/module/PyGreSQL.spec)
branches/4.x/Setup.in.raw (copied) (copied from branches/4.x/module/Setup.in.raw)
branches/4.x/mktar (modified) (1 diff)
branches/4.x/module (deleted)
branches/4.x/pg.py (copied) (copied from branches/4.x/module/pg.py)
branches/4.x/pgdb.py (copied) (copied from branches/4.x/module/pgdb.py)
branches/4.x/pgfs.h (copied) (copied from branches/4.x/module/pgfs.h)
branches/4.x/pgmodule.c (copied) (copied from branches/4.x/module/pgmodule.c)
branches/4.x/pgtypes.h (copied) (copied from branches/4.x/module/pgtypes.h)
branches/4.x/setup.cfg (copied) (copied from branches/4.x/module/setup.cfg)
branches/4.x/setup.py (copied) (copied from branches/4.x/module/setup.py) (5 diffs)
branches/4.x/tests (copied) (copied from branches/4.x/module/tests)
branches/4.x/tox.ini (copied) (copied from branches/4.x/module/tox.ini)
trunk (modified) (1 prop)
trunk/GNUmakefile (copied) (copied from trunk/module/GNUmakefile)
trunk/MANIFEST.in (copied) (copied from trunk/module/MANIFEST.in)
trunk/PyGreSQL.spec (copied) (copied from trunk/module/PyGreSQL.spec)
trunk/Setup.in.raw (copied) (copied from trunk/module/Setup.in.raw)
trunk/mktar (modified) (1 diff)
trunk/module (deleted)
trunk/pg.py (copied) (copied from trunk/module/pg.py)
trunk/pgdb.py (copied) (copied from trunk/module/pgdb.py)
trunk/pgfs.h (copied) (copied from trunk/module/pgfs.h)
trunk/pgmodule.c (copied) (copied from trunk/module/pgmodule.c)
trunk/pgtypes.h (copied) (copied from trunk/module/pgtypes.h)
trunk/py3c.h (copied) (copied from trunk/module/py3c.h)
trunk/setup.cfg (copied) (copied from trunk/module/setup.cfg)
trunk/setup.py (copied) (copied from trunk/module/setup.py) (5 diffs)
trunk/tests (copied) (copied from trunk/module/tests)
trunk/tox.ini (copied) (copied from trunk/module/tox.ini)

Legend:

: Unmodified
: Added
: Removed

branches/4.x

Property svn:ignore

-                      old
+                      new
+*.egg-info
 .idea
+.tox
+.vagrant
 BETA
+build
+dist

branches/4.x/mktar

-                      r708
+                      r711
 TF=$DISTDIR/$TD.tgz
 MODFILES="module/pg.py module/pgdb.py module/pgmodule.c
           module/pgfs.h module/pgtypes.h
           module/setup.py module/setup.cfg"
+MODFILES="pg.py pgdb.py pgmodule.c
+          pgfs.h pgtypes.h
+          setup.py setup.cfg"
 DOCFILES="docs/Makefile docs/make.bat docs/*.rst
           docs/contents docs/download docs/community
           docs/_static docs/_templates"
 HTMLFILES="docs/_build/html"
 TESTFILES="module/tests/*.py"
+TESTFILES="tests/*.py"
 echo "Making source tarball..."

branches/4.x/setup.py

-                      r710
+                      r711
 * PyGreSQL written 1997 by D'Arcy J.M. Cain <darcy@druid.net>
 * based on code written 1995 by Pascal Andre <andre@chimay.via.ecp.fr>
 * setup script created 2000/04 Mark Alexander <mwa@gate.net>
 * tweaked 2000/05 Jeremy Hylton <jeremy@cnri.reston.va.us>
 * win32 support 2001/01 by Gerhard Haering <gerhard@bigfoot.de>
 * tweaked 2006/02-2010/02 by Christoph Zwerschke <cito@online.de>
+* setup script created 2000 by Mark Alexander <mwa@gate.net>
+* improved 2000 by Jeremy Hylton <jeremy@cnri.reston.va.us>
+* improved 2001 by Gerhard Haering <gerhard@bigfoot.de>
+* improved 2006 and 2016 by Christoph Zwerschke <cito@online.de>
 Prerequisites to be installed:
 …
 python setup.py build   # to build the module
 python setup.py install # to install it
-You can use MinGW or MinGW-w64 for building on Windows:
-python setup.py build -c mingw32 install
 See docs.python.org/doc/install/ for more information on
 …
+# For historical reasons, PyGreSQL does not install itself as a single
+# "pygresql" package, but as two top-level modules "pg", providing the
+# classic interface, and "pgdb" for the modern DB-API 2.0 interface.
+# These two top-level Python modules share the same C extension "_pg".
+py_modules = ['pg', 'pgdb']
+c_sources = ['pgmodule.c']
 def pg_config(s):
     """Retrieve information about installed version of PostgreSQL."""
 …
 pg_version = pg_version()
-py_modules = ['pg', 'pgdb']
 libraries = ['pq']
 # Make sure that the Python header files are searched before
 …
     license="Python",
     py_modules=py_modules,
     ext_modules=[Extension('_pg', ['pgmodule.c'],
+    ext_modules=[Extension('_pg', c_sources,
         include_dirs=include_dirs, library_dirs=library_dirs,
         define_macros=define_macros, undef_macros=undef_macros,

trunk