Merge pull request creativecommons#613 from creativecommons/python-updates

TimidRobot · web-flow · commit 502b2873eec5 · 2021-04-08T07:34:51.000-07:00
Python updates
diff --git a/.github/workflows/lektor-build-deploy.yml b/.github/workflows/lektor-build-deploy.yml
@@ -8,11 +8,11 @@ jobs:
    - name: setup python version
      uses: actions/setup-python@v1
      with:
-      python-version: 3.7
+      python-version: 3.9
    - name: Install dependencies
      run: |
       pip install pipenv
-      pipenv install
+      pipenv sync
       pipenv run lektor build -f webpack
    - name: Deploy to production
      if: github.ref == 'refs/heads/master'
diff --git a/Pipfile b/Pipfile
@@ -4,15 +4,16 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [packages]
-black = "==19.10b0"
+black = "==20.8b1"
 # Cryptography 3.4+ requires Rust to build
 # https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst
 cryptography = "==3.3.2"
 flake8 = "*"
+isort = "*"
 lektor = "*"
 # Werkzeug added and pinned to mitigate this issue:
 # https://github.com/nixjdm/lektor-atom/issues/23
 Werkzeug = "==0.16.1"
 
 [requires]
-python_version = "3"
+python_version = "3.9"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README.md b/README.md
@@ -57,27 +57,27 @@ To install these, execute the following commands:
 
 > For  macOS:
 
-1. `brew install pipenv`
-2. `brew install node`
+1. `brew install pipenv node`
 
 > For GNU/Linux:
 
-1. `curl https://raw.githubusercontent.com/kennethreitz/pipenv/master/get-pipenv.py | python`
-2. `sudo apt update`
-3. [Install Node.js](https://github.com/nodesource/distributions/blob/master/README.md#table-of-contents) 
+1. [Installing Pipenv][pipenvinstall]
+2. [Install Node.js][nodeinstall]
+3. `sudo apt update`
 4. `sudo apt install npm `
 
-[pipenvdocs]:https://pipenv.readthedocs.io/en/latest/
-[nodejswebsite]:https://nodejs.org/en/
-[npmdocs]:https://docs.npmjs.com/ 
-
+[pipenvdocs]: https://pipenv.pypa.io/en/latest/
+[nodejswebsite]: https://nodejs.org/en/
+[npmdocs]: https://docs.npmjs.com/ 
+[pipenvinstall]: https://pipenv.pypa.io/en/latest/install/#installing-pipenv
+[nodeinstall]: https://github.com/nodesource/distributions/blob/master/README.md#table-of-contents
 
 
 ### Installing Project Requirements
 
 1. Clone this repository.
 2. Open your command line interface and `cd` to the repository root directory.
-3. Run `pipenv install` to create a Python virtual environment and install the requirements for this project.
+3. Run `pipenv install --dev` to create a Python virtual environment and install the requirements for this project.
 
 
 ### pipenv Troubleshooting
@@ -86,7 +86,7 @@ To install these, execute the following commands:
 message if the project’s virtual environment is broken][pipenverror]). If all
 else fails, try removing the virtual environment and reinstalling:
 1. `pipenv --rm`
-2. `pipenv install`
+2. `pipenv install --dev`
 
 [pipenverror]:https://github.com/pypa/pipenv/issues/1918
 
diff --git a/packages/checkfile/lektor_checkfile.py b/packages/checkfile/lektor_checkfile.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
+# Standard library
 import os
+
+# Third-party
 from lektor.pluginsystem import Plugin
 
 
 class CheckfilePlugin(Plugin):
     name = "CheckFile"
-    description = u"Plugin to check if a file is present."
+    description = "Plugin to check if a file is present."
 
     def on_setup_env(self, **extra):
         def check_file(filename):
diff --git a/packages/checkfile/setup.py b/packages/checkfile/setup.py
@@ -1,8 +1,10 @@
+# Standard library
 import ast
 import io
 import re
 
-from setuptools import setup, find_packages
+# Third-party
+from setuptools import find_packages, setup
 
 with io.open("README.md", "rt", encoding="utf8") as f:
     readme = f.read()
@@ -35,6 +37,8 @@
         "Programming Language :: Python :: 3",
     ],
     entry_points={
-        "lektor.plugins": ["checkfile = lektor_checkfile:CheckfilePlugin",]  # noqa: E231, E501
+        "lektor.plugins": [
+            "checkfile = lektor_checkfile:CheckfilePlugin",
+        ]
     },
 )
diff --git a/packages/markdown-table/lektor_markdown_table.py b/packages/markdown-table/lektor_markdown_table.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# Third-party
 from lektor.pluginsystem import Plugin
 
 
diff --git a/packages/markdown-table/setup.py b/packages/markdown-table/setup.py
@@ -1,6 +1,8 @@
-from setuptools import setup, find_packages
+# Standard library
 from os import path
 
+# Third-party
+from setuptools import find_packages, setup
 
 this_directory = path.abspath(path.dirname(__file__))
 with open(path.join(this_directory, "README.md"), encoding="utf-8") as f:
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,8 +1,25 @@
 [tool.black]
-line-length = 79
-exclude = '''
-/(
-      \.git
-    | webpack
-)/
+force-exclude = '''
+(
+  /node_modules/
+  | /venv/
+)
 '''
+line-length = 79
+target-version = ['py38']
+
+
+# [tool.flake8]
+#   config: .flake8
+# also see: https://gitlab.com/pycqa/flake8/-/issues/428
+
+
+[tool.isort]
+import_heading_firstparty = 'First-party/Local'
+import_heading_future = 'Future'
+import_heading_stdlib = 'Standard library'
+import_heading_thirdparty = 'Third-party'
+line_length = 79
+multi_line_output = 3
+no_lines_before = 'LOCALFOLDER'
+profile = 'black'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# -- coding: utf-8 --`
	`2`	`+# Third-party`
`2`	`3`	`from lektor.pluginsystem import Plugin`
`3`	`4`
`4`	`5`