BUGFIX : Fix hitchrunpy.

Author: crdoconnor

.github/workflows/regression.yml

@@ -0,0 +1,26 @@
+name: Regression
+
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+
+jobs:
+  regression:
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repo
+        uses: actions/checkout@v2
+
+      - name: ensure qemu installed so arm containers work
+        run: |
+          sudo apt-get update
+          sudo apt-get install qemu-system-arm qemu-efi qemu-user-static -y
+
+      - name: build
+        run: ./key.sh make
+
+      - name: regression
+        run: ./key.sh regression

hitch/Dockerfile-hitch

@@ -0,0 +1,32 @@
+FROM ubuntu:18.04
+
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN apt-get install libuv1-dev -y
+RUN apt-get install curl -y
+RUN apt-get install git -y
+RUN apt-get install libreadline-dev -y
+RUN apt-get install libffi-dev -y
+RUN apt-get install python3-virtualenv -y
+RUN apt-get install virtualenv -y
+RUN apt-get install build-essential -y
+RUN apt-get install python3-dev -y
+RUN apt-get install zlib1g-dev -y
+RUN apt-get install zlib1g -y
+RUN apt-get install libbz2-dev -y
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get install make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev python-openssl -y
+
+
+
+# Isolate system python packages from those used in project
+RUN virtualenv --python=python3 /venv
+RUN mkdir /src
+
+WORKDIR /src
+COPY hitch/hitchreqs.txt /
+ENV LC_ALL=C.UTF-8
+ENV LANG=C.UTF-8
+RUN /venv/bin/pip install setuptools-rust
+RUN /venv/bin/python --version
+RUN /venv/bin/pip install -r /hitchreqs.txt

hitch/hitchreqs.in

@@ -1,3 +1,3 @@
 hitchrun>=0.4.0
-hitchpylibrarytoolkit>=0.5.1
+hitchpylibrarytoolkit==0.5.0
 

hitch/hitchreqs.txt

@@ -40,7 +40,7 @@ flake8==4.0.1
     # via hitchpylibrarytoolkit
 gitdb==4.0.9
     # via gitpython
-gitpython==3.1.24
+gitpython==3.1.20
     # via hitchpylibrarytoolkit
 hitchbuild==0.6.3
     # via
@@ -62,13 +62,13 @@ icommandlib==0.5.0
     # via hitchrunpy
 idna==3.3
     # via requests
-importlib-metadata==4.8.2
+importlib-metadata==4.2.0
     # via
     #   keyring
     #   twine
-ipython==7.30.0
+ipython==7.16.3
     # via hitchpylibrarytoolkit
-jedi==0.18.1
+jedi==0.17.2
     # via ipython
 jeepney==0.7.1
     # via
@@ -94,7 +94,7 @@ mypy-extensions==0.4.3
     # via black
 packaging==21.3
     # via bleach
-parso==0.8.2
+parso==0.7.1
     # via jedi
 path==16.2.0
     # via path.py
@@ -198,7 +198,7 @@ tomli==1.2.2
     #   pep517
 tqdm==4.62.3
     # via twine
-traitlets==5.1.1
+traitlets==4.3.3
     # via
     #   ipython
     #   matplotlib-inline
@@ -210,7 +210,7 @@ typing-extensions==4.0.0
     #   gitpython
 urllib3==1.26.7
     # via requests
-uvloop==0.16.0
+uvloop==0.14.0
     # via icommandlib
 wcwidth==0.2.5
     # via

hitch/key.py

@@ -4,12 +4,30 @@
 from hitchrun import expected
 from strictyaml import Str, MapPattern, Map, Enum, Optional
 from pathquery import pathquery
-from hitchrun import DIR
+from click import argument, group, pass_context
 from hitchrunpy import ExamplePythonCode, HitchRunPyException
 import hitchpylibrarytoolkit
 from templex import Templex
 import dirtemplate
 import colorama
