Files
klipper-linux/yocto/meta-klipper/recipes-devtools/python/python-pytest/pytest_version_fix.patch
Sergey 'Jin' Bostandzhyan 250fe23a59 First buildable version
This is by no means complete, there's a lot to be done on the setup and
configuration side and klipper MCU firmware builds are missing as well.

The rootfs itself should be device independent (although you'd probably
have to pull in machine specific layers), the image recipe is specific
to the ASUS TinkerBoard S.

Overall goal is to be able to build this distro for any target that is
supported by Yocto. The distro should be "single purpose", i.e. no
desktop like Armbian etc, but just provide a minimalistic setup for
printing with a possibility to select and upload your klipper config.

OctoPrint is included but should be optional (i.e. I'd like to be able
to turn it off and just "print from SD" via the local LCD menu.

TODOs of the top of my head:
* add MCU firmware builds (probably via a multiconfig setup)
* add lighttpd with a central entry page and a minimalistic web UI

For the web UI:
* add a possibility to select existing klipper configs and to upload custom
  klipper configs
* add an option to enable/disable OctoPrint
* backup/restore configuration

To build for the tinker board:

$ source setup.sh targets/tinker-board-s/
$ bitbake klipper-image-tinker-board-s

Flashable wic/wic.bmap (use bmaptool) will be located in:

klipper-linux-build/build/deploy/images/tinker-board-s
2020-05-27 00:34:02 +02:00

52 lines
1.5 KiB
Diff

Upstream-Status: Inappropriate (OE specific)
python-pytest: remove fetch during do_compile phase
commit: c974fbf9ebf185552ab65301e07af44f36517abf
introduced an issue by making the version 0.0.0
this fixes that
Signed-off-by: Armin Kuster <akuster@mvista.com>
Index: pytest-3.2.2/setup.py
===================================================================
--- pytest-3.2.2.orig/setup.py
+++ pytest-3.2.2/setup.py
@@ -1,5 +1,6 @@
import os
import sys
+import re
import setuptools
import pkg_resources
from setuptools import setup, Command
@@ -22,6 +23,18 @@ classifiers = [
with open('README.rst') as fd:
long_description = fd.read()
+def read(*names, **kwargs):
+ with open(os.path.join( *names), 'r') as fp:
+ return fp.read()
+
+def find_version(*file_paths):
+ version_file = read(*file_paths)
+ version_match = re.search(r"^version = ['\']([^'\"]*)['\']",
+ version_file, re.M)
+
+ if version_match:
+ return version_match.group(1)
+ raise RuntimeError("Unable to find version string.")
def get_environment_marker_support_level():
"""
@@ -59,9 +72,7 @@ def main():
name='pytest',
description='pytest: simple powerful testing with Python',
long_description=long_description,
- use_scm_version={
- 'write_to': '_pytest/_version.py',
- },
+ version=find_version("_pytest", "_version.py"),
url='http://pytest.org',
license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],