Update fastai dependency

fastai2_audio/augment/preprocess.py

@@ -4,9 +4,9 @@
 
 # Cell
 from fastcore.transform import Transform
-from fastai2.data.all import *
+from fastai.data.all import *
 from ..core.signal import *
-from fastai2.vision.augment import RandTransform
+from fastai.vision.augment import RandTransform
 
 # Cell
 from librosa.effects import split

fastai2_audio/augment/signal.py

@@ -5,14 +5,17 @@
 
 # Cell
 from fastcore.transform import Transform
-from fastai2.data.all import *
+from fastai.data.all import *
 from ..core.signal import *
 from ..core.spectrogram import *
-from fastai2.vision.augment import RandTransform
+from fastai.vision.augment import RandTransform
 
 # Cell
 import colorednoise as cn
 
+# Cell
+#nbdev_comment _all_ = ["AudioPadType", "NoiseColor"]
+
 # Cell
 mk_class('AudioPadType', **{o:o.lower() for o in ['Zeros', 'Zeros_After', 'Repeat']},
          doc="All methods of padding audio as attributes to get tab-completion and typo-proofing")

fastai2_audio/augment/spectrogram.py

@@ -4,10 +4,10 @@
 
 # Cell
 from fastcore.transform import Transform
-from fastai2.data.all import *
+from fastai.data.all import *
 from ..core.all import *
 from .signal import AudioPadType, CropSignal
-from fastai2.vision.augment import RandTransform
+from fastai.vision.augment import RandTransform
 
 # Cell
 import librosa

fastai2_audio/core/config.py

@@ -4,7 +4,7 @@
            'AudioConfig']
 
 # Cell
-from fastai2.data.all import *
+from fastai.data.all import *
 from .signal import *
 from .spectrogram import *
 from ..augment.preprocess import Resample

fastai2_audio/core/signal.py

@@ -4,8 +4,8 @@
            'show_audio_signal', 'OpenAudio']
 
 # Cell
-from fastai2.torch_basics import *
-from fastai2.data.all import *
+from fastai.torch_basics import *
+from fastai.data.all import *
 import torchaudio
 
 from IPython.display import display, Audio

fastai2_audio/core/spectrogram.py

@@ -5,7 +5,7 @@
 
 # Cell
 from .signal import *
-from fastai2.data.all import *
+from fastai.data.all import *
 import torchaudio
 from inspect import signature
 from librosa.display import specshow

nbs/00_Core_Signal.ipynb

@@ -28,8 +28,8 @@
    "outputs": [],
    "source": [
     "#export\n",
-    "from fastai2.torch_basics import *\n",
-    "from fastai2.data.all import *\n",
+    "from fastai.torch_basics import *\n",
+    "from fastai.data.all import *\n",
     "import torchaudio\n",
     "\n",
     "from IPython.display import display, Audio\n",

nbs/01_Core_Spectrogram.ipynb

@@ -29,7 +29,7 @@
    "source": [
     "#export\n",
     "from fastai2_audio.core.signal import *\n",
-    "from fastai2.data.all import *\n",
+    "from fastai.data.all import *\n",
     "import torchaudio\n",
     "from inspect import signature\n",
     "from librosa.display import specshow\n",

nbs/02_Core_Config_Pipeline.ipynb

@@ -28,7 +28,7 @@
    "outputs": [],
    "source": [
     "#export\n",
-    "from fastai2.data.all import *\n",
+    "from fastai.data.all import *\n",
     "from fastai2_audio.core.signal import *\n",
     "from fastai2_audio.core.spectrogram import *\n",
     "from fastai2_audio.augment.preprocess import Resample\n",

nbs/03_Core_Overview.ipynb

@@ -49,7 +49,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from fastai2.data.external import *\n",
+    "from fastai.data.external import *\n",
     "data_path = untar_data(URLs.SPEAKERS10, extract_func=tar_extract_at_filename)\n",
     "audio_files = get_audio_files(data_path)"
    ]

nbs/10_Augment_Preprocess.ipynb

@@ -29,9 +29,9 @@
    "source": [
     "#export\n",
     "from fastcore.transform import Transform\n",
-    "from fastai2.data.all import *\n",
+    "from fastai.data.all import *\n",
     "from fastai2_audio.core.signal import *\n",
-    "from fastai2.vision.augment import RandTransform"
+    "from fastai.vision.augment import RandTransform"
    ]
   },
   {

nbs/11_Augment_Signal.ipynb

@@ -29,10 +29,10 @@
    "source": [
     "#export\n",
     "from fastcore.transform import Transform\n",
-    "from fastai2.data.all import *\n",
+    "from fastai.data.all import *\n",
     "from fastai2_audio.core.signal import *\n",
     "from fastai2_audio.core.spectrogram import *\n",
-    "from fastai2.vision.augment import RandTransform"
+    "from fastai.vision.augment import RandTransform"
    ]
   },
   {

nbs/12_Augment_Spectrogram.ipynb

@@ -29,10 +29,10 @@
    "source": [
     "#export\n",
     "from fastcore.transform import Transform\n",
-    "from fastai2.data.all import *\n",
+    "from fastai.data.all import *\n",
     "from fastai2_audio.core.all import *\n",
     "from fastai2_audio.augment.signal import AudioPadType, CropSignal\n",
-    "from fastai2.vision.augment import RandTransform"
+    "from fastai.vision.augment import RandTransform"
    ]
   },
   {

nbs/13_Augment_Pipeline.ipynb

@@ -26,7 +26,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from fastai2.data.all import *\n",
+    "from fastai.data.all import *\n",
     "from fastai2_audio.core.all import *\n",
     "from fastai2_audio.augment.all import *"
    ]

nbs/setup_example.py

@@ -1,6 +1,6 @@
-from fastai2.data.all import *
+from fastai.data.all import *
 from fastai2_audio.core.all import *
-from fastai2.vision.augment import RandTransform
+from fastai.vision.augment import RandTransform
 
 __all__ = ["ex_files", "GenExample", "show_transform"]
 

settings.ini

@@ -15,7 +15,7 @@ license = apache2
 status = 2
 nbs_path = nbs
 doc_path = docs
-requirements = torchaudio librosa soundfile fastai2 colorednoise numba<0.49
+requirements = torchaudio librosa soundfile fastai colorednoise numba<0.49
 git_url = https://github.com/rbracco/fastai2_audio/tree/master/
 lib_path = fastai2_audio
 title = fastai2_audio