rearrange

Christopher Doris · Christopher Doris · commit b8ec731b3eb0 · 2022-05-26T23:55:55.000+01:00
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/pysrc/juliacall/__init__.py b/pysrc/juliacall/__init__.py
diff --git a/pysrc/juliacall/juliapkg.json b/pysrc/juliacall/juliapkg.json
diff --git a/pysrc/juliacall/matplotlib.py b/pysrc/juliacall/matplotlib.py
diff --git a/python/README.md b/python/README.md
diff --git a/setup.cfg b/setup.cfg
@@ -12,6 +12,8 @@ classifiers =
 
 [options]
 zip_safe = False
+package_dir =
+    =pysrc
 packages = juliacall
 python_requires = ~=3.5
 install_requires =
diff --git a/src/jlwrap/any.jl b/src/jlwrap/any.jl
@@ -172,7 +172,6 @@ function init_jlwrap_any()
     $("\n"^(@__LINE__()-1))
     class AnyValue(ValueBase):
         __slots__ = ()
-        __module__ = "juliacall"
         def __repr__(self):
             if self._jl_isnull():
                 return "<jl NULL>"
diff --git a/src/jlwrap/array.jl b/src/jlwrap/array.jl
@@ -293,7 +293,6 @@ function init_jlwrap_array()
     $("\n"^(@__LINE__()-1))
     class ArrayValue(AnyValue):
         __slots__ = ()
-        __module__ = "juliacall"
         _jl_buffer_info = $(pyjl_methodnum(pyjlarray_buffer_info))
         @property
         def ndim(self):
diff --git a/src/jlwrap/callback.jl b/src/jlwrap/callback.jl
@@ -33,7 +33,6 @@ function init_jlwrap_callback()
     $("\n"^(@__LINE__()-1))
     class CallbackValue(ValueBase):
         __slots__ = ()
-        __module__ = "juliacall"
         def __repr__(self):
             if self._jl_isnull():
                 return "<jl NULL>"
diff --git a/src/jlwrap/dict.jl b/src/jlwrap/dict.jl
@@ -37,7 +37,6 @@ function init_jlwrap_dict()
     $("\n"^(@__LINE__()-1))
     class DictValue(AnyValue):
         __slots__ = ()
-        __module__ = "juliacall"
         _jl_undefined_ = object()
         def __iter__(self):
             return self._jl_callmethod($(pyjl_methodnum(pyjldict_iter)))
diff --git a/src/jlwrap/io.jl b/src/jlwrap/io.jl
@@ -207,7 +207,6 @@ function init_jlwrap_io()
     $("\n"^(@__LINE__()-1))
     class IOValueBase(AnyValue):
         __slots__ = ()
-        __module__ = "juliacall"
         def close(self):
             return self._jl_callmethod($(pyjl_methodnum(pyjlio_close)))
         @property
@@ -259,7 +258,6 @@ function init_jlwrap_io()
                 raise StopIteration
     class BinaryIOValue(IOValueBase):
         __slots__ = ()
-        __module__ = "juliacall"
         def detach(self):
             raise ValueError("Cannot detach '{}'.".format(type(self)))
         def read(self, size=-1):
@@ -276,7 +274,6 @@ function init_jlwrap_io()
             return self._jl_callmethod($(pyjl_methodnum(pyjlbinaryio_write)), b)
     class TextIOValue(IOValueBase):
         __slots__ = ()
-        __module__ = "juliacall"
         @property
         def encoding(self):
             return "UTF-8"
diff --git a/src/jlwrap/iter.jl b/src/jlwrap/iter.jl
@@ -31,7 +31,6 @@ function init_jlwrap_iter()
     $("\n"^(@__LINE__()-1))
     class IteratorValue(AnyValue):
         __slots__ = ()
-        __module__ = "juliacall"
         def __iter__(self):
             return self
         def __next__(self):
diff --git a/src/jlwrap/module.jl b/src/jlwrap/module.jl
@@ -19,7 +19,6 @@ function init_jlwrap_module()
     $("\n"^(@__LINE__()-1))
     class ModuleValue(AnyValue):
         __slots__ = ()
-        __module__ = "juliacall"
         def __dir__(self):
             return ValueBase.__dir__(self) + self._jl_callmethod($(pyjl_methodnum(pyjlmodule_dir)))
         def seval(self, expr):
diff --git a/src/jlwrap/number.jl b/src/jlwrap/number.jl
@@ -82,7 +82,6 @@ function init_jlwrap_number()
     $("\n"^(@__LINE__()-1))
     class NumberValue(AnyValue):
         __slots__ = ()
