Skip to content

Commit

Permalink
Minor cleanup
Browse files Browse the repository at this point in the history
* Spelling issues
  • Loading branch information
kayhayen committed Apr 4, 2022
1 parent 436eae0 commit f7584dc
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Nuitka tests

# makes little sense, spell-checker: disable
on:
pull_request:
branches:
Expand Down
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
"devel",
"distutils",
"Doxygen",
"dpkg",
"DYLD",
"dylib",
"elif",
Expand Down Expand Up @@ -151,7 +152,9 @@
"uncompiled",
"unstripped",
"virtualenv",
"zstandard"
"vmprof",
"zstandard",
"zstd"
],
"esbonio.server.enabled": true,
}
6 changes: 4 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Spell checking makes no sense, spell-checker: disable

include LICENSE.txt
include MANIFEST.in
include README.rst README.pdf
Expand Down Expand Up @@ -36,8 +38,8 @@ recursive-include tests/basics *.py
recursive-include tests/syntax *.py
recursive-include tests/packages *.py
recursive-include tests/programs *.py
include tests/programs/pkgutil_usage/package/DATA_FILE.txt
include tests/programs/resource_reader37/some_package/DATA_FILE.txt
include tests/programs/pkgutil_usage/package/DATA_FILE*.txt
include tests/programs/resource_reader37/some_package/DATA_FILE*.txt
recursive-include tests/optimizations *.py
recursive-include tests/standalone *.py
recursive-include tests/onefile *.py
Expand Down
81 changes: 81 additions & 0 deletions misc/make-coverage-rendering.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
#!/usr/bin/python
# Copyright 2021, Kay Hayen, mailto:[email protected]
#
# Part of "Nuitka", an optimizing Python compiler that is compatible and
# integrates with CPython, but also works on its own.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

import os
import shutil
import subprocess
import sys


def main():

# Set the stage.
os.chdir(os.path.dirname(__file__))
shutil.rmtree("coverage", ignore_errors=True)

print("Fetching coverage files:")

subprocess.call(
["rsync", "-az", "--delete", "%s/" % os.environ["COVERAGE_DIR"], "coverage/"]
)

print("Combining coverage files:")
os.chdir("coverage")

print("Detect coverage file roots:")
# Now detect where the files were collected from:

paths = [os.path.abspath(os.path.join(os.curdir, "..", ".."))]

for filename in os.listdir("."):
if not filename.startswith("meta.coverage"):
continue

values = {}
exec(open(filename).read(), values)
if "__builtins__" in values:
del values["__builtins__"]

paths.append(values["NUITKA_SOURCE_DIR"])

coverage_path = os.path.abspath(".coveragerc")

with open(coverage_path, "w") as coverage_rcfile:
coverage_rcfile.write("[paths]\n")
coverage_rcfile.write("source = \n")

for path in paths:
coverage_rcfile.write(" " + path + "\n")

subprocess.call(
[sys.executable, "-m", "coverage", "combine", "--rcfile", coverage_path]
)

assert os.path.exists(coverage_path)

subprocess.call(
[sys.executable, "-m", "coverage", "html", "--rcfile", coverage_path]
)

# Clean up after ourselves again.
# shutil.rmtree("coverage", ignore_errors = True)


if __name__ == "__main__":
main()
3 changes: 2 additions & 1 deletion nuitka/Options.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"""

# These are for use in option values.
# spell-checker: ignore uiaccess,noannotations,nodocstrings,noasserts,nowarnings,norandomization,etherium
# spell-checker: ignore uiaccess,noannotations,reexecution,etherium
# spell-checker: ignore nodocstrings,noasserts,nowarnings,norandomization

import fnmatch
import os
Expand Down
5 changes: 4 additions & 1 deletion nuitka/build/Backend.scons
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ from .SconsUtils import (
writeSconsReport,
)

# spell-checker: ignore ccversion,ccflags,werror,cppdefines,cpppath,cppflags
# spell-checker: ignore cxxflags,ldflags

# Set the arguments.
setArguments(ARGUMENTS)

Expand Down Expand Up @@ -637,7 +640,7 @@ def _detectPythonHeaderPath():

if win_target:
scons_logger.sysexit(
"""Error, you seem to be using the unsupported embeddable CPython distribution."""
"""Error, you seem to be using the unsupported embedable CPython distribution."""
)
else:
scons_logger.sysexit(
Expand Down

0 comments on commit f7584dc

Please sign in to comment.