github.com/ActivityWatch/aw-core commits | Ecosyste.ms: OpenCollective

Merge pull request #36 from ActivityWatch/dev/assert_version

Added assert version

19b0e1f187e92480c2191e5433b6d6fdc774da3d authored over 7 years ago by Erik Bjäreholt <[email protected]>

added util import to __init__ to fix coverage issue

5f90f0ecff12da5d99219b13f22330c4d8ed0aa3 authored over 7 years ago by Erik Bjäreholt <[email protected]>

Merge branch 'master' of github.com:ActivityWatch/aw-core into dev/assert_version

65e37e3ac1468e2057619e5f0b6630b3d5cfa059 authored over 7 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #35 from ActivityWatch/dev/new-log-formatting

changed log formatter to use logger name instead of filename

1a2dbeb5c17e65e7127683c70d0ded8caf3f6f68 authored over 7 years ago by Erik Bjäreholt <[email protected]>

added assert_version helper function

763533244e7a2c171465f8e2794da9141c13e771 authored over 7 years ago by Erik Bjäreholt <[email protected]>

added `pragma: no cover` to all log-helper methods

be0aeb0fadc0f693a39c4b0e93f6032f9e545f9d authored over 7 years ago by Erik Bjäreholt <[email protected]>

changed log formatter to use logger name instead of filename

8b129d9c6abb67f08fa528fb458650ceebf5c5bc authored over 7 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #34 from ActivityWatch/dev/views-next

Dev/views next

af83071b820dd4b7dbbad12da1b627303a0bfc99 authored over 7 years ago by Erik Bjäreholt <[email protected]>

added pragma no cover to raise exception statements

0d4887ea87b462170eaa04372b35788d1d47ae3a authored over 7 years ago by Erik Bjäreholt <[email protected]>

removed Datastore typeannotations

c42b883e21baa6ed4261b946288fff238b80cecb authored over 7 years ago by Erik Bjäreholt <[email protected]>

removed typecheck from makefile test target

90db82f54f4f3525e9308f4221d2492a7528da2b authored over 7 years ago by Erik Bjäreholt <[email protected]>

[appveyor] testing another potential mypy culprit

db5ef1e242fa83576b13af2c78ec776ddaf90719 authored over 7 years ago by Erik Bjäreholt <[email protected]>

[appveyor] testing another appveyor mypy fix

afa9acf33de8ee1dafd2c59b1fe3d4ed9f28bc8d authored over 7 years ago by Erik Bjäreholt <[email protected]>

removed problematic pymongo stub

4524b1e85dd224344a571db17dc13fd1c360ea1b authored over 7 years ago by Erik Bjäreholt <[email protected]>

[appveyor] added python3 to PATH

77eef5f619f6331ef4b6cfe0f13fbd1c242d1ade authored over 7 years ago by Erik Bjäreholt <[email protected]>

Multiple changes, see full commit msg...

- Fixed __init__.py imports for views and cached_views
- Added function to get latest logfile
...

a6122826d2f99045d27dbd653f6aaad65ce67d3b authored over 7 years ago by Erik Bjäreholt <[email protected]>

added typing import

5366511acb955935c676804b13af81cb673f9026 authored over 7 years ago by Erik Bjäreholt <[email protected]>

improved typing further (again)

c57194f67be02783db7869c21ad590535af6b769 authored over 7 years ago by Erik Bjäreholt <[email protected]>

improved typing further

a6a6ffbe3881f1001bd03b9096c6f81ea7bea1bc authored over 7 years ago by Erik Bjäreholt <[email protected]>

improved typing

2741ab47532937217fbe9d975d9bd9d1709986ff authored over 7 years ago by Erik Bjäreholt <[email protected]>

started cleaning up the views stuff

f9ec4ee422a3e3715367cea3b13bec2120fe7dd7 authored over 7 years ago by Erik Bjäreholt <[email protected]>

[ci/appveyor] fixed mingw/make config

1de0a9034899663f247b627a492024b73f7ec2de authored over 7 years ago by Erik Bjäreholt <[email protected]>

Changed so that AppVeyor uses Makefile

7e2c612e514f233ddb2773a8536e8bcc77937650 authored over 7 years ago by Erik Bjäreholt <[email protected]>

removed sqlite datastore

200fdc892a5e7223e9f2278db34d4911155af9cd authored over 7 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #31 from ActivityWatch/dev/peewee-versioning

basic versioning of peewee db file

