Let's try even more impure Python

.github/workflows/ci.yml

@@ -26,13 +26,12 @@ concurrency:
 
 jobs:
 
-  tests:
+  pure_tests:
+    name: Pure Tests
     # strategy:
     #   matrix:
     #     python: ["python3.9", "python3.10", "python3.11"]
 
-    name: Tests
-
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -45,13 +44,39 @@ jobs:
       - name: Run linters and unit tests the Nix way
         run: nix flake check
 
-      - name: Run linters and unit tests the Python way
+  impure_tests:
+    name: Impure Tests
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+
+
+      - name: Install Poetry environment
+        run: poetry install
+
+      - name: Install test dependencies
+        run: sudo apt-get -y install nmap
+
+      - name: Run linters and unit tests the Poetry way
         run: |
-          nix develop --command make tests
+          # make lint -> pre-commit-config.yaml is managed by Nix,
+          # so path entries won't work in Poetry env
+          make types
+          make unit
+          make tesh
+
+      - uses: cachix/install-nix-action@v22
+
+      - name: Run 'make examples'
+        run: poetry run tesh examples/
 
   release:
     name: Release
-    needs: tests
+    needs: [pure_tests, impure_tests]
 
     # To test publishing to testpypi:
     # * comment out "verify git tag matches pyproject.toml version"

.gitignore

@@ -23,3 +23,4 @@ __pycache__
 
 # nix stuff
 result
+.pre-commit-config.yaml

.yamllint

@@ -1,3 +1,6 @@
 rules:
   line-length:
     max: 88
+
+ignore:
+  - .pre-commit-config.impure.yaml

Makefile

@@ -3,8 +3,7 @@ PYTHON ?= python3.11
 
 # Check if this a machine in nix, in which case "poetry run" prefix to commands
 # is not necessary
-PREFIX :=
-$(shell nix store ping >/dev/null 2>&1; if [ $$? -eq 0 ]; then PREFIX="poetry run "; fi;)
+PREFIX := $(shell nix store ping 2> /dev/null || echo "poetry run ")
 
 
 .PHONY: all
@@ -20,7 +19,7 @@ lint:
 # 3. get all untracked files
 # 4. run pre-commit checks on them
 ifeq ($(all),true)
-	@$(PREFIX)poetry run pre-commit run --all-files
+	@pre-commit run --all-files
 else
 	@{ git diff --name-only ./; git diff --name-only --staged ./;git ls-files --other --exclude-standard; } \
 		| sort -u | uniq | xargs pre-commit run --hook-stage push --files
@@ -64,18 +63,22 @@ endif
 .PHONY: unit
 unit:
 ifndef path
-	@pytest src/tesh $(verbosity) $(full_suite_args) $(pytest_args)
+	@$(PREFIX)pytest src/tesh $(verbosity) $(full_suite_args) $(pytest_args)
 else
-	@pytest $(path)
+	@$(PREFIX)pytest $(path)
 endif
 
 .PHONY: tesh
 tesh:
-	@tesh *.md
+	@$(PREFIX)tesh *.md
 
 .PHONY: examples
 examples:
-	@tesh examples/
+ifeq ($(PREFIX),"poetry run ")
+	@echo "You need nix-shell to run 'make examples'"
+else
+	@$(PREFIX)tesh examples/
+endif
 
 .PHONY: test
 test: tests

README.md

@@ -275,10 +275,13 @@ $ pip install tesh
 
 ## Developing `tesh`
 
-We provide two development environments for people working on this project, one based on [Nix](https://nixos.org/) and one based on [Docker](https://www.docker.com/).
+We provide two development environments for people working on this project, one based on [Nix](https://nixos.org/) and one based on [Poetry](https://www.docker.com/).
 
-For Nix, run `nix develop` to enter the development environment.
-For Docker, run `TODO` to enter the development environment.
+For Nix, run `nix develop` to enter the development environment, where everything is ready for use.
+
+For Poetry, run the following:
+* `poetry install` to prepare the Python development environment
+* `pre-commit install --config .pre-commit-config.impure.yaml`
 
 Then you can run `make tests` to run all tests & checks.
 

flake.nix

@@ -135,7 +135,7 @@
               # Install the package in editable mode
               # This allows executing `clan` from within the dev-shell using the current
               # version of the code and its dependencies.
-              PYTHONPATH=${self'.packages.testEnv}/${self'.packages.testEnv.sitePackages} ${pkgs.python3Packages.pip}/bin/pip install \
+              PYTHONPATH=${pkgs.python3Packages.poetry-core}/${self'.packages.testEnv.sitePackages}:${self'.packages.testEnv}/${self'.packages.testEnv.sitePackages} ${pkgs.python3Packages.pip}/bin/pip install \
                 --no-deps \
                 --disable-pip-version-check \
                 --no-index \

pyproject.toml

@@ -25,8 +25,6 @@ pexpect = "*"
 
 
 [tool.poetry.dev-dependencies]
-poetry-core = "<1.1.0"
-
 autoflake = "*"
 black = "*"
 codespell = "*"