Merge pull request #98 from ayasyrev/nox_tests

nox_tests

Author: ayasyrev

.flake8

@@ -2,7 +2,7 @@
 select = C,E,F,W
 max-complexity = 10
 max-line-length = 120
-disable-noqa = True
+; disable-noqa = True
 application-import-names = model_constructor, tests
 import-order-style = google
 per-file-ignores =

.gitignore

@@ -10,6 +10,8 @@ _tmp*
 tmp*
 tags
 
+.nox/
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

noxfile.py

@@ -0,0 +1,8 @@
+import nox
+
+
+@nox.session(python=["3.8", "3.9", "3.10", "3.11"])
+def tests(session: nox.Session) -> None:
+    args = session.posargs or ["--cov"]
+    session.install(".", "pytest", "pytest-cov")
+    session.run("pytest", *args)

noxfile_conda.py

@@ -0,0 +1,12 @@
+import nox
+
+
+@nox.session(python=["3.9", "3.10", "3.11"], venv_backend="mamba")
+def conda_tests(session: nox.Session) -> None:
+    args = session.posargs or ["--cov"]
+    # session.install("pytest", "pytest-cov")
+    session.conda_install("pytest", "pytest-cov")
+    session.conda_install("pytorch")
+    session.conda_install("pydantic")
+    session.install("-e", ".", "--no-deps")
+    session.run("pytest", *args)

noxfile_conda_lint.py

@@ -0,0 +1,10 @@
+import nox
+
+locations = "src/model_constructor", "tests", "noxfile.py"
+
+
+@nox.session(python=["3.8", "3.9", "3.10", "3.11"], venv_backend="mamba")
+def conda_lint(session: nox.Session) -> None:
+    args = session.posargs or locations
+    session.conda_install("flake8")
+    session.run("flake8", *args)

noxfile_cov.py

@@ -0,0 +1,16 @@
+import nox
+
+
+@nox.session(python=["3.10"])
+def cov_tests(session: nox.Session) -> None:
+    args = session.posargs or ["--cov"]
+    session.install(".", "pytest", "pytest-cov", "coverage[toml]")
+    session.run("pytest", *args)
+
+
+@nox.session(python="3.10")
+def coverage(session: nox.Session) -> None:
+    """Upload coverage data."""
+    session.install("coverage[toml]", "codecov")
+    session.run("coverage", "xml", "--fail-under=0")
+    session.run("codecov", *session.posargs)

noxfile_lint.py

@@ -0,0 +1,11 @@
+import nox
+
+
+locations = "src/model_constructor", "tests", "noxfile.py"
+
+
+@nox.session(python=["3.8", "3.9", "3.10", "3.11"])
+def lint(session: nox.Session) -> None:
+    args = session.posargs or locations
+    session.install("flake8")
+    session.run("flake8", *args)

requirements.txt

@@ -1,3 +1,3 @@
 pydantic
-# pytorch
+torch
 # numpy

requirements_test.txt

@@ -1,4 +1,5 @@
 pytest
 pytest-cov
 coverage[toml]
-flake8
+flake8
+nox

src/model_constructor/base_constructor.py

@@ -94,8 +94,8 @@ def __init__(self, ni, nh, expansion=4, stride=1, zero_bn=False,
         ni = ni * expansion
         nf = nh * expansion
         self.conv = nn.Sequential(OrderedDict([
-            ('conv_0', conv_layer(ni, nh, ks=1,            act_fn=act_fn, **kwargs)),   # noqa: E241
-            ('conv_1', conv_layer(nh, nh, stride=stride,   act_fn=act_fn, **kwargs)),   # noqa: E241
+            ('conv_0', conv_layer(ni, nh, ks=1, act_fn=act_fn, **kwargs)),
+            ('conv_1', conv_layer(nh, nh, stride=stride, act_fn=act_fn, **kwargs)),
             ('conv_2', conv_layer(nh, nf, ks=1, zero_bn=zero_bn, act=False, act_fn=act_fn, **kwargs))]))
         if self.downsample:
             self.downsample = downsample_block(conv_layer, ni, nf, ks=1,