From 8ca9c4125a2b7c3ea701707134a82ebb08093418 Mon Sep 17 00:00:00 2001 From: Terry Yin Date: Tue, 6 Jul 2021 12:45:47 +0800 Subject: [PATCH] add nix os and bump up version --- .gitignore | 1 + CHANGELOG.md | 5 +++++ Makefile | 4 ++-- README.rst | 3 ++- lizard_ext/version.py | 2 +- shell.nix | 28 ++++++++++++++++++++++++++++ 6 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 shell.nix diff --git a/.gitignore b/.gitignore index 8551cb4a..7fc9528c 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ dist/ *.sw[a-z] .idea .pytest_cache/ +.local/ diff --git a/CHANGELOG.md b/CHANGELOG.md index af396fc6..d81000f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 1.17.8 + +Add Fortran to the language supported + + ## 1.17.7 Bug fixing. `typedef` being read properly. diff --git a/Makefile b/Makefile index 8b20f9ab..8c55bde9 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,10 @@ pylint: pylint --exit-zero --rcfile pylintrc lizard.py lizard_ext lizard_languages deps: - pip3 install -r dev_requirements.txt + pip3 install --user -r dev_requirements.txt pip-upgrade: - pip3 install --upgrade -r dev_requirements.txt + pip3 install --user --upgrade -r dev_requirements.txt build: test python3 setup.py sdist diff --git a/README.rst b/README.rst index 8e0e1262..a6aaf201 100644 --- a/README.rst +++ b/README.rst @@ -348,5 +348,6 @@ Lizard is also used as a plugin for fastlane to help check code complexity and s - `fastlane-plugin-lizard `_ - `sonar `_ -- `European research project FASTEN (Fine-grained Analysis of SofTware Ecosystems as Networks, , for a quality analyzer ()`_ +- `European research project FASTEN (Fine-grained Analysis of SofTware Ecosystems as Networks, `_ + - `for a quality analyzer `_ diff --git a/lizard_ext/version.py b/lizard_ext/version.py index 59b04f90..3cb40d0c 100644 --- a/lizard_ext/version.py +++ b/lizard_ext/version.py @@ -3,4 +3,4 @@ # # pylint: disable=missing-docstring,invalid-name -version = "1.17.7" +version = "1.17.8" diff --git a/shell.nix b/shell.nix new file mode 100644 index 00000000..2a9d6781 --- /dev/null +++ b/shell.nix @@ -0,0 +1,28 @@ +{ pkgs ? import { } }: +with pkgs; +let + apple_sdk = darwin.apple_sdk.frameworks; +in mkShell { + name = "lizard"; + MYSQL_HOME = builtins.getEnv "MYSQL_HOME"; + MYSQL_DATADIR = builtins.getEnv "MYSQL_DATADIR"; + buildInputs = [ + python3Full + python39Packages.pip + python39Packages.setuptools + vim + git + ]; + shellHook = '' + export PYTHONUSERBASE=$PWD/.local + export USER_SITE=`python -c "import site; print(site.USER_SITE)"` + + # bug? it will print 3.8 somehow + export USER_SITE=${"\$\{USER_SITE//3.8/3.9}"} + + export PYTHONPATH=$PYTHONPATH:$USER_SITE + export PATH=$PATH:$PYTHONUSERBASE/bin + make deps + ''; + +}