Martin Diehl
|
80841adcbb
|
support python 3 soon
|
2018-08-05 22:50:21 +02:00 |
|
Test User
|
784faafdd7
|
[skip ci] Merge branch 'master' into development
|
2018-08-05 22:35:23 +02:00 |
|
Test User
|
9f8325ab0e
|
Merge commit 'v2.0.2-351-g8173b8ce'
|
2018-08-05 22:35:17 +02:00 |
|
Test User
|
8173b8ced1
|
[skip ci] updated version information after successful test of v2.0.2-350-g2be13b00
|
2018-08-05 22:35:17 +02:00 |
|
Test User
|
7f933025c7
|
[skip ci] Merge branch 'master' into development
|
2018-08-05 15:22:57 +02:00 |
|
Test User
|
686f0fe801
|
[skip ci] updated version information after successful test of v2.0.2-349-gd623d037
|
2018-08-05 15:22:24 +02:00 |
|
Martin Diehl
|
2be13b0047
|
test that also works for new nonlocal
|
2018-08-05 06:02:33 +02:00 |
|
Martin Diehl
|
d623d0379b
|
resolved confusion of different branches in PRIVATE
|
2018-08-04 22:38:38 +02:00 |
|
Martin Diehl
|
6a4260ac07
|
Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
|
2018-08-04 22:29:52 +02:00 |
|
Test User
|
fa0dff7ac8
|
[skip ci] updated version information after successful test of v2.0.2-282-gc05337a2
|
2018-08-04 21:51:25 +02:00 |
|
Martin Diehl
|
c05337a21b
|
Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
|
2018-08-03 22:09:34 +02:00 |
|
Test User
|
eebff83252
|
[skip ci] updated version information after successful test of v2.0.2-263-gb305d913
|
2018-08-03 22:06:36 +02:00 |
|
Martin Diehl
|
c8aa9ff3ef
|
merge-related fixes
|
2018-08-03 19:30:36 +02:00 |
|
Martin Diehl
|
2da5d0029c
|
Merge branch '19-NewStylePhenopowerlaw' into development
|
2018-08-03 18:50:53 +02:00 |
|
Martin Diehl
|
f0645d84f5
|
not a target anymore
|
2018-08-03 15:10:38 +02:00 |
|
Martin Diehl
|
03e283e62c
|
Merge branch '31_consistent_wd' into development
|
2018-08-03 15:01:47 +02:00 |
|
Martin Diehl
|
b305d9133f
|
avoid timeouts if Abaqus is used by someone else
|
2018-08-03 09:12:30 +02:00 |
|
Martin Diehl
|
0a6bde70c5
|
Merge branch 'development' into 19-NewStylePhenopowerlaw
|
2018-08-03 06:56:43 +02:00 |
|
Martin Diehl
|
5d09e98e02
|
checking with Philip
|
2018-08-03 01:14:18 +02:00 |
|
Martin Diehl
|
3cceda5fe3
|
Merge branch 'development' into 31_consistent_wd
|
2018-08-03 00:08:16 +02:00 |
|
Martin Diehl
|
7283ee6caa
|
using updated tests from PRIVATE/master
|
2018-08-01 09:29:01 +02:00 |
|
Test User
|
e0a39d202c
|
[skip ci] updated version information after successful test of v2.0.2-261-gbc3f6ae9
|
2018-08-01 07:12:12 +02:00 |
|
Pratheek Shanthraj
|
bc3f6ae97c
|
missing bits in getStrings function
|
2018-07-31 23:15:44 +02:00 |
|
Test User
|
2419deea8f
|
[skip ci] updated version information after successful test of v2.0.2-259-g06a0128d
|
2018-07-30 22:31:50 +02:00 |
|
Martin Diehl
|
06a0128d91
|
no more aliases for c/a
|
2018-07-30 12:40:31 +02:00 |
|
Test User
|
c96081c99a
|
[skip ci] updated version information after successful test of v2.0.2-257-gf9d8278c
|
2018-07-30 11:36:05 +02:00 |
|
Martin Diehl
|
f9d8278ca6
|
using new test variant
|
2018-07-29 22:41:18 +02:00 |
|
Test User
|
708e2e0ac5
|
[skip ci] updated version information after successful test of v2.0.2-255-g449449b5
|
2018-07-28 16:16:31 +02:00 |
|
Martin Diehl
|
449449b500
|
does the same as numpy.clip
|
2018-07-28 01:31:02 +02:00 |
|
Test User
|
5eff624d3f
|
[skip ci] updated version information after successful test of v2.0.2-253-gce203ca7
|
2018-07-22 06:39:27 +02:00 |
|
Martin Diehl
|
ce203ca75c
|
[skip sc] merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
|
2018-07-21 23:20:42 +02:00 |
|
Martin Diehl
|
76cf126566
|
[skip sc] not really a patch but enables python (3)
skipping syntax check as executable files normally only exist in
processing and installation
|
2018-07-20 16:10:20 +02:00 |
|
Test User
|
2d1e933c3d
|
[skip ci] updated version information after successful test of v2.0.2-250-g8616a923
|
2018-07-20 11:03:47 +02:00 |
|
Martin Diehl
|
8616a92309
|
unused module
|
2018-07-20 03:50:07 +02:00 |
|
Martin Diehl
|
834b3c1d5c
|
Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
|
2018-07-20 03:46:43 +02:00 |
|
Martin Diehl
|
0c67f28178
|
python3 compatible tests
|
2018-07-20 03:46:00 +02:00 |
|
Martin Diehl
|
24d1528e04
|
on the way to full python 3 compatibility
|
2018-07-20 03:31:46 +02:00 |
|
Martin Diehl
|
b59145fca5
|
also using python 3 compatible tests
|
2018-07-20 03:11:10 +02:00 |
|
Martin Diehl
|
2632be2a76
|
polishing
|
2018-07-20 03:09:53 +02:00 |
|
Martin Diehl
|
784ae28dbb
|
now working with python 3
|
2018-07-20 00:39:50 +02:00 |
|
Test User
|
1384fdead1
|
[skip ci] updated version information after successful test of v2.0.2-241-g800f86e4
|
2018-07-19 23:56:47 +02:00 |
|
Martin Diehl
|
1f637a0c49
|
python3 compatible map requires conversion to list
|
2018-07-19 18:01:38 +02:00 |
|
Martin Diehl
|
800f86e419
|
Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
|
2018-07-19 16:41:55 +02:00 |
|
Martin Diehl
|
0438b7113a
|
using util function where possible, ensuring python3 compatibility
|
2018-07-19 16:38:25 +02:00 |
|
Martin Diehl
|
f928bd5e5b
|
more python 3 compatibility
|
2018-07-19 16:26:30 +02:00 |
|
Martin Diehl
|
35e470ff4d
|
needed for python3
|
2018-07-19 16:19:05 +02:00 |
|
Martin Diehl
|
9821654aae
|
iteritems does not exist in python3 anymore
items also works for python2 (might be slower though)
|
2018-07-19 16:16:10 +02:00 |
|
Martin Diehl
|
d138993c1d
|
using util functionality to be compatible with python3
|
2018-07-19 16:12:36 +02:00 |
|
Martin Diehl
|
6dd970dfe0
|
logic seemed to be broken (only filter out strings which have a 'strip'
attribute
string in python 3 have both attributes, '__iter__' and '__getitem'. Old
syntax therefore split up strings into characters
|
2018-07-19 15:46:14 +02:00 |
|
Martin Diehl
|
beb418eb44
|
python3 compatible way
ugly, but works also for python2.7. Probably there is a better solution
when 2.7 is deprecated
|
2018-07-19 15:20:34 +02:00 |