70c29509211ef18d36f32bdf6a25c6528f5f7e34 authored over 7 years ago by Erik Bjäreholt <[email protected]>

changed a <= which should have been a <

8399812ead9c74b4c7c8f5ba4e1fb8b2b47ca054 authored over 7 years ago by Erik Bjäreholt <[email protected]>

[chore] bumped version to 0.3.1

d40928eff7f5cc0a7f62e18d6288df457fbf7fc0 authored over 7 years ago by Erik Bjäreholt <[email protected]>

basic versioning of peewee db file

ea48212fdd54ea556bef0e5aa3204bb8aa84e8f6 authored over 7 years ago by Erik Bjäreholt <[email protected]>

added log message with path of database file

75d141f625aad167a23b6231cd3813e773d87d8d authored over 7 years ago by Erik Bjäreholt <[email protected]>

fixed a package issue (hopefully)

23e1d7452f53fccda26cdc91739a395e2aa1e85a authored over 7 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #23 from ActivityWatch/dev/next

Dev/next

834bf9a37a2d8d78b758d11b88b8e60b8e26b999 authored over 7 years ago by Erik Bjäreholt <[email protected]>

Merge branch 'dev/next' of github.com:ActivityWatch/aw-core into dev/next

e0d2bbe0508af9780877286aa71809e2903fb802 authored over 7 years ago by Erik Bjäreholt <[email protected]>

deduplicated include/exclude_keyvals filter into filter_keyvals

d74faadb4dc2d04e6b28a6792abe7a8adf7f781b authored over 7 years ago by Erik Bjäreholt <[email protected]>

removed tinydb requirements

fb30f26d18189beec6c5be364c84fa3dacde8332 authored over 7 years ago by Erik Bjäreholt <[email protected]>

removed tinydb requirements

d2283ccdb8506660dd8db59dee20aea554a72de2 authored over 7 years ago by Erik Bjäreholt <[email protected]>

cleaned up travis config and Makefile

24da410e32355f3c88645f7a180516e265385ed6 authored over 7 years ago by Erik Bjäreholt <[email protected]>

migrated package metadata into __about__.py

1f78bc5717b6f36c5f23396c8d5486a5679597be authored over 7 years ago by Erik Bjäreholt <[email protected]>

fixed setup.py

eec75a30daf87d19168176e70a9f8f255d307e4a authored over 7 years ago by Erik Bjäreholt <[email protected]>

bumped version to 0.3 and added Johan to authors

1ff1e0944822b850e2643d87a927683707bf738d authored over 7 years ago by Erik Bjäreholt <[email protected]>

Removed unnecessary landscape config file

cabaf712347507488bee8fe9f8e150b68e45d86d authored over 7 years ago by johan-bjareholt <[email protected]>

Fixed broken filter exception messages

f19755b2ec6b643deb9ce8fe38c7933d9821f7f7 authored over 7 years ago by johan-bjareholt <[email protected]>

Fixed so event model always has a timestamp and fixed bug in to_json_str

dfadd6fbcc60cd919876069f2b611254db604b62 authored over 7 years ago by johan-bjareholt <[email protected]>

Improved tests and cleaned up code for event model

99d3118aaf4105c4f0d406c83204b7c60a8477db authored over 7 years ago by johan-bjareholt <[email protected]>

Fixed merge_queries which used old duration dict format

59f8ec0bcb2ba5b57d5cc26ff622e771a125ff89 authored over 7 years ago by johan-bjareholt <[email protected]>

Simplified chunking tranform

f5d9bec9044d423d3281b09e50fa387eacdce166 authored over 7 years ago by johan-bjareholt <[email protected]>

Made peewees event.bucket indexed again

69951ea0c1735915e2ba8bb739d5dd139bc5485c authored over 7 years ago by johan-bjareholt <[email protected]>

Buckets in peewee now use a integer as primary key so we get less disk usage on events

6d4f00ba6f33aa5042f692654d5bd9bcb94aaff5 authored over 7 years ago by johan-bjareholt <[email protected]>

Fixed broken duration in peewees replace_last

5c7d414119a4885418a3202722356892ce8327d9 authored over 7 years ago by johan-bjareholt <[email protected]>

Made peewee eventmodel.bucket into a foreign key

e5dac9494fa54fb5bd07aebdb60c2a8b32320a7f authored over 7 years ago by johan-bjareholt <[email protected]>

Configured landscape to use python3

