Bump pyscaffold

.isort.cfg

@@ -1,11 +1,3 @@
 [settings]
-line_length=88
-indent='    '
-skip=.tox,.venv,build,dist
-known_standard_library=setuptools,pkg_resources
-known_test=pytest
-known_first_party=otoole
-sections=FUTURE,STDLIB,COMPAT,TEST,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
-default_section=THIRDPARTY
-multi_line_output=3
-include_trailing_comma=True
+profile = black
+known_first_party = otoole

.pre-commit-config.yaml

@@ -1,14 +1,8 @@
 exclude: '^docs/conf.py'
 
 repos:
-- repo: https://github.com/psf/black
-  rev: 22.6.0
-  hooks:
-    - id: black
-      language_version: python3.9
-
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.2.3
+  rev: v4.3.0
   hooks:
   - id: trailing-whitespace
   - id: check-added-large-files
@@ -21,15 +15,43 @@ repos:
   - id: end-of-file-fixer
   - id: requirements-txt-fixer
   - id: mixed-line-ending
-    args: ['--fix=no']
-  - id: flake8
-    args: ['--max-line-length=88','--extend-ignore=E203']  # default of Black
+    args: ['--fix=auto']  # replace 'auto' with 'lf' to enforce Linux/Mac line endings or 'crlf' for Windows
+
+## If you want to avoid flake8 errors due to unused vars or imports:
+# - repo: https://github.com/myint/autoflake
+#   rev: v1.4
+#   hooks:
+#   - id: autoflake
+#     args: [
+#       --in-place,
+#       --remove-all-unused-imports,
+#       --remove-unused-variables,
+#     ]
 
-- repo: https://github.com/pre-commit/mirrors-isort
-  rev: v5.10.1
+- repo: https://github.com/pycqa/isort
+  rev: 5.10.1
   hooks:
   - id: isort
 
+- repo: https://github.com/psf/black
+  rev: 22.6.0
+  hooks:
+  - id: black
+    language_version: python3
+
+## If like to embrace black styles even in the docs:
+# - repo: https://github.com/asottile/blacken-docs
+#   rev: v1.12.0
+#   hooks:
+#   - id: blacken-docs
+#     additional_dependencies: [black]
+
+- repo: https://github.com/PyCQA/flake8
+  rev: 4.0.1
+  hooks:
+  - id: flake8
+  ## You can add flake8 plugins via `additional_dependencies`:
+  #  additional_dependencies: [flake8-bugbear]
 -   repo: https://github.com/pre-commit/mirrors-mypy
     rev: v0.961  # Use the sha / tag you want to point at
     hooks:

.readthedocs.yml

@@ -0,0 +1,23 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Build documentation with MkDocs
+#mkdocs:
+#  configuration: mkdocs.yml
+
+# Optionally build your docs in additional formats such as PDF
+formats:
+  - pdf
+
+python:
+  version: 3.8
+  install:
+    - requirements: docs/requirements.txt
+    - {path: ., method: pip}

.travis.yml

@@ -1,48 +1,62 @@
+# Travis configuration file using the build matrix feature
+# Read more under http://docs.travis-ci.com/user/build-configuration/
+# THIS SCRIPT IS SUPPOSED TO BE AN EXAMPLE. MODIFY IT ACCORDING TO YOUR NEEDS!
+
 language: python
-os: linux
-dist: xenial
+git:
+  depth: false
+env:
+  - PRE_COMMIT_HOME=$HOME/.cache/pre-commit
 virtualenv:
   system_site_packages: false
 jobs:
   fast_finish: true
   include:
