Update formatting

jacebrowning · Oct 2, 2020 · 794a659 · 794a659
1 parent 66c9477
commit 794a659
Show file tree

Hide file tree

Showing 15 changed files with 542 additions and 816 deletions.
diff --git a/.isort.cfg b/.isort.cfg
@@ -1,10 +1,7 @@
 [settings]
 
-not_skip = __init__.py
-
 multi_line_output = 3
 
-known_standard_library = dataclasses,typing_extensions
 known_third_party = log
 known_first_party = datafiles
 
@@ -13,4 +10,3 @@ force_grid_wrap = false
 include_trailing_comma = true
 
 lines_after_imports = 2
-line_length = 88
diff --git a/Makefile b/Makefile
@@ -56,7 +56,7 @@ poetry.lock: pyproject.toml
 
 .PHONY: format
 format: install
-	poetry run isort $(PACKAGES) --recursive --apply
+	poetry run isort $(PACKAGES)
 	poetry run black $(PACKAGES)
 	@ echo
 

diff --git a/datafiles/manager.py b/datafiles/manager.py
@@ -8,10 +8,10 @@
 from glob import iglob
 from pathlib import Path
 from typing import TYPE_CHECKING, Iterator, Optional
-from typing_extensions import Protocol
 
 import log
 from parse import parse
+from typing_extensions import Protocol
 
 from . import hooks
 

diff --git a/docs/api/model.md b/docs/api/model.md
@@ -55,9 +55,9 @@ Item("def")  # <=> items/def.yml
 Attributes included in the filename pattern are automatically excluded from the file contents.
 Filename patterns are relative to the file in which models are defined unless `<pattern>` is an absolute path or explicitly relative to the current directory:
 
-- Absolute: `/tmp/items/{self.name}.yaml`
-- Relative to model: `items/{self.name}.yaml`
-- Relative to current directory: `./items/{self.name}.yaml`
+- Absolute: `/tmp/items/{self.name}.yml`
+- Relative to model: `items/{self.name}.yml`
+- Relative to current directory: `./items/{self.name}.yml`
 
 <h3>Options</h3>
 

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,2 +1,2 @@
 mkdocs==1.0.4
-Pygments==2.7.0
+Pygments==2.7.1
diff --git a/notebooks/file_inference.ipynb b/notebooks/file_inference.ipynb
@@ -42,13 +42,6 @@
     "tags": []
    },
    "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Loading 'sample' object from 'files/sample.yml'\n"
-     ]
-    },
     {
      "data": {
       "text/plain": [
@@ -74,15 +67,7 @@
    "metadata": {
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Saving 'sample' object to 'files/sample.yml'\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "sample.numbers.append(3)"
    ]
@@ -185,15 +170,7 @@
    "metadata": {
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Loading 'travis' object from 'files/travis.yml'\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "from datafiles import auto\n",
     "\n",
@@ -206,15 +183,7 @@
    "metadata": {
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Saving 'travis' object to 'files/travis.yml'\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "travis.install.append(\"echo 123 # <= This line is new\")"
    ]

diff --git a/notebooks/format_options.ipynb b/notebooks/format_options.ipynb
@@ -53,15 +53,7 @@
    "metadata": {
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Saving 'Sample' object to 'files/format_options.json'\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "from datafiles import datafile\n",
     "\n",
@@ -124,15 +116,7 @@
    "metadata": {
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Saving 'Sample' object to 'files/format_options.toml'\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "from datafiles import datafile\n",
     "\n",
@@ -191,15 +175,7 @@
    "metadata": {
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Saving 'Sample' object to 'files/format_options.yml'\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "from datafiles import datafile\n",
     "\n",
@@ -238,6 +214,15 @@
     "\n",
     "cat files/format_options.yml"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {

diff --git a/notebooks/manager_api.ipynb b/notebooks/manager_api.ipynb
@@ -37,13 +37,6 @@
     "tags": []
    },
    "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Saving 'MyModel' object to 'my_models/foo.yml'\n"
-     ]
-    },
     {
      "data": {
       "text/plain": [
@@ -75,13 +68,6 @@
     "tags": []
    },
    "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Loading 'MyModel' object from 'my_models/foo.yml'\n"
-     ]
-    },
     {
      "data": {
       "text/plain": [
@@ -103,22 +89,7 @@
    "metadata": {
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Loading 'MyModel' object from 'my_models/bar.yml'\n"
-     ]
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.manager: File not found\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "item = MyModel.objects.get_or_none('bar')\n",
     "\n",
@@ -141,27 +112,6 @@
     "tags": []
    },
    "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Loading 'MyModel' object from 'my_models/bar.yml'\n"
-     ]
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.manager: File not found, creating 'MyModel' object\n"
-     ]
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Saving 'MyModel' object to 'my_models/bar.yml'\n"
-     ]
-    },
     {
      "data": {
       "text/plain": [
@@ -184,13 +134,6 @@
     "tags": []
    },
    "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Loading 'MyModel' object from 'my_models/bar.yml'\n"
-     ]
-    },
     {
      "data": {
       "text/plain": [
@@ -222,27 +165,6 @@
     "tags": []
    },
    "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.manager: Finding files matching pattern: /Users/Browning/Documents/datafiles/notebooks/my_models/*.yml\n"
-     ]
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Loading 'MyModel' object from 'my_models/foo.yml'\n"
-     ]
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Loading 'MyModel' object from 'my_models/bar.yml'\n"
-     ]
-    },
     {
      "data": {
       "text/plain": [
@@ -276,27 +198,6 @@
     "tags": []
    },
    "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.manager: Finding files matching pattern: /Users/Browning/Documents/datafiles/notebooks/my_models/*.yml\n"
-     ]
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Loading 'MyModel' object from 'my_models/foo.yml'\n"
-     ]
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Loading 'MyModel' object from 'my_models/bar.yml'\n"
-     ]
-    },
     {
      "data": {
       "text/plain": [

diff --git a/notebooks/mapper_api.ipynb b/notebooks/mapper_api.ipynb
@@ -140,15 +140,7 @@
    "metadata": {
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Saving 'MyModel' object to 'my_models/foo.yml'\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "model.datafile.save()"
    ]
@@ -264,15 +256,7 @@
    "metadata": {
     "tags": []
    },
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO: datafiles.mapper: Loading 'MyModel' object from 'my_models/foo.yml'\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "model.datafile.load()"
    ]