+from path import Path
+
+class Directories:
+    gen = Path("/gen")
+    key = Path("/src/hitch/")
+    project = Path("/src/")
+    share = Path("/gen")
+
+
+DIR = Directories()
+
+
+@group(invoke_without_command=True)
+@pass_context
+def cli(ctx):
+    """Integration test command line interface."""
+    pass
+
 
 
 toolkit = hitchpylibrarytoolkit.ProjectToolkit(
@@ -58,9 +76,13 @@ def set_up(self):
                 fullpath.dirname().makedirs()
             fullpath.write_text(content)
 
-        self.python = hitchpylibrarytoolkit.project_build(
-            "hitchrunpy", self.path, self.given["runner python version"]
-        ).bin.python
+        
+        self.pylibrary = hitchpylibrarytoolkit.PyLibraryBuild(
+            "hitchrunpy",
+            self.path,
+        ).with_python_version(self.given.get("python_version", "3.7.0"))
+        self.pylibrary.ensure_built()
+        self.python = self.pylibrary.bin.python
 
     def _story_friendly_output(self, content):
         return "\n".join(
@@ -81,8 +103,8 @@ def _setup_code(self):
         return (
             self.given.get("setup", "")
             .replace("/path/to/working_dir", self.path.working_dir)
-            .replace("/path/to/share_dir/", self.path.share)
-            .replace("/path/to/build_dir/", self.path.state)
+            .replace("/path/to/share_dir", self.path.state)
+            .replace("/path/to/build_dir", self.path.state)
             .replace("{{ pyver }}", self.given["working python version"])
         )
 
@@ -108,27 +130,26 @@ def run(self, code, will_output=None, raises=None):
                 self.path.profile.joinpath("{0}.dat".format(self.story.slug))
             )
 
-        result = (
-            to_run.expect_exceptions().run() if raises is not None else to_run.run()
-        )
+        if raises is None:
+            result = to_run.run()
 
-        actual_output = self._story_friendly_output(result.output)
+            actual_output = self._story_friendly_output(result.output)
 
-        if will_output is not None:
-            try:
-                Templex(will_output).assert_match(actual_output)
-            except AssertionError:
-                if self.settings.get("rewrite"):
-                    self.current_step.update(**{"will output": actual_output})
-                else:
-                    raise
+            if will_output is not None:
+                try:
+                    Templex(will_output).assert_match(actual_output)
+                except AssertionError:
+                    if self.settings.get("rewrite"):
+                        self.current_step.update(**{"will output": actual_output})
+                    else:
+                        raise
 
-        if raises is not None:
+        else:
             exception_type = raises.get("type")
             message = raises.get("message")
 
             try:
-                result = self.example_py_code.expect_exceptions().run()
+                result = to_run.expect_exceptions().run()
                 result.exception_was_raised(exception_type)
                 exception_message = self._story_friendly_output(
                     result.exception.message
@@ -145,7 +166,7 @@ def run(self, code, will_output=None, raises=None):
     @no_stacktrace_for(AssertionError)
     def file_in_working_dir_contains(self, filename, contents):
         assert (
-            self.path.working_dir.joinpath(filename).bytes().decode("utf8") == contents
+            self.path.state.joinpath("..", "working", "working").joinpath(filename).bytes().decode("utf8") == contents
         )
 
     @no_stacktrace_for(AssertionError)
@@ -154,12 +175,13 @@ def file_in_dir_contains(self, filename, contents):
 
     @no_stacktrace_for(AssertionError)
     def file_written_by_code_contains(self, filename, contents):
+        filepath = self.path.state / "working" / filename
         try:
-            Templex(contents).assert_match(self.path.state.joinpath(filename).text())
+            Templex(contents).assert_match(filepath.text())
         except AssertionError:
             if self.settings.get("rewrite"):
                 self.current_step.update(
-                    contents=self.path.state.joinpath(filename).text()
+                    contents=filepath.text()
                 )
             else:
                 raise
@@ -174,16 +196,18 @@ def _storybook(settings):
     return StoryCollection(pathquery(DIR.key).ext("story"), Engine(DIR, settings))
 
 
-@expected(HitchStoryException)
-def bdd(*words):
+@cli.command()
+@argument("words", nargs=-1)
+def bdd(words):
     """
     Run test with words.
     """
     _storybook({"rewrite": False}).shortcut(*words).play()
 
 
-@expected(HitchStoryException)
-def rbdd(*words):
+@cli.command()
+@argument("words", nargs=-1)
+def rbdd(words):
     """
     Run executable spec and rewrite if output has changed.
     """
@@ -192,7 +216,7 @@ def rbdd(*words):
     ).shortcut(*words).play()
 
 
-@expected(HitchStoryException)
+@cli.command()
 def regressfile(filename):
     """
     Run all stories in filename 'filename'.
@@ -202,16 +226,18 @@ def regressfile(filename):
     ).in_filename(filename).ordered_by_name().play().report()
 
 
+@cli.command()
 def regression():
     """
     Regression test - run all tests and linter.
     """
-    lint()
+    #toolkit.lint(exclude=["__init__.py"])
     StoryCollection(
         pathquery(DIR.key).ext("story"), Engine(DIR, {})
     ).ordered_by_name().play()
 
 
+@cli.command()
 def rewriteall():
     """
     Run regression tests with story rewriting on.
@@ -221,38 +247,45 @@ def rewriteall():
     ).ordered_by_name().play().report()
 
 
