Code

fixing unittest errors on windows#222

Code

Merged

deng113jie merged 190 commits intoKCL-BMEIS:masterKCL-BMEIS/ExeTera:masterfrom deng113jie:masterdeng113jie/ExeTera:masterCopy head branch name to clipboardOct 18, 2021

+558-48

Commits

Commits on Mar 11, 2021

• fixing issue KCL-BMEIS#86 from upstream:

  Show description for a2d7008
  

  jie

  committed
  a2d7008

Commits on Mar 12, 2021

• add unit test for Field get_spans() function

  

  jie

  committed
  62925bb

• remove unuseful line comments

  

  jie

  committed
  0e313dc

Commits on Mar 15, 2021

• add dataset, datafreame class

  deng113jie

  committed
  e211371

• Merge remote-tracking branch 'upstream/master'

  deng113jie

  committed
  39e4535

• closing issue 92, reset the dataset when call field.data.clear

  deng113jie

  committed
  329a7cc

• closing issue 92, reset the dataset when call field.data.clear

  deng113jie

  committed
  d9d8b02

• Merge branch 'master' into patch92

  Show description for f7ba342
  deng113jie

  committed
  f7ba342

• add unittest for field.data.clear function

  deng113jie

  committed
  21f0fa9

• recover the dataset file to avoid merge error when fixing issue 92

  deng113jie

  committed
  c9363ef

• fix end_of_file char in dataset.py

  deng113jie

  committed
  14fc1f3

Commits on Mar 16, 2021

• add get_span for index string field

  deng113jie

  committed
  2d13342

Commits on Mar 17, 2021

• unittest for get_span functions on different types of field, eg. fixed string, indexed string, etc.

  deng113jie

  committed
  666073e

Commits on Mar 18, 2021

• Merge remote-tracking branch 'upstream/master'

  deng113jie

  committed
  73aa50e

• Merge remote-tracking branch 'upstream/master' into dataframe

  deng113jie

  committed
  689cc3f

Commits on Mar 19, 2021

• dataframe basic methods and unittest

  deng113jie

  committed
  8ba818f

Commits on Mar 22, 2021

• more dataframe operations

  deng113jie

  committed
  abb3337

Commits on Mar 24, 2021

• fix upstream merge conflict

  deng113jie

  committed
  3180cbd

• minor fixing

  deng113jie

  committed
  9b9c420

• update get_span to field subclass

  deng113jie

  committed
  55989d6

• solve conflict

  deng113jie

  committed
  cd69d04

• intermedia commit due to test pr 118

  deng113jie

  committed
  f2136d5

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  30953e3

• Merge remote-tracking branch 'upstream/master' into dataframe

  deng113jie

  committed
  0dccc6e

• Implementate get_spans(ndarray) and get_spans(ndarray1, ndarray2) function in core.operations.

  Show description for 000463d
  deng113jie

  committed
  000463d

• Merge branch 'dataframe'

  deng113jie

  committed
  37972b5

Commits on Mar 25, 2021

• Move the get_spans functions from persistence to operations.

  Show description for 74c1dad
  deng113jie

  committed
  74c1dad

• Merge branch 'dataframe'

  deng113jie

  committed
  bf210c4

• minor edits for pull request

  deng113jie

  committed
  95c1645

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  5db42d2

• remove dataframe for pull request

  deng113jie

  committed
  664e255

• remove dataframe test for pr

  deng113jie

  committed
  02265fe

• add dataframe

  deng113jie

  committed
  f536652

• Merge remote-tracking branch 'upstream/master' into dataframe

  deng113jie

  committed
  bafe9cf

• fix get_spans_for_2_fields_by_spans, fix the unittest

  deng113jie

  committed
  223dbe9

• Merge branch 'master' into dataframe

  deng113jie

  committed
  cc48016

• Initial commit for is_sorted method on Field

  atbenmurray

  committed
  948ce1a

Commits on Mar 26, 2021

• minor edits for the pr

  deng113jie

  committed
  37b8ac2

• fix minor edit error for pr

  deng113jie

  committed
  0369c92

• Merge branch 'master' into dataframe

  deng113jie

  committed
  2096828

• add apply_index and apply_filter methods on fields

  deng113jie

  committed
  f213240

• Merging from recent PRs

  atbenmurray

  committed
  b050d74

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera into dataframe

  deng113jie

  committed
  76b5ff1

• Adding in missing tests for all field types for is_sorted

  atbenmurray

  committed
  fe36b94

• update the apply filter and apply index on Fields

  deng113jie

  committed
  daa6012

• minor updates to line up w/ upstream

  deng113jie

  committed
  5c43f38