cd79fc83be94101b904c0fff88c2f74548257e0c authored over 7 years ago by johan-bjareholt <[email protected]>

Removed tinydb stubs

7ac1a9a9e825d717ee6fa5a572544b24b2648b8c authored over 7 years ago by johan-bjareholt <[email protected]>

Fixed bad duration in mongodb

ffdb3df297cee53b5d39a48c7122587a27877518 authored over 7 years ago by johan-bjareholt <[email protected]>

Removed TinyDB storage

2f56dd45ff562d718e216e5527e212b6ad9932ad authored over 7 years ago by johan-bjareholt <[email protected]>

100% line coverage on event again

bc65c7e583e54ffd266358a9aab50cd99840987d authored over 7 years ago by johan-bjareholt <[email protected]>

Added back mongodbstorage (mistakenly removed)

21db52ad70bfc9e2021e768e4614e3352a9aec69 authored over 7 years ago by johan-bjareholt <[email protected]>

Fixed mypy error

aee46f4fe87b55e07717743d0c3b59e6246d558f authored over 7 years ago by johan-bjareholt <[email protected]>

Merge remote-tracking branch 'origin/master' into dev/next

2504c4f19d66941c6a7b1aca60c883e42e8c88b6 authored over 7 years ago by johan-bjareholt <[email protected]>

Fixed broken view test

08c00bf69332d98ce406369de09ce59a20f2544d authored over 7 years ago by johan-bjareholt <[email protected]>

Merge pull request #30 from ActivityWatch/dev/db-init-fix

[peewee] Improved db initialization

b00e4c54bbd3e8d051d3906c09721f4db37f4d5f authored over 7 years ago by Erik Bjäreholt <[email protected]>

improved db initialization

7d1bb6773b7b4e6fe4832fe7dd9a0b1dae5ed9c1 authored over 7 years ago by Erik Bjäreholt <[email protected]>

Removed unit from duration, removed label event field, redid chunking by data key instead of by label, include/exclude filters now go by key+val

859edff0796d783e6dc294c8f75b2e4b81c0025b authored over 7 years ago by johan-bjareholt <[email protected]>

Properly removed the count property from event model

bd2d0e6a729e01b23079ebbc4b244430d906917c authored over 7 years ago by johan-bjareholt <[email protected]>

Fixed event tests

92bf97a36cb036d086c1c1524d1aa570665f650c authored over 7 years ago by johan-bjareholt <[email protected]>

[setup.py] added Python 3 classifier

f515e83b76d14dd7fa01722b25bb6d06358197f4 authored over 7 years ago by Erik Bjäreholt <[email protected]>

Merge remote-tracking branch 'origin/master' into dev/next

c9b4390597b3c88ee9afd6032c1899334b647ff9 authored over 7 years ago by johan-bjareholt <[email protected]>

Moved view caching to separate file

d17a7203ad8cc3905a3a33446c48e69dc71ae852 authored over 7 years ago by johan-bjareholt <[email protected]>

Removed unused eventmodel fields that should later be put in data instead

e32b184d93edf0ef3221b3fc1fd229084cdecdc7 authored over 7 years ago by johan-bjareholt <[email protected]>

Renamed keyvals to data

cf4fb1835abb5990d9c0e2c00c1ab5b7d77e527b authored over 7 years ago by johan-bjareholt <[email protected]>

deprecated decorator now only warns once per function

12442bca2ec4f0310452e06fe3dc4c990db58be5 authored over 7 years ago by Erik Bjäreholt <[email protected]>

[Makefile] added test target

9d9713a73ec937ef8d31dddcb5915b486cc7a5fa authored over 7 years ago by Erik Bjäreholt <[email protected]>

[travis] added use of Makefile

2034369e678cede13007e3fe0ac7f7fc0e6ababa authored over 7 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #26 from ActivityWatch/dev/makefile

Added Makefile

475ebc6b6720cd5fe3c8d0f1e09f42b21166317e authored over 7 years ago by Erik Bjäreholt <[email protected]>

fixed invalid coverage complaints using `pragma: no branch`

a9aaa67a03bf1749278e0fef7e62fabe9e7f9240 authored over 7 years ago by Erik Bjäreholt <[email protected]>

fixed invalid coverage complaints

c3a38b08460362e26773f79aa09ed378f47b85bc authored over 7 years ago by Erik Bjäreholt <[email protected]>

removed MongoDB support on Windows and macOS

