Merge pull request #221 from thegridelectric/dev

Update dependencies, make mypy, flake8 and pre-commit pass

.flake8

@@ -1,6 +1,6 @@
 [flake8]
-select = B,B9,C,D,DAR,E,F,N,RST,S,W
-ignore = E203,E501,RST201,RST203,RST301,W503
+select = B,B9,C,DAR,E,F,N,RST,S,W
+ignore = E203,E501,RST201,RST203,RST301,W503,B950,RST202,B907
 max-line-length = 80
 max-complexity = 10
 docstring-convention = google

.github/workflows/constraints.txt

@@ -1,4 +1,4 @@
-pip==23.3.1
+pip==24.2
 nox==2023.4.22
 nox-poetry==1.0.3
 poetry==1.8.1

.github/workflows/tests.yml

@@ -12,15 +12,14 @@ jobs:
  fail-fast: false
  matrix:
  include:
- # - { python: "3.12", os: "ubuntu-latest", session: "pre-commit" }
- # - { python: "3.12", os: "ubuntu-latest", session: "safety" }
- # - { python: "3.12", os: "ubuntu-latest", session: "mypy" }
+ - { python: "3.11", os: "ubuntu-latest", session: "pre-commit" }
+ - { python: "3.12", os: "ubuntu-latest", session: "mypy" }
  - { python: "3.11", os: "ubuntu-latest", session: "tests" }
  - { python: "3.12", os: "ubuntu-latest", session: "tests" }
  # - { python: "3.12", os: "windows-latest", session: "tests" }
  # - { python: "3.12", os: "macos-latest", session: "tests" }
- # - { python: "3.12", os: "ubuntu-latest", session: "typeguard" }
  # - { python: "3.12", os: "ubuntu-latest", session: "xdoctest" }
+
  # - { python: "3.12", os: "ubuntu-latest", session: "docs-build" }
 
  env:

.pre-commit-config.yaml

@@ -21,25 +21,25 @@ repos:
  entry: check-yaml
  language: system
  types: [yaml]
- - id: darglint
- name: darglint
- entry: darglint
- language: system
- types: [python]
- stages: [manual]
+ # - id: darglint
+ #  name: darglint
+ #  entry: darglint
+ #  language: system
+ #  types: [python]
+ #  stages: [manual]
  - id: end-of-file-fixer
  name: Fix End of Files
  entry: end-of-file-fixer
  language: system
  types: [text]
  stages: [commit, push, manual]
- # - id: flake8
- #  name: flake8
- #  entry: flake8
- #  language: system
- #  types: [python]
- #  require_serial: true
- #  args: [--darglint-ignore-regex, .*]
+ - id: flake8
+ name: flake8
+ entry: flake8
+ language: system
+ types: [python]
+ require_serial: true
+  # args: [--darglint-ignore-regex, .*]
  - id: isort
  name: isort
  entry: isort

README.md

@@ -46,8 +46,6 @@ The [GNodeFactory](https://github.com/thegridelectric/g-node-factory) currently
 and does most of the heavy lifting in terms of identity management and authentication in GridWorks. Finally, since the demo
 is a distributed simulation, it needs a method of handling time. That's done by a [TimeCoordinator](https://github.com/thegridelectric/gridworks-timecoordinator) GNode.
 
-
-
 ## Contributing
 
 Contributions are very welcome.

docs/requirements.txt

@@ -1,5 +1,5 @@
-furo==2024.1.29
-sphinx==7.2.6
+furo==2024.7.18
+sphinx==8.0.2
 sphinx-click==5.1.0
 myst_parser==2.0.0
 sphinx-rtd-theme

noxfile.py

@@ -1,3 +1,5 @@
+# type: ignore
+
 """Nox sessions."""
 
 import os
@@ -7,7 +9,7 @@
 from pathlib import Path
 from textwrap import dedent
 
-import nox
+import nox # noqa
 
 
 try:
@@ -28,10 +30,8 @@
 nox.needs_version = ">= 2021.6.6"
 nox.options.sessions = (
  "pre-commit",
- # "safety",
  "mypy",
  "tests",
- # "typeguard",
  "xdoctest",
  "docs-build",
 )
@@ -122,12 +122,12 @@ def precommit(session: Session) -> None:
  ]
  session.install(
  "black",
- "darglint",
+ # "darglint",
  "flake8",
  "flake8-bandit",
  "flake8-bugbear",
- # "flake8-docstrings",
- # "flake8-rst-docstrings",
+ "flake8-docstrings",
+ "flake8-rst-docstrings",
  "isort",
  "pep8-naming",
  "pre-commit",
@@ -139,14 +139,6 @@ def precommit(session: Session) -> None:
  activate_virtualenv_in_precommit_hooks(session)
 
 
-@session(python=python_versions[0])
-def safety(session: Session) -> None:
- """Scan dependencies for insecure packages."""
- requirements = session.poetry.export_requirements()
- session.install("safety")
- session.run("safety", "check", "--full-report", f"--file={requirements}")
-
-
 @session(python=python_versions)
 def mypy(session: Session) -> None:
  """Type-check using mypy."""
@@ -183,14 +175,6 @@ def coverage(session: Session) -> None:
  session.run("coverage", *args)
 
 
-@session(python=python_versions[0])
-def typeguard(session: Session) -> None:
- """Runtime type checking using Typeguard."""
- session.install(".")
- session.install("pytest", "typeguard", "pygments")
- session.run("pytest", f"--typeguard-packages={package}", *session.posargs)
-
-
 @session(python=python_versions)
 def xdoctest(session: Session) -> None:
  """Run examples with xdoctest."""