Skip to content

Commit b8ec731

Browse files
author
Christopher Doris
committed
rearrange
1 parent 0259a21 commit b8ec731

19 files changed

+4
-67
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

python/README.md

Lines changed: 0 additions & 47 deletions
This file was deleted.

python/setup.cfg renamed to setup.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ classifiers =
1212

1313
[options]
1414
zip_safe = False
15+
package_dir =
16+
=pysrc
1517
packages = juliacall
1618
python_requires = ~=3.5
1719
install_requires =

src/jlwrap/any.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ function init_jlwrap_any()
172172
$("\n"^(@__LINE__()-1))
173173
class AnyValue(ValueBase):
174174
__slots__ = ()
175-
__module__ = "juliacall"
176175
def __repr__(self):
177176
if self._jl_isnull():
178177
return "<jl NULL>"

src/jlwrap/array.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ function init_jlwrap_array()
293293
$("\n"^(@__LINE__()-1))
294294
class ArrayValue(AnyValue):
295295
__slots__ = ()
296-
__module__ = "juliacall"
297296
_jl_buffer_info = $(pyjl_methodnum(pyjlarray_buffer_info))
298297
@property
299298
def ndim(self):

src/jlwrap/callback.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ function init_jlwrap_callback()
3333
$("\n"^(@__LINE__()-1))
3434
class CallbackValue(ValueBase):
3535
__slots__ = ()
36-
__module__ = "juliacall"
3736
def __repr__(self):
3837
if self._jl_isnull():
3938
return "<jl NULL>"

src/jlwrap/dict.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ function init_jlwrap_dict()
3737
$("\n"^(@__LINE__()-1))
3838
class DictValue(AnyValue):
3939
__slots__ = ()
40-
__module__ = "juliacall"
4140
_jl_undefined_ = object()
4241
def __iter__(self):
4342
return self._jl_callmethod($(pyjl_methodnum(pyjldict_iter)))

src/jlwrap/io.jl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ function init_jlwrap_io()
207207
$("\n"^(@__LINE__()-1))
208208
class IOValueBase(AnyValue):
209209
__slots__ = ()
210-
__module__ = "juliacall"
211210
def close(self):
212211
return self._jl_callmethod($(pyjl_methodnum(pyjlio_close)))
213212
@property
@@ -259,7 +258,6 @@ function init_jlwrap_io()
259258
raise StopIteration
260259
class BinaryIOValue(IOValueBase):
261260
__slots__ = ()
262-
__module__ = "juliacall"
263261
def detach(self):
264262
raise ValueError("Cannot detach '{}'.".format(type(self)))
265263
def read(self, size=-1):
@@ -276,7 +274,6 @@ function init_jlwrap_io()
276274
return self._jl_callmethod($(pyjl_methodnum(pyjlbinaryio_write)), b)
277275
class TextIOValue(IOValueBase):
278276
__slots__ = ()
279-
__module__ = "juliacall"
280277
@property
281278
def encoding(self):
282279
return "UTF-8"

src/jlwrap/iter.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ function init_jlwrap_iter()
3131
$("\n"^(@__LINE__()-1))
3232
class IteratorValue(AnyValue):
3333
__slots__ = ()
34-
__module__ = "juliacall"
3534
def __iter__(self):
3635
return self
3736
def __next__(self):

src/jlwrap/module.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ function init_jlwrap_module()
1919
$("\n"^(@__LINE__()-1))
2020
class ModuleValue(AnyValue):
2121
__slots__ = ()
22-
__module__ = "juliacall"
2322
def __dir__(self):
2423
return ValueBase.__dir__(self) + self._jl_callmethod($(pyjl_methodnum(pyjlmodule_dir)))
2524
def seval(self, expr):

