convert tsfeatures lib to nbdev framework#39

Open

jope35 wants to merge 53 commits intoNixtla:mainfrom

jope35 commented Jan 4, 2024 •

edited

Loading

This pr uses the nbdev framework to build the tsfeatures lib.
All old files are copied 1-on-1, eager to get some feedback on this


          convert lib to nbdev

8f0c1cc

jope35 changed the title ~~convert lib to nbdev~~ convert tsfeatures lib to nbdev framework

Contributor

jmoralez commented Jan 9, 2024

Hey @jope35, thanks for the initiative, we support this. Just some requests before we review this more thoroughly:

Please restore the files under the .github folder.
Please restore the .gitignore, LICENSE and setup.py files.
Please remove the pre-commit-config.yaml and .ruff.toml. These can be added in a later PR so that we can focus on those changes specifically.
Please restore and move the compare_with_r.py file to a scripts folder or similar.

Author

jope35 commented Jan 10, 2024

@jmoralez thanks for the quick scan. will incorporate the changes 👍

jope35 added 7 commits

January 10, 2024 17:02


          remove pre-commit and .ruff

61112fc


          update lincense

a8d3b1e


          restore .github folder

527f3d9


          remove ruff and pre-commit from dev reqs and add ryp2

3dd8d5f


          restore setup.py

5e03313


          restore .gitignore


          create nbdev specific .gitconfig and .gitattributes

528b541

review-notebook-app bot commented Jan 16, 2024

Check out this pull request on

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

Contributor

jmoralez commented Jan 16, 2024 •

edited

Loading

Some more requests:

Please update the settings.ini file with the current settings in setup.py, e.g. version should be 0.4.5. For the author and other stuff you can refer to this file.
Please update the setup.py file. I believe you can copy this one
Please remove the ordering from the notebooks (the number prefixes)

jmoralez suggested changes

View reviewed changes

tsfeatures/__init__.py Show resolved Hide resolved

jmoralez reviewed

View reviewed changes

nbs/00_utils.ipynb Show resolved Hide resolved

nbs/00_utils.ipynb Show resolved Hide resolved

nbs/00_utils.ipynb Show resolved Hide resolved

nbs/01_features.ipynb Show resolved Hide resolved

jope35 added 4 commits

January 17, 2024 11:40


          remove *.ipynb from gitignore

846508e


          align settings and setup

bf80383


          refactor: Restructure notebooks and utils

ed0266f

Renamed and reorganized notebooks for clarity. Moved some utils to hide cells. Updated version and doc links. Added script to compare features with R. Made other minor code tweaks.


          update settings with nixtla user

ddabac9

Contributor

jmoralez commented Jan 30, 2024

Thanks for the updates. Can you please merge tsfeatures_core.ipynb with features.ipynb? They both should be the same notebook that exports the tsfeatures module.


          merged core and featrues into one notebook

5d420e0

Author

jope35 commented Feb 4, 2024

Merge tsfeatures_core.ipynb with features.ipynb, the result is exported to tsfeatures.

jmoralez suggested changes

View reviewed changes

Contributor

jmoralez left a comment

Please also add a workflow that runs nbdev_test. You can refer to this

setup.py Outdated Show resolved Hide resolved

tsfeatures/tsfeatures.py Outdated Show resolved Hide resolved

tsfeatures/tsfeatures.py Outdated Show resolved Hide resolved

tsfeatures/tsfeatures.py Show resolved Hide resolved

tsfeatures/tsfeatures.py Outdated Show resolved Hide resolved

tsfeatures/tsfeatures.py Show resolved Hide resolved

tsfeatures/tsfeatures.py Outdated Show resolved Hide resolved

tsfeatures/tsfeatures.py Show resolved Hide resolved

tsfeatures/tsfeatures.py Outdated Show resolved Hide resolved

jope35 added 6 commits

February 9, 2024 21:17


          descriptive stats on cluster results

5fe9589


          add github action for testing

cb60c1b


          modified setup

c0eb867


          include a pip reqs file

0135e1b


          exclude rpy2

2dd6a65


          run nbdev_export

e9c1b94

jmoralez suggested changes

View reviewed changes

Contributor

jmoralez left a comment

Please also move the test from the test_features notebook to the tsfeatures one