d323b3da2e0ba8945e3d35439534680afbadba09 authored over 7 years ago by Erik Bjäreholt <[email protected]>

added Makefile

23bf3ece0a15a8d22fe17b5614a585b268568aeb authored over 7 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #25 from ActivityWatch/dev/decorators

Added some useful decorators

ed2a79a93ff4919949d36bbf437d7196fd9bd8e7 authored over 7 years ago by Erik Bjäreholt <[email protected]>

added `pragma: no cover` to decorators

075b9b4891ac40938d4bdc7fa791179e06f44b61 authored over 7 years ago by Erik Bjäreholt <[email protected]>

added restart_on_exception decorator, added source of deprecated decorator

d7eb56989c188d90d4a872de5d6350f78d81c6a6 authored over 7 years ago by Erik Bjäreholt <[email protected]>

added deprecated decorator

183af1b56e7e7881359ce11bae2c525dbdd7c536 authored over 7 years ago by Erik Bjäreholt <[email protected]>

Changed to Windows-compatible filename for logs

b9b700975216656c1d969a02c187fdd4f0100425 authored over 7 years ago by Erik Bjäreholt <[email protected]>

Added query test for label_chunk

f7d467f3687e5ebeb22cf3b1eb3c437f160e3d52 authored almost 8 years ago by Johan Bjäreholt <[email protected]>

Improved view tests

a0012c7992a244bb6c571ab1e343609c80a69ad4 authored almost 8 years ago by Johan Bjäreholt <[email protected]>

Possibly fixed timezone issue on cached views

38ee24250a75784f402155c450b2427f13c6a718 authored almost 8 years ago by Johan Bjäreholt <[email protected]>

Improved MergeQueriesTest

ac5a71eeb5e40fdcc37123b7983b3f404913163a authored almost 8 years ago by Johan Bjäreholt <[email protected]>

Fixed merge query and added test

27d5f0cd2b3e7af47d0bb7c51181910933f25303 authored almost 8 years ago by Johan Bjäreholt <[email protected]>

Improved Event tests and minor refactoring

d47136e2569a8578bf05d064fcd93021c818f285 authored almost 8 years ago by Johan Bjäreholt <[email protected]>

More work on multiqueries

0131668ddf28bbeb530095dd39e8fe3f638d79f6 authored almost 8 years ago by Johan Bjäreholt <[email protected]>

Fixed windows compability

e20c9d19dbb50a91dd1283922f710e7078e68e5a authored almost 8 years ago by Johan Bjäreholt <[email protected]>

Removed view query and hopefully fixed windows cache compability

109bad03699df6b95ea65f235ab216ddef2857b4 authored almost 8 years ago by Johan Bjäreholt <[email protected]>

View cleanup

bd151897b636a28fac17fc70f11004c51969d180 authored almost 8 years ago by Johan Bjäreholt <[email protected]>

Fixed broken views

dda79aac33cd558c61ec7d463273cfdc98b89717 authored almost 8 years ago by Johan Bjäreholt <[email protected]>

Possibly a windows compatability fix

67edab2b44b880d2e9457c03b4e2a7115ee9c538 authored almost 8 years ago by Johan Bjäreholt <[email protected]>

Initial work on multi-view views

f39ed79df05dbbffdecbd6c1450fc50f2e6f25c6 authored almost 8 years ago by Johan Bjäreholt <[email protected]>

added LICENSE

9e36dd8462ec475f2d5731944ce21e70b498fb82 authored almost 8 years ago by Erik Bjäreholt <[email protected]>

Chunks now have no duration if events have no duration

b7fc87d9ddf5e36716b692aed39a0e0fa43447a3 authored almost 8 years ago by Johan Bjäreholt <[email protected]>

Merge remote-tracking branch 'origin/master' into dev/next

39c87a2dc4955d46541f48d9122bdfccc9cf1adc authored almost 8 years ago by Johan Bjäreholt <[email protected]>

Added label_chunk test

c205318e7fbf2c7c78ab0e1e066f5161f3513e8e authored almost 8 years ago by Johan Bjäreholt <[email protected]>

Fixed tests

dc2312f77f13041415d66368a6b950d3c9e07801 authored almost 8 years ago by Johan Bjäreholt <[email protected]>

Merge pull request #22 from ActivityWatch/dev/peewee-testing-db

Separated prod and testing database files in the peewee datastore

f157edaec8a88c831cbad438c312843d53ada59f authored almost 8 years ago by Erik Bjäreholt <[email protected]>