Merge branch 'master' of https://github.com/OpenSourceEconomics/ose-c…

…ourse-scientific-computing

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
     -   id: debug-statements
     -   id: end-of-file-fixer
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.29.0
+    rev: v2.29.1
     hooks:
     -   id: pyupgrade
         args: [--py36-plus]
@@ -19,11 +19,11 @@ repos:
     hooks:
     -   id: reorder-python-imports
 -   repo: https://github.com/psf/black
-    rev: 21.9b0
+    rev: 21.11b1
     hooks:
     -   id: black
 -   repo: https://github.com/asottile/blacken-docs
-    rev: v1.11.0
+    rev: v1.12.0
     hooks:
     -   id: blacken-docs
         additional_dependencies: [black==20.8b1]
@@ -38,7 +38,7 @@ repos:
             flake8-todo, flake8-unused-arguments, pep8-naming, pydocstyle, Pygments,
         ]
 -   repo: https://github.com/PyCQA/doc8
-    rev: 0.9.1
+    rev: 0.10.1
     hooks:
     -   id: doc8
 #-   repo: local

environment.yml

@@ -7,37 +7,31 @@ channels:
 
 dependencies:
 - chaospy
-- estimagic
 - flake8
-- ipython
-- ipykernel
 - jupyterlab
-- jupyter
 - jupyter_contrib_nbextensions
 - jupyter_nbextensions_configurator
 - matplotlib
-- black>=20.8b1
+- black
 - nbsphinx
 - numpy
 - pandoc
-- pandas>=1.1.0
+- pandas
 - pip
 - pre-commit
 - pytest
 - pytest-black
 - pytest-flake8
 - pytest-repeat
-- respy
-- restructuredtext_lint
 - scipy
 - scikit-learn
 - seaborn
-- temfpy>=1.2.0
+- temfpy
 - numdifftools  
 - chaospy
 - scikit-learn
 - pip:
     - black-nb
     - flake8-nb
     - sphinx_rtd_theme
-    - sphinxcontrib-bibtex>=2.0.0
+    - sphinxcontrib-bibtex

labs/approximation/approximation_algorithms.py

@@ -2,8 +2,8 @@
 import numpy as np
 from scipy.interpolate import interp1d
 
-from approximation_auxiliary import get_chebyshev_nodes
-from approximation_auxiliary import get_uniform_nodes
+from labs.approximation.approximation_auxiliary import get_chebyshev_nodes
+from labs.approximation.approximation_auxiliary import get_uniform_nodes
 
 
 def get_interpolator_runge_baseline(func):

labs/approximation/approximation_plots.py

@@ -6,12 +6,12 @@
 from scipy.interpolate import interp1d
 from temfpy.interpolation import runge
 
-from approximation_algorithms import get_interpolator_monomial_flexible_nodes
-from approximation_auxiliary import get_chebyshev_nodes
-from approximation_auxiliary import get_uniform_nodes
-from approximation_auxiliary import spline_basis
-from approximation_problems import problem_reciprocal_exponential
-from approximation_problems import problem_two_dimensions
+from labs.approximation.approximation_algorithms import get_interpolator_monomial_flexible_nodes
+from labs.approximation.approximation_auxiliary import get_chebyshev_nodes
+from labs.approximation.approximation_auxiliary import get_uniform_nodes
+from labs.approximation.approximation_auxiliary import spline_basis
+from labs.approximation.approximation_problems import problem_reciprocal_exponential
+from labs.approximation.approximation_problems import problem_two_dimensions
 
 
 def plot_runge():