Merge pull request #61 from OpenSourceEconomics/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

Author: MaxBlesch

.github/workflows/continuous-integration-workflow.yml

@@ -15,15 +15,15 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        python-version: ['3.6', '3.7', '3.8']
+        python-version: ['3.9']
     steps:
       - uses: actions/checkout@v2
       - uses: conda-incubator/setup-miniconda@v2
         with:
+          environment-file: environment.yml
           activate-environment: ruspy
           auto-update-conda: true
-          environment-file: environment.yml
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{ matrix.python-version}}
 
       - name: Run pytest.
         shell: bash -l {0}

.pre-commit-config.yaml

@@ -2,12 +2,12 @@
 exclude: ^\.
 repos:
 -   repo: https://github.com/asottile/reorder_python_imports
-    rev: v2.6.0
+    rev: v3.8.3
     hooks:
     -   id: reorder-python-imports
         files: '(\.pyi?|wscript)$'
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.3.0
     hooks:
     -   id: check-yaml
         exclude: 'meta\.yaml'
@@ -21,39 +21,38 @@ repos:
         args: [--autofix, --no-sort-keys]
     -   id: trailing-whitespace
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.23.3
+    rev: v3.0.0
     hooks:
     -   id: pyupgrade
         args: [
           --py36-plus
         ]
 -   repo: https://github.com/asottile/blacken-docs
-    rev: v1.10.0
+    rev: v1.12.1
     hooks:
     -   id: blacken-docs
         additional_dependencies: [black==19.3b0]
         files: '(\.md|\.rst)$'
 -   repo: https://github.com/psf/black
-    rev: 21.7b0
+    rev: 22.10.0
     hooks:
     -   id: black
         files: '(\.pyi?|wscript)$'
         language_version: python
 -   repo: https://github.com/PyCQA/doc8
-    rev: 0.9.0
+    rev: v1.0.0
     hooks:
         -   id: doc8
             args: [--max-line-length, "88"]
 -   repo: https://github.com/PyCQA/flake8
-    rev: 3.9.2
+    rev: 5.0.4
     hooks:
     -   id: flake8
-        files: '(\.py|wscript)$'
+        types: [python]
         additional_dependencies: [
-            flake8-bugbear, flake8-builtins, flake8-comprehensions,
-            flake8-deprecated, flake8-docstrings, flake8-eradicate, flake8-print,
-            flake8-rst-docstrings, flake8-todo, flake8-type-annotations,
-            pep8-naming, pydocstyle
+            flake8-alfred, flake8-bugbear, flake8-builtins, flake8-comprehensions,
+            flake8-docstrings, flake8-eradicate, flake8-print,
+            flake8-todo, pep8-naming, pydocstyle,
         ]
         # Harmonizing flake8 and black
         args: [

.readthedocs.yml

@@ -4,8 +4,8 @@ build:
   image: latest
 
 python:
-  version: 3.7
+  version: 3.8
 
 conda:
-  environment: environment.yml
+  environment: docs/rtd_environment.yml
 

docs/rtd_environment.yml

@@ -0,0 +1,24 @@
+name: rtd_ruspy
+
+channels:
+  - conda-forge
+  - nodefaults
+
+dependencies:
+  - python=3.8
+  - pip
+  - sphinx
+
+  - ipython
+  - nbsphinx
+  - numpydoc
+  - sphinx-autobuild
+  - sphinx-autoapi
+  - numba
+  - numpy
+  - nlopt
+  - pytest
+  - estimagic
+
+  - pip:
+    - sphinx_rtd_theme

docs/source/conf.py

@@ -77,7 +77,7 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

environment.yml

@@ -3,25 +3,21 @@ channels:
   - opensourceeconomics
   - conda-forge
 dependencies:
-  - python>=3.6
+  - python=3.9
   - numpy
-  - sphinx
   - pandas
-  - statsmodels
   - pre-commit
-  - pytest>=6.2.1
+  - pytest
   - pytest-xdist
   - pytest-cov
   - scipy
-  - matplotlib
-  - numpydoc
   - jupyter
   - numba
   - pip
   - estimagic
+  - black
+  - flake8
+  - pdbpp
   - nlopt
   - pip:
-      - flake8
-      - black
-      - jupyter_contrib_nbextensions
-      - sphinx_rtd_theme
+      - jupyter_contrib_nbextensions

ruspy/estimation/mpec.py

@@ -427,7 +427,7 @@ def function_wrapper(mpec_params, grad):
 def wrap_nlopt_constraint(function, args):
     def function_wrapper(mpec_params):
         result = function(
-            result=np.array([]), mpec_params=mpec_params, *args, grad=np.array([])
+            *args, result=np.array([]), mpec_params=mpec_params, grad=np.array([])
         )
         return result
 

ruspy/model_code/cost_functions.py

@@ -102,8 +102,8 @@ def cubic_costs(num_states, params, scale):
     states = np.arange(num_states)
     costs = (
         params[0] * scale * states
-        + params[1] * scale * (states ** 2)
-        + params[2] * scale * (states ** 3)
+        + params[1] * scale * (states**2)
+        + params[2] * scale * (states**3)
     )
     return costs
 
@@ -127,7 +127,7 @@ def cubic_costs_dev(num_states, scale):
 
     """
     states = np.arange(num_states)
-    dev = np.array([states * scale, scale * (states ** 2), scale * (states ** 3)]).T
+    dev = np.array([states * scale, scale * (states**2), scale * (states**3)]).T
     return dev
 
 
@@ -153,7 +153,7 @@ def quadratic_costs(num_states, params, scale):
 
     """
     states = np.arange(num_states)
-    costs = params[0] * scale * states + params[1] * scale * (states ** 2)
+    costs = params[0] * scale * states + params[1] * scale * (states**2)
     return costs
 
 
@@ -177,7 +177,7 @@ def quadratic_costs_dev(num_states, scale):
 
     """
     states = np.arange(num_states)
-    dev = np.array([scale * states, scale * (states ** 2)]).T
+    dev = np.array([scale * states, scale * (states**2)]).T
     return dev
 
 

ruspy/simulation/simulation_functions.py

@@ -216,7 +216,7 @@ def simulate_strategy_reduced_data_disc_utility(
             )
 
             state_increase = draw_increment(intermediate_state, trans_mat)
-            disc_utility += disc_fac ** period * utility
+            disc_utility += disc_fac**period * utility
 
             new_state = intermediate_state + state_increase
             if new_state > num_states:

ruspy/test/ranodm_init.py

@@ -8,8 +8,8 @@
 def random_init(constr=None):
     """
     The module provides a random dictionary generating process for test purposes.
+
     """
-    # Check for pre specified constraints
     if constr is not None:
         pass
     else:
@@ -69,7 +69,8 @@ def random_init(constr=None):
 
 def print_dict(init_dict, file_name="test"):
     """
-    This function prints the initialization dict to a *.yml file.
+    This function prints the initialization dict to a yaml file.
+
     """
     ordered_dict = collections.OrderedDict()
     order = ["simulation", "estimation"]