diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/axiom/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/axiom/files')
-rw-r--r-- | dev-python/axiom/files/axiom-0.5.30-sqlite3.patch | 45 | ||||
-rw-r--r-- | dev-python/axiom/files/axiom-0.5.30-sqlite3_3.6.4.patch | 36 | ||||
-rw-r--r-- | dev-python/axiom/files/axiom-0.6.0-disable-tests.patch | 89 |
3 files changed, 170 insertions, 0 deletions
diff --git a/dev-python/axiom/files/axiom-0.5.30-sqlite3.patch b/dev-python/axiom/files/axiom-0.5.30-sqlite3.patch new file mode 100644 index 000000000000..8913a1e70d80 --- /dev/null +++ b/dev-python/axiom/files/axiom-0.5.30-sqlite3.patch @@ -0,0 +1,45 @@ +--- axiom/_pysqlite2.py 2006-07-05 18:31:18.000000000 +0300 ++++ axiom/_pysqlite2.py 2007-11-02 05:10:45.000000000 +0200 +@@ -8,7 +8,11 @@ + """ + import time + +-from pysqlite2 import dbapi2 ++# Use python2.5's sqlite3 if avaliable ++try: ++ from sqlite3 import dbapi2 ++except: ++ from pysqlite2 import dbapi2 + + from twisted.python import log + +--- axiom/test/test_pysqlite2.py 2006-07-02 19:23:40.000000000 +0300 ++++ axiom/test/test_pysqlite2.py 2007-11-02 05:39:44.000000000 +0200 +@@ -2,7 +2,11 @@ + Test cases for PySQLite2-specific parts of the backend. + """ + +-from pysqlite2.dbapi2 import OperationalError ++# Use python2.5's sqlite3 if avaliable ++try: ++ from sqlite3.dbapi2 import OperationalError ++except: ++ from pysqlite2.dbapi2 import OperationalError + + from twisted.trial.unittest import TestCase + +--- axiom/test/test_xatop.py 2007-02-23 02:09:19.000000000 +0200 ++++ axiom/test/test_xatop.py 2007-11-02 05:38:48.000000000 +0200 +@@ -9,7 +9,11 @@ + from axiom import attributes, item, store, errors + from axiom.errors import ItemNotFound + +-from pysqlite2.dbapi2 import sqlite_version_info ++# Use python2.5's sqlite3 if avaliable ++try: ++ from sqlite3.dbapi2 import sqlite_version_info ++except: ++ from pysqlite2.dbapi2 import sqlite_version_info + + + class RevertException(Exception): diff --git a/dev-python/axiom/files/axiom-0.5.30-sqlite3_3.6.4.patch b/dev-python/axiom/files/axiom-0.5.30-sqlite3_3.6.4.patch new file mode 100644 index 000000000000..cfa465ce656c --- /dev/null +++ b/dev-python/axiom/files/axiom-0.5.30-sqlite3_3.6.4.patch @@ -0,0 +1,36 @@ +--- axiom/_schema.py (revision 17031) ++++ axiom/_schema.py (working copy) +@@ -28,7 +28,7 @@ + CREATE TABLE *DATABASE*.axiom_attributes ( + type_id INTEGER, + row_offset INTEGER, +- indexed BOOLEAN, ++ "indexed" BOOLEAN, + sqltype VARCHAR, + allow_none BOOLEAN, + pythontype VARCHAR, +@@ -47,13 +47,13 @@ + HAS_SCHEMA_FEATURE = ("SELECT COUNT(oid) FROM *DATABASE*.sqlite_master " + "WHERE type = ? AND name = ?") + +-IDENTIFYING_SCHEMA = ('SELECT indexed, sqltype, allow_none, attribute ' ++IDENTIFYING_SCHEMA = ('SELECT "indexed", sqltype, allow_none, attribute ' + 'FROM *DATABASE*.axiom_attributes WHERE type_id = ? ' + 'ORDER BY row_offset') + + ADD_SCHEMA_ATTRIBUTE = ( + 'INSERT INTO *DATABASE*.axiom_attributes ' +- '(type_id, row_offset, indexed, sqltype, allow_none, attribute, docstring, pythontype) ' ++ '(type_id, row_offset, "indexed", sqltype, allow_none, attribute, docstring, pythontype) ' + 'VALUES (?, ?, ?, ?, ?, ?, ?, ?)') + + ALL_TYPES = 'SELECT oid, module, typename, version FROM *DATABASE*.axiom_types' +@@ -61,7 +61,7 @@ + GET_GREATER_VERSIONS_OF_TYPE = ('SELECT version FROM *DATABASE*.axiom_types ' + 'WHERE typename = ? AND version > ?') + +-SCHEMA_FOR_TYPE = ('SELECT indexed, pythontype, attribute, docstring ' ++SCHEMA_FOR_TYPE = ('SELECT "indexed", pythontype, attribute, docstring ' + 'FROM *DATABASE*.axiom_attributes ' + 'WHERE type_id = ?') + diff --git a/dev-python/axiom/files/axiom-0.6.0-disable-tests.patch b/dev-python/axiom/files/axiom-0.6.0-disable-tests.patch new file mode 100644 index 000000000000..9df20a5cd82d --- /dev/null +++ b/dev-python/axiom/files/axiom-0.6.0-disable-tests.patch @@ -0,0 +1,89 @@ +--- test/lib/axiom/test/test_query.py.orig 2015-07-21 10:15:57.441000000 +0000 ++++ test/lib/axiom/test/test_query.py 2015-07-21 10:16:36.356000000 +0000 +@@ -1043,46 +1043,46 @@ + SecondType(store=self.store) + + +- def test_firstTableOuterLoop(self): +- """ +- Test that in a two table query, the table which appears first in the +- result of the getInvolvedTables method of the comparison used is the +- one which the outer join loop iterates over. +- +- Test this by inserting rows into the first table and checking that the +- number of bytecodes executed increased. +- """ +- counter = QueryCounter(self.store) +- counts = [] +- for c in range(10): +- counts.append(counter.measure(list, self.query)) +- FirstType(store=self.store) +- +- # Make sure they're not all the same +- self.assertEqual(len(set(counts)), len(counts)) +- +- # Make sure they're increasing +- self.assertEqual(counts, sorted(counts)) +- +- +- def test_secondTableInnerLoop(self): +- """ +- Like L{test_firstTableOuterLoop} but for the second table being +- iterated over by the inner loop. +- +- This creates more rows in the second table while still performing a +- query for which no rows in the first table satisfy the WHERE +- condition. This should mean that rows from the second table are +- never examined. +- """ +- counter = QueryCounter(self.store) +- count = None +- for i in range(10): +- c = counter.measure(list, self.query) +- if count is None: +- count = c +- self.assertEqual(count, c) +- SecondType(store=self.store) ++ #def test_firstTableOuterLoop(self): ++ # """ ++ # Test that in a two table query, the table which appears first in the ++ # result of the getInvolvedTables method of the comparison used is the ++ # one which the outer join loop iterates over. ++ ++ # Test this by inserting rows into the first table and checking that the ++ # number of bytecodes executed increased. ++ # """ ++ # counter = QueryCounter(self.store) ++ # counts = [] ++ # for c in range(10): ++ # counts.append(counter.measure(list, self.query)) ++ # FirstType(store=self.store) ++ ++ # # Make sure they're not all the same ++ # self.assertEqual(len(set(counts)), len(counts)) ++ ++ # # Make sure they're increasing ++ # self.assertEqual(counts, sorted(counts)) ++ ++ ++ #def test_secondTableInnerLoop(self): ++ # """ ++ # Like L{test_firstTableOuterLoop} but for the second table being ++ # iterated over by the inner loop. ++ ++ # This creates more rows in the second table while still performing a ++ # query for which no rows in the first table satisfy the WHERE ++ # condition. This should mean that rows from the second table are ++ # never examined. ++ # """ ++ # counter = QueryCounter(self.store) ++ # count = None ++ # for i in range(10): ++ # c = counter.measure(list, self.query) ++ # if count is None: ++ # count = c ++ # self.assertEqual(count, c) ++ # SecondType(store=self.store) + + + class AndOrQueries(QueryingTestCase): |