• update apply filter & apply index methods in fields that differ if destination field is set: if set, use dstfld.write because new field usually empty; if not set, write to self using fld.data[:]

  deng113jie

  committed
  459b91c

Commits on Mar 29, 2021

• updated the apply_index and apply_filter methods in fields. Use olddata[:]=newdata if length of old dataset is equals to new dataset; clear() and write() data if not.

  deng113jie

  committed
  c0ac960

Commits on Mar 30, 2021

• add dataframe basic functions and operations; working on dataset to enable dataframe to create fields.

  deng113jie

  committed
  dd0867d

Commits on Apr 1, 2021

• add functions in dataframe

  Show description for e52d825
  deng113jie

  committed
  e52d825

Commits on Apr 6, 2021

• integrates the dataset, dataframe into the session

  deng113jie

  committed
  463ea70

Commits on Apr 7, 2021

• update the fieldsimporter and field.create_like methods to call dataframe.create

  Show description for 76d1952
  deng113jie

  committed
  76d1952

• add license info to a few files

  deng113jie

  committed
  7cfeceb

Commits on Apr 8, 2021

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  b1cb082

• csv_reader_with_njit

  Liyuan-Chen-1024

  committed
  eaac2b6

Commits on Apr 9, 2021

• change output_excel from string to int

  Liyuan-Chen-1024

  committed
  a9ce1fb

• Merge branch 'master' of github.com:KCL-BMEIS/ExeTera into importer_csv_reader

  Liyuan-Chen-1024

  committed
  113a83f

• solve merge conflict

  Liyuan-Chen-1024

  committed
  375982c

• initialize column_idx matrix outside of the njit function

  Liyuan-Chen-1024

  committed
  e9d1053

• use np.fromfile to load the file into byte array

  Liyuan-Chen-1024

  committed
  e1ed80d

Commits on Apr 11, 2021

• Merge branch 'master' into field_is_sorted_method

  atbenmurray

  authored
  f4fe394

• Refactoring and reformatting of some of the dataset / dataframe code; moving Session and Dataset to abstract types; fixing of is_sorted tests that were broken with the merge of the new functionality

  atbenmurray

  committed
  a057677

Commits on Apr 12, 2021

• Merge branch 'issort' into dataframe

  deng113jie

  committed
  0845a63

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera into dataframe

  deng113jie

  committed
  4d2886a

• Work on fast csv reading

  atbenmurray

  committed
  db3ec9f

• Address issue KCL-BMEIS#138 on minor tweaks

  Show description for f2efedc
  deng113jie

  committed
  f2efedc

• remove draft group.py from repo

  deng113jie

  committed
  4926330

• Improved performance from the fast csv reader through avoiding ndarray slicing

  atbenmurray

  committed
  56bb190

Commits on Apr 13, 2021

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  04d810b

• fix dataframe api

  deng113jie

  committed
  f0b7e37

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  18d49a6

• fixing KCL-BMEIS#13 and KCL-BMEIS#14, add dest parameter to get_spans(), tidy up the field/fields parameters

  deng113jie

  committed
  737eeed

• minor fix remove dataframe and file property from dataset, as not used so far.

  deng113jie

  committed
  732762d

• minor fix on unittest

  deng113jie

  committed
  ab6508c

Commits on Apr 14, 2021

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  39027f7

• add docstring for dataset

  deng113jie

  committed
  358d82b

Commits on Apr 15, 2021

• copy/move for dataframe; docstrings

  deng113jie

  committed
  98a4d7f

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  e6b1a57

• categorical field: convert from byte int to value int within njit function

  Liyuan-Chen-1024

  committed
  a0e0167

• merge

  Liyuan-Chen-1024

  committed
  204bd39

• Adding in of pseudocode version of fast categorical lookup

  atbenmurray

  committed
  c788b96

• clean up the comments

  Liyuan-Chen-1024

  committed
  60f2ba9

• Merge branch 'importer_csv_reader' of github.com:KCL-BMEIS/ExeTera into importer_csv_reader

  Liyuan-Chen-1024

  committed
  bba4829

Commits on Apr 16, 2021

• docstrings for dataframe

  deng113jie

  committed
  c341eb2

• Major reworking of apply_filter / apply_index for fields; they shouldn't destructively change self by default. Also addition of further mem versions of fields and factoring out of common functional…

  Show description for b23f1d8
  atbenmurray

  committed
  b23f1d8

• add unittest for various fields in dataframe

  Show description for 63bd5a0
  deng113jie

  committed
  63bd5a0

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  650014e

• add unittest for Dataframe.add/drop/move

  deng113jie

  committed
  cb9f2a2

• minor change on name to make sure name in consistent over dataframe, dataset.key and h5group

  deng113jie

  committed
  013f401

