From 2e64985e595ff83423c4f52accfbdfa69d35809c Mon Sep 17 00:00:00 2001 From: ryneeverett Date: Tue, 4 Aug 2020 00:30:48 +0000 Subject: [PATCH] Streamline development environment setup. - Move test requirements into setup.py. - Add shell.nix. --- README.md | 2 -- setup.py | 1 + shell.nix | 25 +++++++++++++++++++++++++ test-requirements.txt | 1 - tests/__init__.py | 0 5 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 shell.nix delete mode 100644 test-requirements.txt create mode 100644 tests/__init__.py diff --git a/README.md b/README.md index 70e4e54..d0f21f8 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,6 @@ Running Tests ------------- ```sh -cd /path/to/mkcodes python setup.py develop -pip install -r test-requirements.txt ./test ``` diff --git a/setup.py b/setup.py index 23b99c6..4b20b0f 100644 --- a/setup.py +++ b/setup.py @@ -3,6 +3,7 @@ setuptools.setup( name='mkcodes', install_requires=['click'], + tests_require=['markdown'], extras_require={'markdown': ['markdown']}, py_modules=['mkcodes'], entry_points={'console_scripts': ['mkcodes=mkcodes:main']} diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..a5d8279 --- /dev/null +++ b/shell.nix @@ -0,0 +1,25 @@ +let + pkgs = import {}; + testDependencies = [ + pkgs.python3Packages.setuptools + pkgs.python3Packages.markdown + ]; + mkcodes = pkgs.python3Packages.buildPythonPackage { + pname = "mkcodes"; + version = "master"; + src = ./.; + + propagatedBuildInputs = [ + pkgs.python3Packages.click + ]; + checkInputs = testDependencies; + + # FIXME + doCheck = false; + }; +in + pkgs.mkShell { + buildInputs = [ + mkcodes + ] ++ testDependencies; + } diff --git a/test-requirements.txt b/test-requirements.txt deleted file mode 100644 index 0918c97..0000000 --- a/test-requirements.txt +++ /dev/null @@ -1 +0,0 @@ -markdown diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29