Browse files

Entirely remove the thirdparty directory

Pyglet was removed from this, but the directory and some other
references were still there.
  • Loading branch information...
1 parent 6f851a3 commit e5c9c11e791210428ad5b63d0dd8612bb9b72917 @asmeurer asmeurer committed Jul 16, 2011
Showing with 2 additions and 47 deletions.
  1. +0 −2 MANIFEST.in
  2. +1 −2 setup.py
  3. +0 −39 sympy/thirdparty/__init__.py
  4. +0 −1 sympy/utilities/runtests.py
  5. +1 −3 sympy/utilities/tests/test_code_quality.py
View
2 MANIFEST.in
@@ -3,8 +3,6 @@ recursive-include doc *
prune doc/_build
recursive-include examples *.py README
-recursive-include sympy/thirdparty/pyglet *
-
include sympy/utilities/mathml/data/*.xsl
include LICENSE
View
3 setup.py
@@ -40,7 +40,7 @@
sys.exit(-1)
# Check that this list is uptodate against the result of the command:
-# $ for i in `find sympy -name __init__.py | rev | cut -f 2- -d '/' | rev | egrep -v "^sympy$|thirdparty/" `; do echo "'${i//\//.}',"; done | sort
+# $ for i in `find sympy -name __init__.py | rev | cut -f 2- -d '/' | rev`; do echo "'${i//\//.}',"; done | sort
modules = [
'sympy.assumptions',
'sympy.assumptions.handlers',
@@ -79,7 +79,6 @@
'sympy.solvers',
'sympy.statistics',
'sympy.tensor',
- 'sympy.thirdparty',
'sympy.utilities',
'sympy.utilities.mathml',
]
View
39 sympy/thirdparty/__init__.py
@@ -1,39 +0,0 @@
-"""Thirdparty Packages for internal use.
-"""
-
-import sys
-import os
-
-# XXX The pyglet library was the only one, but it's now an external dependency.
-# The infrastructure is left for future reference.
-
-def import_thirdparty(lib):
- """
- Imports a thirdparty package "lib" by setting all paths correctly.
-
- At the moment, there is only the "pyglet" library, so we just put
- pyglet to sys.path temporarily, then import "lib" and then restore the path.
- With more packages, we'll just put them to sys.path as well.
- """
-
- seen = set()
- def new_import(name, globals={}, locals={}, fromlist=[]):
- if name in seen:
- return old_import(name, globals, locals, fromlist)
- seen.add(name)
- sys.path.insert(0, os.path.join(os.path.abspath(os.path.dirname( \
- __file__)), "pyglet"))
- try:
- m = old_import(name, globals, locals, fromlist)
- finally:
- del sys.path[0]
- return m
- import __builtin__
- old_import = __builtin__.__import__
- __builtin__.__import__ = new_import
- try:
- m = __import__(lib)
- finally:
- __builtin__.__import__ = old_import
-
- return m
View
1 sympy/utilities/runtests.py
@@ -218,7 +218,6 @@ def doctest(*paths, **kwargs):
verbose = kwargs.get("verbose", False)
blacklist = kwargs.get("blacklist", [])
blacklist.extend([
- "sympy/thirdparty/pyglet", # segfaults
"doc/src/modules/mpmath", # needs to be fixed upstream
"sympy/mpmath", # needs to be fixed upstream
"doc/src/modules/plotting.txt", # generates live plots
View
4 sympy/utilities/tests/test_code_quality.py
@@ -8,7 +8,7 @@
# System path separator (usually slash or backslash) to be
# used with excluded files, e.g.
# exclude = set([
-# "%(sep)sthirdparty%(sep)s" % sepd,
+# "%(sep)smpmath%(sep)s" % sepd,
# ])
sepd = {"sep": sep}
@@ -104,7 +104,6 @@ def test(fname):
file.close()
exclude = set([
- "%(sep)sthirdparty%(sep)s" % sepd,
"%(sep)smpmath%(sep)s" % sepd,
])
check_directory_tree(SYMPY_PATH, test, exclude)
@@ -146,7 +145,6 @@ def test(fname):
file.close()
exclude = set([
- "%(sep)sthirdparty%(sep)s" % sepd,
"%(sep)s__init__.py" % sepd,
"%(sep)sinteractive%(sep)ssession.py" % sepd,
# Taken from Python stdlib:

0 comments on commit e5c9c11

Please sign in to comment.