• minor fixed of adding prefix b to string in test_session and test_dataset

  deng113jie

  committed
  18ce7ce

• minor fixed of adding prefix b to string in test_session and test_dataset

  deng113jie

  committed
  8657081

• Completed initial pass of memory fields for all types

  atbenmurray

  committed
  51e2fec

• categloric field.keys will return byte key as string, thus minor change on the unittest

  deng113jie

  committed
  955aede

• solved the byte to string issue, problem is dof python 3.7 and 3.8

  deng113jie

  committed
  039d8ee

• Miscellaneous field fixes; fixed issues with dataframe apply_filter / apply_index

  atbenmurray

  committed
  547bb88

• Moving most binary op logic out into a static method in FieldDataOps

  atbenmurray

  committed
  700635f

• Resolved conflicts in dataframe.py

  atbenmurray

  committed
  dec92ca

Commits on Apr 17, 2021

• Dataframe copy, move and drop operations have been moved out of the DataFrame static methods as python doesn't support static and instance method name overloading (my bad)

  atbenmurray

  committed
  b631932

• Fixing accidental introduction of CRLF to abstract_types

  atbenmurray

  committed
  4804417

• Fixed bug where apply_filter and apply_index weren't returning a field on all code paths; beefed up tests to cover this

  atbenmurray

  committed
  f16cb09

• Fixed issue in timestamp_field_create_like when group is set and is a dataframe

  atbenmurray

  committed
  37dac08

• persistence.filter_duplicate_fields now supports fields as well as ndarrays

  atbenmurray

  committed
  8c62e0a

• sort_on message now shows in verbose mode under all circumstances

  atbenmurray

  committed
  cfcb69b

• Fixed bug in apply filter when a destination dataset is applied

  atbenmurray

  committed
  22504ef

• Added a test to catch dataframe.apply_filter bug

  atbenmurray

  committed
  23c373d

• Bug fix: categorical_field_constructor in fields.py was returning numeric field when pass a h5py group as a destination for the field

  atbenmurray

  committed
  98624e6

• Copying data before filtering, as filtering in h5py is very slow

  atbenmurray

  committed
  76d8717

Commits on Apr 18, 2021

• Adding apply_spans functions to fields

  atbenmurray

  committed
  44a9c3d

• Fixed TestFieldApplySpansCount.test_timestamp_apply_spans that had been written but not run

  atbenmurray

  committed
  210f847

Commits on Apr 19, 2021

• Merge commit 'refs/pull/149/head' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  f8829ae

• Issues found with indexed strings and merging; fixes found for apply_filter and apply_index when being passed a field rather than an ndarray; both with augmented testing

  atbenmurray

  committed
  a7d6673

• Updated merge functions to consistently return memory fields if not provided with outputs but provided with fields

  atbenmurray

  committed
  3d322c2

Commits on Apr 20, 2021

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  294ec3a

• concate cat keys instead of padding

  Liyuan-Chen-1024

  committed
  e8edd9d

• some docstring for fields

  deng113jie

  committed
  c2ba9ff

• dataframe copy/move/drop and unittest

  deng113jie

  committed
  1a19815

• Fixing issue with dataframe move/copy being static

  atbenmurray

  committed
  1fb0362

• Updating HDF5Field writeable methods to account for prior changes

  atbenmurray

  committed
  937368e

• Adding merge functionality for dataframes

  atbenmurray

  committed
  cddcf66

• dataset.drop is a member method of Dataset as it did not make sense for it to be static or outside of the class

  atbenmurray

  committed
  534cbd4

• Added missing methods / properties to DataFrame ABC

  atbenmurray

  committed
  e5dc536

• minor update on dataframe static function

  deng113jie

  committed
  9b1a4a9

• minor update

  deng113jie

  committed
  1967685

• Merge commit 'refs/pull/157/head' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  6c3270a

Commits on Apr 21, 2021

• minor update session

  deng113jie

  committed
  6bdb08e

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  3680436

• minor comments update

  deng113jie

  committed
  cf5f5a6

• minor comments update

  deng113jie

  committed
  23ad71a

• add unittest for csv_reader_speedup.py

  Liyuan-Chen-1024

  committed
  75eefc0

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  3ddc916

Commits on Apr 22, 2021

• Merge commit 'refs/pull/137/head' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  3a6dc51

Commits on Apr 26, 2021

• count operation; logical not for numeric fields

  deng113jie

  committed
  c02fe32

Commits on Apr 27, 2021

• remove csv speed up work from commit

  deng113jie

  committed
  58159d0

• minor update

  deng113jie

  committed
  a7b477d

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  903f3b4

• unit test for logical not in numeric field

  deng113jie

  committed
  29f736d

Commits on Apr 28, 2021