src/jlwrap/number.jl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ function init_jlwrap_number()
8282
$("\n"^(@__LINE__()-1))
8383
class NumberValue(AnyValue):
8484
__slots__ = ()
85-
__module__ = "juliacall"
8685
def __bool__(self):
8786
return not self._jl_callmethod($(pyjl_methodnum(pyjlnumber_op(iszero))))
8887
def __add__(self, other):
@@ -153,7 +152,6 @@ function init_jlwrap_number()
153152
return self._jl_callmethod($(pyjl_methodnum(pyjlnumber_op(>))), other)
154153
class ComplexValue(NumberValue):
155154
__slots__ = ()
156-
__module__ = "juliacall"
157155
def __complex__(self):
158156
return self._jl_callmethod($(pyjl_methodnum(pycomplex)))
159157
@property
@@ -166,7 +164,6 @@ function init_jlwrap_number()
166164
return self._jl_callmethod($(pyjl_methodnum(pyjlnumber_op(conj))))
167165
class RealValue(ComplexValue):
168166
__slots__ = ()
169-
__module__ = "juliacall"
170167
def __float__(self):
171168
return self._jl_callmethod($(pyjl_methodnum(pyfloat)))
172169
@property
@@ -189,7 +186,6 @@ function init_jlwrap_number()
189186
return self._jl_callmethod($(pyjl_methodnum(pyjlreal_round)), ndigits)
190187
class RationalValue(RealValue):
191188
__slots__ = ()
192-
__module__ = "juliacall"
193189
@property
194190
def numerator(self):
195191
return self._jl_callmethod($(pyjl_methodnum(pyjlnumber_op(numerator))))
@@ -198,7 +194,6 @@ function init_jlwrap_number()
198194
return self._jl_callmethod($(pyjl_methodnum(pyjlnumber_op(denominator))))
199195
class IntegerValue(RationalValue):
200196
__slots__ = ()
201-
__module__ = "juliacall"
202197
def __int__(self):
203198
return self._jl_callmethod($(pyjl_methodnum(pyint)))
204199
def __index__(self):

src/jlwrap/raw.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ function init_jlwrap_raw()
7979
$("\n"^(@__LINE__()-1))
8080
class RawValue(ValueBase):
8181
__slots__ = ()
82-
__module__ = "juliacall"
8382
def __repr__(self):
8483
if self._jl_isnull():
8584
return "<jl NULL>"

src/jlwrap/set.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ function init_jlwrap_set()
7979
$("\n"^(@__LINE__()-1))
8080
class SetValue(AnyValue):
8181
__slots__ = ()
82-
__module__ = "juliacall"
8382
def add(self, value):
8483
return self._jl_callmethod($(pyjl_methodnum(pyjlset_add)), value)
8584
def discard(self, value):

src/jlwrap/type.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ function init_jlwrap_type()
1616
$("\n"^(@__LINE__()-1))
1717
class TypeValue(AnyValue):
1818
__slots__ = ()
19-
__module__ = "juliacall"
2019
def __getitem__(self, k):
2120
return self._jl_callmethod($(pyjl_methodnum(pyjltype_getitem)), k)
2221
def __setitem__(self, k, v):

src/jlwrap/vector.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ function init_jlwrap_vector()
118118
$("\n"^(@__LINE__()-1))
119119
class VectorValue(ArrayValue):
120120
__slots__ = ()
121-
__module__ = "juliacall"
122121
def resize(self, size):
123122
return self._jl_callmethod($(pyjl_methodnum(pyjlvector_resize)), size)
124123
def sort(self, reverse=False, key=None):

src/juliacall.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ function init_juliacall()
1818
else
1919
# TODO: Is there a more robust way to import juliacall from a specific path?
2020
# prepend the directory containing juliacall to sys.path
21-
sys.path.insert(0, joinpath(ROOT_DIR, "python"))
21+
sys.path.insert(0, joinpath(ROOT_DIR, "pysrc"))
2222
# prevent juliacall from initialising itself
2323
os.environ["PYTHON_JULIACALL_NOINIT"] = "yes"
2424
# import juliacall
2525
pycopy!(jl, pyimport("juliacall"))
2626
# check the version
27-
@assert realpath(pystr_asstring(jl.__path__[0])) == realpath(joinpath(ROOT_DIR, "python", "juliacall"))
27+
@assert realpath(pystr_asstring(jl.__path__[0])) == realpath(joinpath(ROOT_DIR, "pysrc", "juliacall"))
2828
@assert pystr_asstring(jl.__version__) == string(VERSION)
2929
@assert pybool_asbool(jl.CONFIG["noinit"])
3030
end

0 commit comments

Comments
 (0)