-  - env: DISTRIB="conda" PYTHON_VERSION="3.7" COVERAGE="false"
-  - env: DISTRIB="conda" PYTHON_VERSION="3.8" COVERAGE="false"
-  - env: DISTRIB="conda" PYTHON_VERSION="3.9" COVERAGE="true"
-  - stage: deploy
-    script: skip
-    deploy:
-      edge: true
-      provider: pypi
-      username: willu47
-      password:
-        secure: b+jIvSEU2My0Bpgsv0/tZqbmZsrLPEOkLymxu5uCOWFfaLk8ALSW+R+J3xRJkB02UYOqYuf5E0tXMeAEzM5weCLgJ42kB+AeXrdDXU2n7Fkm61SimTz50wzpv3WenhRMW0A9CqFJHS7kQY7gGcRGcBbDnqg9yssnay8visCNYNGCskiKAwvJjv7mrill2/pJVpautqbvtZRJ3+AeV9UEJSvP88TvHH8lC5p/MnzhebO4IZ8C6MymIUXaKqfQAtpM2Co+ftlMEcHktRx4jUmd1SGQci8A86sITTsUDwQzWJrbR8RiqaUfasCl3gtdL3QQty1lkvoHEzDRVV9512q2qRsjEvbP0p3cFjjXrzZXA8URGrhFyh2Kdm/kvPw6J3yi0OgHtnnoRHRAQuYhGnJ4CGYDtoTSyBMmx7rPzyG1pYcFvUH8MxGOSo0wcfUKAmmWAhxHNmVvTvlBbdlm1A+Z1s0dVU1ePVEmUKacXVaq72f3nUjHAfa6tteVE6MOig6ljXcpuZRnnCJZlT9WEFtMGgMfNJBeWSVO0XXXR+tn1bJw5kDMO6quqKHAGCIWI2uZCBdroCMCrmXjc7upAmy3NhnbuHAudTRRXTPCoWssyu5hOkMfnobJBXDM+7KIwhWbFHQnuP2la7S1r9FrAnN2Rn/B0n1stGLX7UGqUgsuDac=
-      on:
-        tags: true
-        all_branches: false
-      cleanup: false
-
+    - python: 3.6
+      env: DISTRIB="ubuntu" TOX_PYTHON_VERSION="py36" COVERAGE="true"
+    - python: 3.7
+      env: DISTRIB="ubuntu" TOX_PYTHON_VERSION="py37" COVERAGE="false"
+    - python: 3.8
+      env: DISTRIB="ubuntu" TOX_PYTHON_VERSION="py38" COVERAGE="false"
+    - python: 3.9
+      env: DISTRIB="ubuntu" TOX_PYTHON_VERSION="py39" COVERAGE="false"
+    - env: DISTRIB="conda" PYTHON_VERSION="3.8" COVERAGE="false"
+    - stage: deploy
+      script: skip
+      deploy:
+        edge: true
+        provider: pypi
+        username: willu47
+        password:
+          secure: b+jIvSEU2My0Bpgsv0/tZqbmZsrLPEOkLymxu5uCOWFfaLk8ALSW+R+J3xRJkB02UYOqYuf5E0tXMeAEzM5weCLgJ42kB+AeXrdDXU2n7Fkm61SimTz50wzpv3WenhRMW0A9CqFJHS7kQY7gGcRGcBbDnqg9yssnay8visCNYNGCskiKAwvJjv7mrill2/pJVpautqbvtZRJ3+AeV9UEJSvP88TvHH8lC5p/MnzhebO4IZ8C6MymIUXaKqfQAtpM2Co+ftlMEcHktRx4jUmd1SGQci8A86sITTsUDwQzWJrbR8RiqaUfasCl3gtdL3QQty1lkvoHEzDRVV9512q2qRsjEvbP0p3cFjjXrzZXA8URGrhFyh2Kdm/kvPw6J3yi0OgHtnnoRHRAQuYhGnJ4CGYDtoTSyBMmx7rPzyG1pYcFvUH8MxGOSo0wcfUKAmmWAhxHNmVvTvlBbdlm1A+Z1s0dVU1ePVEmUKacXVaq72f3nUjHAfa6tteVE6MOig6ljXcpuZRnnCJZlT9WEFtMGgMfNJBeWSVO0XXXR+tn1bJw5kDMO6quqKHAGCIWI2uZCBdroCMCrmXjc7upAmy3NhnbuHAudTRRXTPCoWssyu5hOkMfnobJBXDM+7KIwhWbFHQnuP2la7S1r9FrAnN2Rn/B0n1stGLX7UGqUgsuDac=
+        on:
+          tags: true
+          all_branches: false
+        cleanup: false
 install:
-- source tests/travis_install.sh
+  - source tests/travis_install.sh
 before_script:
-- git config --global user.email "[email protected]"
-- git config --global user.name "Will Usher"
+  - git config --global user.email "[email protected]"
+  - git config --global user.name "Will Usher"
+  # Useful information in case of debug
+  - if [[ "$DISTRIB" == "conda" ]]; then conda info -a; fi
+  - which tox
 script:
-- pip install -r requirements.txt
-- python setup.py develop
-- pytest
-- |
-  if [[ "$COVERAGE" == "true" ]]; then
-    pre-commit install
-    pre-commit run --files src
-  fi
+  - tox -e build
+  - tox
+  - |
+    if [[ "$COVERAGE" == "true" ]]; then
+      pre-commit install
+      pre-commit run --all-files
+    fi
 after_success:
-- if [[ "$COVERAGE" == "true" ]]; then coveralls || echo "failed"; fi
+  - if [[ "$COVERAGE" == "true" ]]; then coveralls || echo "failed"; fi
 after_script:
-- travis-cleanup
+  - travis-cleanup
 cache:
   pip: true
   directories:
-  - "$HOME/miniconda"
+    - $HOME/miniconda
+    - $HOME/.cache/pre-commit
 notifications:
   email: false

CHANGELOG.rst

@@ -1,13 +1,15 @@
 =========
 Changelog
 =========
-Version 2.0
+Version 1.0
 ===========
 - Requires explicit provision of a user-defined configuration file for otoole to workbook
+- Reads in a model configuration from a datapackage
 - Fixed issue #114 so that conversion to Excel workbooks is now operating
+- Bumped pyscaffold to 4.2
 
 Version 0.9
-==========
+===========
 - Adds support for processing Gurobi solution files
 - Better handling of datatypes when converting datapackages
 - Fixing bugs on Windows where empty lines were written out during conversion to datapackage