-        __module__ = "juliacall"
         def __bool__(self):
             return not self._jl_callmethod($(pyjl_methodnum(pyjlnumber_op(iszero))))
         def __add__(self, other):
@@ -153,7 +152,6 @@ function init_jlwrap_number()
             return self._jl_callmethod($(pyjl_methodnum(pyjlnumber_op(>))), other)
     class ComplexValue(NumberValue):
         __slots__ = ()
-        __module__ = "juliacall"
         def __complex__(self):
             return self._jl_callmethod($(pyjl_methodnum(pycomplex)))
         @property
@@ -166,7 +164,6 @@ function init_jlwrap_number()
             return self._jl_callmethod($(pyjl_methodnum(pyjlnumber_op(conj))))
     class RealValue(ComplexValue):
         __slots__ = ()
-        __module__ = "juliacall"
         def __float__(self):
             return self._jl_callmethod($(pyjl_methodnum(pyfloat)))
         @property
@@ -189,7 +186,6 @@ function init_jlwrap_number()
             return self._jl_callmethod($(pyjl_methodnum(pyjlreal_round)), ndigits)
     class RationalValue(RealValue):
         __slots__ = ()
-        __module__ = "juliacall"
         @property
         def numerator(self):
             return self._jl_callmethod($(pyjl_methodnum(pyjlnumber_op(numerator))))
@@ -198,7 +194,6 @@ function init_jlwrap_number()
             return self._jl_callmethod($(pyjl_methodnum(pyjlnumber_op(denominator))))
     class IntegerValue(RationalValue):
         __slots__ = ()
-        __module__ = "juliacall"
         def __int__(self):
             return self._jl_callmethod($(pyjl_methodnum(pyint)))
         def __index__(self):
diff --git a/src/jlwrap/raw.jl b/src/jlwrap/raw.jl
@@ -79,7 +79,6 @@ function init_jlwrap_raw()
     $("\n"^(@__LINE__()-1))
     class RawValue(ValueBase):
         __slots__ = ()
-        __module__ = "juliacall"
         def __repr__(self):
             if self._jl_isnull():
                 return "<jl NULL>"
diff --git a/src/jlwrap/set.jl b/src/jlwrap/set.jl
@@ -79,7 +79,6 @@ function init_jlwrap_set()
     $("\n"^(@__LINE__()-1))
     class SetValue(AnyValue):
         __slots__ = ()
-        __module__ = "juliacall"
         def add(self, value):
             return self._jl_callmethod($(pyjl_methodnum(pyjlset_add)), value)
         def discard(self, value):
diff --git a/src/jlwrap/type.jl b/src/jlwrap/type.jl
@@ -16,7 +16,6 @@ function init_jlwrap_type()
     $("\n"^(@__LINE__()-1))
     class TypeValue(AnyValue):
         __slots__ = ()
-        __module__ = "juliacall"
         def __getitem__(self, k):
             return self._jl_callmethod($(pyjl_methodnum(pyjltype_getitem)), k)
         def __setitem__(self, k, v):
diff --git a/src/jlwrap/vector.jl b/src/jlwrap/vector.jl
@@ -118,7 +118,6 @@ function init_jlwrap_vector()
     $("\n"^(@__LINE__()-1))
     class VectorValue(ArrayValue):
         __slots__ = ()
-        __module__ = "juliacall"
         def resize(self, size):
             return self._jl_callmethod($(pyjl_methodnum(pyjlvector_resize)), size)
         def sort(self, reverse=False, key=None):
diff --git a/src/juliacall.jl b/src/juliacall.jl
@@ -18,13 +18,13 @@ function init_juliacall()
     else
         # TODO: Is there a more robust way to import juliacall from a specific path?
         # prepend the directory containing juliacall to sys.path
-        sys.path.insert(0, joinpath(ROOT_DIR, "python"))
+        sys.path.insert(0, joinpath(ROOT_DIR, "pysrc"))
         # prevent juliacall from initialising itself
         os.environ["PYTHON_JULIACALL_NOINIT"] = "yes"
         # import juliacall
         pycopy!(jl, pyimport("juliacall"))
         # check the version
-        @assert realpath(pystr_asstring(jl.__path__[0])) == realpath(joinpath(ROOT_DIR, "python", "juliacall"))
+        @assert realpath(pystr_asstring(jl.__path__[0])) == realpath(joinpath(ROOT_DIR, "pysrc", "juliacall"))
         @assert pystr_asstring(jl.__version__) == string(VERSION)
         @assert pybool_asbool(jl.CONFIG["noinit"])
     end
