From 7a846cf5e35ebcad852309aebaa0bac8a7244744 Mon Sep 17 00:00:00 2001 From: Evax Software Date: Thu, 4 Oct 2012 13:34:39 -0400 Subject: [PATCH] Allow pip install from git Merged with modifications from https://github.com/evax/MySQLdb1/commit/a8152690101733904b16a32ff8467220ca07242c --- .travis.yml | 4 +- MySQLdb/GPL-2.0 => GPL-2.0 | 0 MySQLdb/HISTORY => HISTORY | 0 MySQLdb/MANIFEST.in => MANIFEST.in | 0 MySQLdb/MySQLdb/constants/.cvsignore | 1 - MySQLdb/{MySQLdb => }/__init__.py | 0 MySQLdb/{MySQLdb => }/connections.py | 0 MySQLdb/{MySQLdb => }/constants/CLIENT.py | 0 MySQLdb/{MySQLdb => }/constants/CR.py | 0 MySQLdb/{MySQLdb => }/constants/ER.py | 0 MySQLdb/{MySQLdb => }/constants/FIELD_TYPE.py | 0 MySQLdb/{MySQLdb => }/constants/FLAG.py | 0 MySQLdb/{MySQLdb => }/constants/REFRESH.py | 0 MySQLdb/{MySQLdb => }/constants/__init__.py | 0 MySQLdb/{MySQLdb => }/converters.py | 0 MySQLdb/{MySQLdb => }/cursors.py | 0 MySQLdb/{MySQLdb => }/release.py | 0 MySQLdb/{MySQLdb => }/times.py | 0 MySQLdb/README => README | 0 README.md | 41 ------------------- MySQLdb/_mysql.c => _mysql.c | 0 ...ysql_exceptions.py => _mysql_exceptions.py | 0 ...distribute_setup.py => distribute_setup.py | 0 {MySQLdb/doc => doc}/FAQ.txt | 0 {MySQLdb/doc => doc}/MySQLdb.txt | 0 MySQLdb/ez_setup.py => ez_setup.py | 0 MySQLdb/metadata.cfg => metadata.cfg | 0 MySQLdb/pymemcompat.h => pymemcompat.h | 0 MySQLdb/setup.cfg => setup.cfg | 0 MySQLdb/setup.py => setup.py | 0 MySQLdb/setup_common.py => setup_common.py | 0 MySQLdb/setup_posix.py => setup_posix.py | 0 MySQLdb/setup_windows.py => setup_windows.py | 0 MySQLdb/site.cfg => site.cfg | 0 {MySQLdb/tests => tests}/capabilities.py | 0 {MySQLdb/tests => tests}/configdb.py | 0 {MySQLdb/tests => tests}/dbapi20.py | 0 {MySQLdb/tests => tests}/default.cnf | 0 .../test_MySQLdb_capabilities.py | 0 .../tests => tests}/test_MySQLdb_dbapi20.py | 0 .../test_MySQLdb_nonstandard.py | 0 {MySQLdb/tests => tests}/travis.cnf | 0 42 files changed, 2 insertions(+), 44 deletions(-) rename MySQLdb/GPL-2.0 => GPL-2.0 (100%) rename MySQLdb/HISTORY => HISTORY (100%) rename MySQLdb/MANIFEST.in => MANIFEST.in (100%) delete mode 100644 MySQLdb/MySQLdb/constants/.cvsignore rename MySQLdb/{MySQLdb => }/__init__.py (100%) rename MySQLdb/{MySQLdb => }/connections.py (100%) rename MySQLdb/{MySQLdb => }/constants/CLIENT.py (100%) rename MySQLdb/{MySQLdb => }/constants/CR.py (100%) rename MySQLdb/{MySQLdb => }/constants/ER.py (100%) rename MySQLdb/{MySQLdb => }/constants/FIELD_TYPE.py (100%) rename MySQLdb/{MySQLdb => }/constants/FLAG.py (100%) rename MySQLdb/{MySQLdb => }/constants/REFRESH.py (100%) rename MySQLdb/{MySQLdb => }/constants/__init__.py (100%) rename MySQLdb/{MySQLdb => }/converters.py (100%) rename MySQLdb/{MySQLdb => }/cursors.py (100%) rename MySQLdb/{MySQLdb => }/release.py (100%) rename MySQLdb/{MySQLdb => }/times.py (100%) rename MySQLdb/README => README (100%) delete mode 100644 README.md rename MySQLdb/_mysql.c => _mysql.c (100%) rename MySQLdb/_mysql_exceptions.py => _mysql_exceptions.py (100%) rename MySQLdb/distribute_setup.py => distribute_setup.py (100%) rename {MySQLdb/doc => doc}/FAQ.txt (100%) rename {MySQLdb/doc => doc}/MySQLdb.txt (100%) rename MySQLdb/ez_setup.py => ez_setup.py (100%) rename MySQLdb/metadata.cfg => metadata.cfg (100%) rename MySQLdb/pymemcompat.h => pymemcompat.h (100%) rename MySQLdb/setup.cfg => setup.cfg (100%) rename MySQLdb/setup.py => setup.py (100%) rename MySQLdb/setup_common.py => setup_common.py (100%) rename MySQLdb/setup_posix.py => setup_posix.py (100%) rename MySQLdb/setup_windows.py => setup_windows.py (100%) rename MySQLdb/site.cfg => site.cfg (100%) rename {MySQLdb/tests => tests}/capabilities.py (100%) rename {MySQLdb/tests => tests}/configdb.py (100%) rename {MySQLdb/tests => tests}/dbapi20.py (100%) rename {MySQLdb/tests => tests}/default.cnf (100%) rename {MySQLdb/tests => tests}/test_MySQLdb_capabilities.py (100%) rename {MySQLdb/tests => tests}/test_MySQLdb_dbapi20.py (100%) rename {MySQLdb/tests => tests}/test_MySQLdb_nonstandard.py (100%) rename {MySQLdb/tests => tests}/travis.cnf (100%) diff --git a/.travis.yml b/.travis.yml index af7abea..0805439 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,6 @@ python: - "2.5" - "2.6" - "2.7" -install: (cd MySQLdb && python setup.py install) +install: python setup.py install before_script: mysql -e 'create database mysqldb_test charset utf8;' -script: (cd MySQLdb && TESTDB=travis.cnf nosetests) +script: TESTDB=travis.cnf nosetests diff --git a/MySQLdb/GPL-2.0 b/GPL-2.0 similarity index 100% rename from MySQLdb/GPL-2.0 rename to GPL-2.0 diff --git a/MySQLdb/HISTORY b/HISTORY similarity index 100% rename from MySQLdb/HISTORY rename to HISTORY diff --git a/MySQLdb/MANIFEST.in b/MANIFEST.in similarity index 100% rename from MySQLdb/MANIFEST.in rename to MANIFEST.in diff --git a/MySQLdb/MySQLdb/constants/.cvsignore b/MySQLdb/MySQLdb/constants/.cvsignore deleted file mode 100644 index 0d20b64..0000000 --- a/MySQLdb/MySQLdb/constants/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.pyc diff --git a/MySQLdb/MySQLdb/__init__.py b/MySQLdb/__init__.py similarity index 100% rename from MySQLdb/MySQLdb/__init__.py rename to MySQLdb/__init__.py diff --git a/MySQLdb/MySQLdb/connections.py b/MySQLdb/connections.py similarity index 100% rename from MySQLdb/MySQLdb/connections.py rename to MySQLdb/connections.py diff --git a/MySQLdb/MySQLdb/constants/CLIENT.py b/MySQLdb/constants/CLIENT.py similarity index 100% rename from MySQLdb/MySQLdb/constants/CLIENT.py rename to MySQLdb/constants/CLIENT.py diff --git a/MySQLdb/MySQLdb/constants/CR.py b/MySQLdb/constants/CR.py similarity index 100% rename from MySQLdb/MySQLdb/constants/CR.py rename to MySQLdb/constants/CR.py diff --git a/MySQLdb/MySQLdb/constants/ER.py b/MySQLdb/constants/ER.py similarity index 100% rename from MySQLdb/MySQLdb/constants/ER.py rename to MySQLdb/constants/ER.py diff --git a/MySQLdb/MySQLdb/constants/FIELD_TYPE.py b/MySQLdb/constants/FIELD_TYPE.py similarity index 100% rename from MySQLdb/MySQLdb/constants/FIELD_TYPE.py rename to MySQLdb/constants/FIELD_TYPE.py diff --git a/MySQLdb/MySQLdb/constants/FLAG.py b/MySQLdb/constants/FLAG.py similarity index 100% rename from MySQLdb/MySQLdb/constants/FLAG.py rename to MySQLdb/constants/FLAG.py diff --git a/MySQLdb/MySQLdb/constants/REFRESH.py b/MySQLdb/constants/REFRESH.py similarity index 100% rename from MySQLdb/MySQLdb/constants/REFRESH.py rename to MySQLdb/constants/REFRESH.py diff --git a/MySQLdb/MySQLdb/constants/__init__.py b/MySQLdb/constants/__init__.py similarity index 100% rename from MySQLdb/MySQLdb/constants/__init__.py rename to MySQLdb/constants/__init__.py diff --git a/MySQLdb/MySQLdb/converters.py b/MySQLdb/converters.py similarity index 100% rename from MySQLdb/MySQLdb/converters.py rename to MySQLdb/converters.py diff --git a/MySQLdb/MySQLdb/cursors.py b/MySQLdb/cursors.py similarity index 100% rename from MySQLdb/MySQLdb/cursors.py rename to MySQLdb/cursors.py diff --git a/MySQLdb/MySQLdb/release.py b/MySQLdb/release.py similarity index 100% rename from MySQLdb/MySQLdb/release.py rename to MySQLdb/release.py diff --git a/MySQLdb/MySQLdb/times.py b/MySQLdb/times.py similarity index 100% rename from MySQLdb/MySQLdb/times.py rename to MySQLdb/times.py diff --git a/MySQLdb/README b/README similarity index 100% rename from MySQLdb/README rename to README diff --git a/README.md b/README.md deleted file mode 100644 index f0ca032..0000000 --- a/README.md +++ /dev/null @@ -1,41 +0,0 @@ -MySQLdb1 -======== - -This is the legacy (1.x) version of MySQLdb. While it is still being -maintained, there will not be a lot of new feature development. - -[![Build Status](https://secure.travis-ci.org/farcepest/MySQLdb1.png)](http://travis-ci.org/farcepest/MySQLdb1) - -TODO ----- - -* A bugfix 1.2.4 release -* A 1.3.0 release that will support Python 2.7-3.3 -* The 2.0 version is being renamed [moist][] and is heavily refactored. - -Projects --------- - -* [MySQLdb-svn][] - - This is the old Subversion repository located on SourceForge. - It has all the early historical development of MySQLdb through 1.2.3, - and also is the working repository for ZMySQLDA. The trunk on this - repository was forked to create the [MySQLdb2][] repository. - -* [MySQLdb1][] - - This is the new (active) git repository. - Only updates to the 1.x series will happen here. - -* [MySQLdb2][] - - This is the now obsolete Mercurial repository for MySQLdb-2.0 - located on SourceForge. This repository has been migrated to the - [moist][] repository. - - -[MySQLdb1]: https://github.com/farcepest/MySQLdb1 -[moist]: https://github.com/farcepest/moist -[MySQLdb-svn]: https://sourceforge.net/p/mysql-python/svn/ -[MySQLdb2]: https://sourceforge.net/p/mysql-python/mysqldb-2/ \ No newline at end of file diff --git a/MySQLdb/_mysql.c b/_mysql.c similarity index 100% rename from MySQLdb/_mysql.c rename to _mysql.c diff --git a/MySQLdb/_mysql_exceptions.py b/_mysql_exceptions.py similarity index 100% rename from MySQLdb/_mysql_exceptions.py rename to _mysql_exceptions.py diff --git a/MySQLdb/distribute_setup.py b/distribute_setup.py similarity index 100% rename from MySQLdb/distribute_setup.py rename to distribute_setup.py diff --git a/MySQLdb/doc/FAQ.txt b/doc/FAQ.txt similarity index 100% rename from MySQLdb/doc/FAQ.txt rename to doc/FAQ.txt diff --git a/MySQLdb/doc/MySQLdb.txt b/doc/MySQLdb.txt similarity index 100% rename from MySQLdb/doc/MySQLdb.txt rename to doc/MySQLdb.txt diff --git a/MySQLdb/ez_setup.py b/ez_setup.py similarity index 100% rename from MySQLdb/ez_setup.py rename to ez_setup.py diff --git a/MySQLdb/metadata.cfg b/metadata.cfg similarity index 100% rename from MySQLdb/metadata.cfg rename to metadata.cfg diff --git a/MySQLdb/pymemcompat.h b/pymemcompat.h similarity index 100% rename from MySQLdb/pymemcompat.h rename to pymemcompat.h diff --git a/MySQLdb/setup.cfg b/setup.cfg similarity index 100% rename from MySQLdb/setup.cfg rename to setup.cfg diff --git a/MySQLdb/setup.py b/setup.py similarity index 100% rename from MySQLdb/setup.py rename to setup.py diff --git a/MySQLdb/setup_common.py b/setup_common.py similarity index 100% rename from MySQLdb/setup_common.py rename to setup_common.py diff --git a/MySQLdb/setup_posix.py b/setup_posix.py similarity index 100% rename from MySQLdb/setup_posix.py rename to setup_posix.py diff --git a/MySQLdb/setup_windows.py b/setup_windows.py similarity index 100% rename from MySQLdb/setup_windows.py rename to setup_windows.py diff --git a/MySQLdb/site.cfg b/site.cfg similarity index 100% rename from MySQLdb/site.cfg rename to site.cfg diff --git a/MySQLdb/tests/capabilities.py b/tests/capabilities.py similarity index 100% rename from MySQLdb/tests/capabilities.py rename to tests/capabilities.py diff --git a/MySQLdb/tests/configdb.py b/tests/configdb.py similarity index 100% rename from MySQLdb/tests/configdb.py rename to tests/configdb.py diff --git a/MySQLdb/tests/dbapi20.py b/tests/dbapi20.py similarity index 100% rename from MySQLdb/tests/dbapi20.py rename to tests/dbapi20.py diff --git a/MySQLdb/tests/default.cnf b/tests/default.cnf similarity index 100% rename from MySQLdb/tests/default.cnf rename to tests/default.cnf diff --git a/MySQLdb/tests/test_MySQLdb_capabilities.py b/tests/test_MySQLdb_capabilities.py similarity index 100% rename from MySQLdb/tests/test_MySQLdb_capabilities.py rename to tests/test_MySQLdb_capabilities.py diff --git a/MySQLdb/tests/test_MySQLdb_dbapi20.py b/tests/test_MySQLdb_dbapi20.py similarity index 100% rename from MySQLdb/tests/test_MySQLdb_dbapi20.py rename to tests/test_MySQLdb_dbapi20.py diff --git a/MySQLdb/tests/test_MySQLdb_nonstandard.py b/tests/test_MySQLdb_nonstandard.py similarity index 100% rename from MySQLdb/tests/test_MySQLdb_nonstandard.py rename to tests/test_MySQLdb_nonstandard.py diff --git a/MySQLdb/tests/travis.cnf b/tests/travis.cnf similarity index 100% rename from MySQLdb/tests/travis.cnf rename to tests/travis.cnf