• patch for get_spans for datastore

  deng113jie

  committed
  7fd9bdc

• tests for two fields

  deng113jie

  committed
  04df757

Commits on Apr 29, 2021

• add as type to numeric field

  deng113jie

  committed
  e47e15c

• Merge branch 'master' of https://github.com/deng113jie/ExeTera

  deng113jie

  committed
  a4b14fb

• seperate the unittest of get_spans by datastore reader

  deng113jie

  committed
  5492b94

• unittest for astype

  deng113jie

  committed
  25320bd

Commits on May 4, 2021

• Merge branch 'dspatch'

  deng113jie

  committed
  e289c6b

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  a59c13a

Commits on May 10, 2021

• update astype for fields, update logical_not for numeric fields

  deng113jie

  committed
  87df0bc

• remove dataframe view commits

  deng113jie

  committed
  0875149

Commits on May 11, 2021

• remove kwargs in get_spans in session, add fields back for backward compatibility

  deng113jie

  committed
  c335831

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  bdf783a

• remove filter view tests

  deng113jie

  committed
  ea20c60

Commits on May 27, 2021

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  778d56c

Commits on Jun 10, 2021

• partial commit on viewer

  deng113jie

  committed
  611601a

Commits on Sep 20, 2021

• Merge branch 'master' of https://github.com/KCL-BMEIS/ExeTera

  deng113jie

  committed
  66867b7

• remote view from git

  deng113jie

  committed
  fbe396f

Commits on Sep 22, 2021

• add df.describe unittest

  deng113jie

  committed
  c2c7185

Commits on Sep 23, 2021

• sync with upstream

  deng113jie

  committed
  78cc222

• Delete python-publish.yml

  deng113jie

  authored
  001134c

• Update python-app.yml

  deng113jie

  authored
  eb0bb76

• Update python-app.yml

  deng113jie

  authored
  d646ac2

• dataframe describe function

  deng113jie

  committed
  b55775b

• Merge branch 'master' of https://github.com/deng113jie/ExeTera

  deng113jie

  committed
  0d23098

• sync with upstream

  deng113jie

  committed
  7774c6f

Commits on Sep 30, 2021

• Update python-app.yml

  deng113jie

  authored
  ae1d621

Commits on Oct 5, 2021

• alternative get_timestamp notebook for discussion

  deng113jie

  committed
  3d5738e

• update the notebook output of linux and mac

  deng113jie

  committed
  4685c6b

• update format

  deng113jie

  committed
  dc38d28

Commits on Oct 11, 2021

• update the to_timestamp and to_timestamp function in utils

  Show description for 0df34bc
  deng113jie

  committed
  0df34bc

• add unittest for utils to_timestamp and to_datetimie

  deng113jie

  committed
  87353e3

• fix for pr

  deng113jie

  committed
  87abe47

Commits on Oct 12, 2021

• setup github action specific for windows for cython

  deng113jie

  committed
  a3719ef

• minor workflow fix

  deng113jie

  committed
  ed42f70

• add example pyx file

  deng113jie

  committed
  2157da2

• fix package upload command on win; as the git action

  Show description for 1abeaa7
  deng113jie

  committed
  1abeaa7

• add twine as tools

  deng113jie

  committed
  e77562e

• add linux action file

  deng113jie

  committed
  03208aa

• update the linux build command

  deng113jie

  committed
  35430f2

• build workflow for macos

  deng113jie

  committed
  de3e7e5

• minor update the macos workflow

  deng113jie

  committed
  a8af750

Commits on Oct 14, 2021

• fixed timestamp issue on windows by add timezone info to datetime

  deng113jie

  committed
  d41a24b

• finanlize workflow file, compile react to publish action only

  deng113jie

  committed
  c98b87c

• avoid the bytearray vs string error in windows by converting result to

  Show description for a57c413
  deng113jie

  committed
  a57c413

• fixing string vs bytesarray issue

  deng113jie

  committed
  764650b

Commits on Oct 15, 2021

• update categorical field key property, change the key, value to bytes if

  Show description for 4676901
  deng113jie

  committed
  4676901

• solved index must be np.int64 error

  deng113jie

  committed
  e5d74c6

• all unittest error on windoes removed

  deng113jie

  committed
  030d587

• Merge branch 'master' into win_actions

  deng113jie

  authored
  55e62eb

• minor update on workflow file

  deng113jie

  committed
  7cf7bae

• minor update workflow file

  deng113jie

  committed
  521142e

• minor fix: use pip install -r ; remove unused import in utils.py

  deng113jie

  committed
  9373fd2

• update action file

  deng113jie

  committed
  6f67ac4

Commits on Oct 18, 2021

• remove change on test_presistence on uint32 to int32

  deng113jie

  committed
  703a19a