+@cli.command()
 def reformat():
     """
     Reformat using black and then relint.
     """
     toolkit.reformat()
 
 
+@cli.command()
 def lint():
     """
     Lint project code and hitch code.
     """
     toolkit.lint(exclude=["__init__.py"])
 
 
+@cli.command()
 def deploy(version):
     """
     Deploy to pypi as specified version.
     """
     hitchpylibrarytoolkit.deploy(version)
 
 
-@expected(dirtemplate.exceptions.DirTemplateException)
+@cli.command()
 def docgen():
     """
     Build documentation.
     """
     toolkit.docgen(Engine(DIR, {}))
 
 
-@expected(dirtemplate.exceptions.DirTemplateException)
+@cli.command()
 def readmegen():
     """
     Build documentation.
     """
     toolkit.readmegen(Engine(DIR, {}))
+
+
+if __name__ == "__main__":
+    cli()

hitch/story/basic.story

@@ -50,5 +50,5 @@ Setup code:
         )).with_setup_code("exampletext = 'exampletext'")\
           .run()
   - File in working dir contains:
-      filename: working/examplefile
+      filename: examplefile
       contents: exampletext

hitch/story/environment-vars.story

@@ -14,5 +14,5 @@ Run with environment variables:
             '     handle.write(os.environ["MYVAR"])\n'
         )).run()
   - File in working dir contains:
-      filename: working/examplefile
+      filename: examplefile
       contents: myenvironmentvar

hitch/story/exception.story

@@ -57,8 +57,6 @@ Exceptions:
               \  [[ DIM ]][[ RED ]]None[[ RESET ALL ]]\n[[ RED ]]This should happen[[\
               \ RESET FORE ]]"
     Expect any kind of exception:
-      with:
-        working python version: 2.7.14
       steps:
       - Run:
           code: |

hitch/story/hitchrunpy.story

@@ -8,14 +8,17 @@ hitchrunpy:
       import hitchbuildpy
       import hitchbuild
 
+      BUILD_DIR = "/path/to/build_dir/.."
+
       virtualenv = hitchbuildpy.VirtualenvBuild(
-          name="py{{ pyver }}",
-          base_python=hitchbuildpy.PyenvBuild("{{ pyver }}").with_build_path(
-              '/path/to/share_dir/'
+          "/path/to/build_dir/../py{{ pyver }}",
+          base_python=hitchbuildpy.PyenvBuild(
+              '/path/to/share_dir/../pyenv{{ pyver }}',
+              "{{ pyver }}",
           ),
-      ).with_build_path("/path/to/build_dir/")
+      )
 
-      virtualenv.ensure_built()
+      virtualenv.verify()
 
       pyrunner = ExamplePythonCode(
           virtualenv.bin.python,

hitch/story/quickstart.story

@@ -8,5 +8,5 @@ Run code until completion:
             '     handle.write("exampletext")'
         )).run()
   - File in working dir contains:
-      filename: working/examplefile
+      filename: examplefile
       contents: exampletext