Merge pull request #92 from jacebrowning/update-formatting

Upgrade formatting utilities
jacebrowning · Jul 29, 2023 · efb15a0 · efb15a0
2 parents 3c2bd68 + 4bdbc45
commit efb15a0
Show file tree

Hide file tree

Showing 15 changed files with 181 additions and 333 deletions.
diff --git a/.isort.cfg b/.isort.cfg
diff --git a/.python-version b/.python-version
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -0,0 +1,13 @@
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.10"
+
+mkdocs:
+  configuration: mkdocs.yml
+
+python:
+   install:
+   - requirements: docs/requirements.txt
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1,2 @@
+python 3.10.11
+poetry 1.5.1
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
-dist: xenial
+dist: jammy
 
 language: python
 python:
-  - 3.6
-  - 3.7
-  - 3.8
+  - "3.8"
+  - "3.9"
+  - "3.10"
 
 cache:
   pip: true

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,10 @@
 {
     "cSpell.words": [
+        "ANSICON",
+        "codehilite",
         "DIRENV",
         "embeddable",
+        "mkdocs",
         "pipx",
         "printenv",
         "pyenv",

diff --git a/Makefile b/Makefile
@@ -59,7 +59,7 @@ endif
 
 .PHONY: format
 format: install
-	poetry run isort $(PACKAGES) notebooks --recursive --apply
+	poetry run isort $(PACKAGES) notebooks
 	poetry run black $(PACKAGES) notebooks
 	@ echo
 
@@ -129,8 +129,12 @@ $(MKDOCS_INDEX): docs/requirements.txt mkdocs.yml docs/*.md
 	poetry run mkdocs build --clean --strict
 
 docs/requirements.txt: poetry.lock
-	@ poetry export --dev --without-hashes | grep mkdocs > $@
-	@ poetry export --dev --without-hashes | grep pygments >> $@
+	@ rm -f $@
+	@ poetry export --with dev --without-hashes | grep jinja2 >> $@
+	@ poetry export --with dev --without-hashes | grep markdown >> $@
+	@ poetry export --with dev --without-hashes | grep mkdocs >> $@
+	@ poetry export --with dev --without-hashes | grep pygments >> $@
+	@ poetry export --with dev --without-hashes | grep importlib-metadata >> $@
 
 .PHONY: uml
 uml: install docs/*.png

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,2 +1,5 @@
-mkdocs==1.2.4 ; python_version >= "3.6" and python_version < "4.0"
-pygments==2.7.4 ; python_version >= "3.6" and python_version < "4.0"
+jinja2==3.0.3 ; python_version >= "3.8" and python_version < "4.0"
+markdown==3.3.6 ; python_version >= "3.8" and python_version < "4.0"
+mkdocs==1.5.1 ; python_version >= "3.8" and python_version < "4.0"
+pygments==2.7.4 ; python_version >= "3.8" and python_version < "4.0"
+importlib-metadata==4.8.3 ; python_version >= "3.8" and python_version < "3.10"