.github/workflows/ci.yml Outdated Show resolved Hide resolved

.github/workflows/ci.yml Outdated Show resolved Hide resolved

README.md Show resolved Hide resolved

README.md Outdated

Contributor

jmoralez Feb 15, 2024

Seems like from this point onwards this is duplicated

Author

jope35 Feb 24, 2024

de-duplicated

Contributor

jmoralez Mar 20, 2024

This is still duplicated

requirements.txt Outdated Show resolved Hide resolved

settings.ini Outdated Show resolved Hide resolved

jope35 added 3 commits

February 21, 2024 19:37


          add import stmt

cbdb352


          add star import

3a57f9c


          small cleanup

jmoralez suggested changes

View reviewed changes

Contributor

jmoralez left a comment

Thanks for the changes! I think we're almost there

tsfeatures/tsfeatures.py Show resolved Hide resolved

jope35 added 6 commits

February 29, 2024 21:50


          cleanup notebooks


          add os to runs-on

00de734


          change order of runs-on

28f400d


          matrix python version and os

4cd2e2c


          optimize ci file

cf77218


          no cache

824d7ce

jmoralez suggested changes

View reviewed changes

README.md Outdated

Contributor

jmoralez Mar 20, 2024

This is still duplicated

tsfeatures/tsfeatures_r.py

-              #!/usr/bin/env python
-              # coding: utf-8
-              from typing import List

Contributor

jmoralez Mar 20, 2024

Can you please add this to a new notebook nbs/tsfeatures_r.ipynb?

Author

jope35 Apr 23, 2024

i added the notebook and extended the ci run to include R also added rpy2 in the dependencies list, @jmoralez maybe move it to the dev dependencies as it gives some troubles installing on windows

tsfeatures/tests/test_holt_parameters.py

		@@ -1,18 +0,0 @@
		#!/usr/bin/env python

Contributor

jmoralez Mar 20, 2024

Please add these tests to nbs/tsfeatures.ipynb

Author

jope35 Apr 23, 2024

added the tests to the tsfeatures.ipynb

tsfeatures/tests/test_mutability.py

		@@ -1,31 +0,0 @@
		import numpy as np

Contributor

jmoralez Mar 20, 2024

Please add these tests to nbs/tsfeatures.ipynb

Author

jope35 Apr 23, 2024

added the tests to the tsfeatures.ipynb

tsfeatures/tests/test_pacf_features.py

		@@ -1,10 +0,0 @@
		#!/usr/bin/env python

Contributor

jmoralez Mar 20, 2024

Please add these tests to nbs/tsfeatures.ipynb

Author

jope35 Apr 23, 2024

added the tests to the tsfeatures.ipynb

tsfeatures/tests/test_small_ts.py

		@@ -1,36 +0,0 @@
		import numpy as np

Contributor

jmoralez Mar 20, 2024

Please add these tests to nbs/tsfeatures.ipynb

Author

jope35 Apr 23, 2024

added the tests to the tsfeatures.ipynb

tsfeatures/tests/test_sparsity.py

		@@ -1,25 +0,0 @@
		#!/usr/bin/env python

Contributor

jmoralez Mar 20, 2024

Please add these tests to nbs/tsfeatures.ipynb

Author

jope35 Apr 23, 2024

added the tests to the tsfeatures.ipynb

tsfeatures/tests/test_statistics.py

		@@ -1,25 +0,0 @@
		#!/usr/bin/env python

Contributor

jmoralez Mar 20, 2024

Please add these tests to nbs/tsfeatures.ipynb

Author

jope35 Apr 23, 2024

added the tests to the tsfeatures.ipynb

jope35 added 19 commits

April 19, 2024 15:18


          include tests and R CI

88ae6b7


          update readme


          alter rpy2 version

22a1767


          debug R install

02f1a6b


          more debug

936f0ec


          more debug2

d679122


          one string

80f5d96


          asdf

bff351c


          alter rpy2 version

8b9a01f


          update R version


          exclude the R dependency

7e92696


          other R settings

00a9b9d


          explicit PATH

b437028


          echo rhome

903876d


          export R functions

523ccf5


          include ubuntu

d3c4324


          include fastcore explicitly as a dev dep

233ea75


          no parallel

180136a


          Merge branch 'main' into main

dbd5047

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet