sinol-make 1.6.0.dev3__tar.gz → 1.6.0.dev4__tar.gz

{sinol_make-1.6.0.dev3/src/sinol_make.egg-info → sinol_make-1.6.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sinol_make
-Version: 1.6.0.dev3
+Version: 1.6.0.dev4
 Summary: CLI tool for creating sio2 task packages
 Author: Mateusz Masiarz
 Author-email: m.masiarz@fri.edu.pl

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/src/sinol_make/__init__.py

@@ -6,7 +6,7 @@ import argcomplete
 
 from sinol_make import util, oiejq
 
-__version__ = "1.6.0.dev3"
+__version__ = "1.6.0.dev4"
 
 
 def configure_parsers():
@@ -50,8 +50,10 @@ def main_exn():
     parser = configure_parsers()
     arguments = []
     curr_args = []
+    commands = util.get_commands()
+    commands_dict = {command.get_name(): command for command in commands}
     for arg in sys.argv[1:]:
-        if arg in util.get_command_names() and not (len(curr_args) > 0 and curr_args[0] == 'init'):
+        if arg in commands_dict.keys() and not (len(curr_args) > 0 and curr_args[0] == 'init'):
             if curr_args:
                 arguments.append(curr_args)
             curr_args = [arg]
@@ -59,19 +61,19 @@ def main_exn():
             curr_args.append(arg)
     if curr_args:
         arguments.append(curr_args)
-    commands = util.get_commands()
+    if not arguments:
+        parser.print_help()
+        exit(1)
     check_oiejq()
 
     for curr_args in arguments:
         args = parser.parse_args(curr_args)
-        command_found = False
-        for command in commands:
-            if command.get_name() == args.command:
-                command_found = True
-                if len(arguments) > 1:
-                    print(f' {command.get_name()} command '.center(util.get_terminal_size()[1], '='))
-                command.run(args)
-        if not command_found:
+        command = commands_dict.get(args.command, None)
+        if command:
+            if len(arguments) > 1:
+                print(f' {command.get_name()} command '.center(util.get_terminal_size()[1], '='))
+            command.run(args)
+        else:
             parser.print_help()
             exit(1)
 

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/src/sinol_make/commands/doc/__init__.py

@@ -18,7 +18,7 @@ class Command(BaseCommand):
         return "doc"
 
     def compile_file_latex_div(self, file_path):
-        print(util.info(f'Compiling {os.path.basename(file_path)} (latex to dvi)...'))
+        print(f'Compiling {os.path.basename(file_path)} (latex to dvi)...')
         os.chdir(os.path.dirname(file_path))
         subprocess.run(['latex', file_path])
         dvi_file = os.path.splitext(file_path)[0] + '.dvi'
@@ -35,7 +35,7 @@ class Command(BaseCommand):
         return True
 
     def compile_pdf_latex(self, file_path):
-        print(util.info(f'Compiling {os.path.basename(file_path)} (pdflatex)...'))
+        print(f'Compiling {os.path.basename(file_path)} (pdflatex)...')
         os.chdir(os.path.dirname(file_path))
         subprocess.run(['pdflatex', file_path])
         pdf_file = os.path.splitext(file_path)[0] + '.pdf'
@@ -62,7 +62,7 @@ class Command(BaseCommand):
         for pattern in self.LOG_PATTERNS:
             for file in glob.glob(os.path.join(os.getcwd(), 'doc', pattern)):
                 os.rename(file, os.path.join(output_dir, os.path.basename(file)))
-        print(util.info(f'Compilation log files can be found in {os.path.relpath(output_dir, os.getcwd())}'))
+        print(f'Compilation log files can be found in {os.path.relpath(output_dir, os.getcwd())}')
 
     def configure_subparser(self, subparser: argparse.ArgumentParser):
         parser = subparser.add_parser(

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/src/sinol_make/commands/export/__init__.py

@@ -28,10 +28,7 @@ class Command(BaseCommand):
             self.get_name(),
             help='Create archive for oioioi upload',
             description='Creates archive in the current directory ready to upload to sio2 or szkopul.')
-        parser.add_argument('-c', '--cpus', type=int,
-                            help=f'number of cpus to use to generate output files '
-                                 f'(default: {util.default_cpu_count()})',
-                            default=util.default_cpu_count())
+        parsers.add_cpus_argument(parser, 'number of cpus to use to generate output files')
         parser.add_argument('--no-statement', dest='no_statement', action='store_true',
                             help='allow export without statement')
         parser.add_argument('--export-ocen', dest='export_ocen', action='store_true',
@@ -118,12 +115,14 @@ class Command(BaseCommand):
                     shutil.copy(test, os.path.join(ocen_dir, ext, os.path.basename(test)))
                     num_tests += 1
 
+            dlazaw_dir = os.path.join(os.getcwd(), 'dlazaw')
             if num_tests == 0:
                 print(util.warning('No ocen tests found.'))
+            elif os.path.exists(dlazaw_dir):
+                print(util.warning('Skipping ocen arhive creation because dlazaw directory exists.'))
             else:
                 shutil.make_archive(os.path.join(attachments_dir, f'{self.task_id}ocen'), 'zip', tmpdir)
 
-            dlazaw_dir = os.path.join(os.getcwd(), 'dlazaw')
             if os.path.exists(dlazaw_dir):
                 print('Archiving dlazaw directory and adding to attachments.')
                 os.makedirs(os.path.join(tmpdir, 'dlazaw'), exist_ok=True)

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/src/sinol_make/commands/gen/__init__.py

@@ -31,10 +31,7 @@ class Command(BaseCommand):
                             help='path to ingen source file, for example prog/abcingen.cpp')
         parser.add_argument('-i', '--only-inputs', action='store_true', help='generate input files only')
         parser.add_argument('-o', '--only-outputs', action='store_true', help='generate output files only')
-        parser.add_argument('-c', '--cpus', type=int,
-                            help=f'number of cpus to use to generate output files '
-                                 f'(default: {util.default_cpu_count()})',
-                            default=util.default_cpu_count())
+        parsers.add_cpus_argument(parser, 'number of cpus to use to generate output files')
         parser.add_argument('-n', '--no-validate', default=False, action='store_true',
                             help='do not validate test contents')
         parser.add_argument('-f', '--fsanitize', default=False, action='store_true',

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/src/sinol_make/commands/ingen/__init__.py

@@ -30,6 +30,7 @@ class Command(BaseCommand):
                             help='path to ingen source file, for example prog/abcingen.cpp')
         parser.add_argument('-n', '--no-validate', default=False, action='store_true',
                             help='do not validate test contents')
+        parsers.add_cpus_argument(parser, 'number of cpus used for validating tests')
         parser.add_argument('-f', '--fsanitize', default=False, action='store_true',
                             help='Use -fsanitize=address,undefined for compilation. Warning: this may fail on some '
                                  'systems. Tof fix this, run `sudo sysctl vm.mmap_rnd_bits = 28`.')
@@ -45,7 +46,7 @@ class Command(BaseCommand):
         package_util.validate_test_names(self.task_id)
         util.change_stack_size_to_unlimited()
         self.ingen = get_ingen(self.task_id, args.ingen_path)
-        print(util.info(f'Using ingen file {os.path.basename(self.ingen)}'))
+        print(f'Using ingen file {os.path.basename(self.ingen)}')
         self.ingen_exe = compile_ingen(self.ingen, self.args, self.args.compile_mode, self.args.fsanitize)
 
         previous_tests = []
@@ -64,7 +65,7 @@ class Command(BaseCommand):
         else:
             util.exit_with_error('Failed to generate input files.')
 
-        print(util.info('Cleaning up old input files.'))
+        print('Cleaning up old input files.')
         for test in glob.glob(os.path.join(os.getcwd(), "in", f"{self.task_id}*.in")):
             basename = os.path.basename(test)
             if basename in dates and dates[basename] == os.path.getmtime(test):
@@ -74,8 +75,5 @@ class Command(BaseCommand):
             f.write("\n".join(glob.glob(os.path.join(os.getcwd(), "in", f"{self.task_id}*.in"))))
 
         if not self.args.no_validate:
-            print(util.info('Validating input test contents.'))
             tests = sorted(glob.glob(os.path.join(os.getcwd(), "in", f"{self.task_id}*.in")))
-            for test in tests:
-                package_util.validate_test(test)
-            print(util.info('Input test contents are valid!'))
+            package_util.validate_tests(tests, self.args.cpus, 'input')

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/src/sinol_make/commands/inwer/__init__.py

@@ -10,8 +10,7 @@ from typing import Dict, List
 
 from sinol_make import util
 from sinol_make.structs.inwer_structs import TestResult, InwerExecution, VerificationResult, TableData
-from sinol_make.helpers import package_util, compile, printer, paths
-from sinol_make.helpers.parsers import add_compilation_arguments
+from sinol_make.helpers import package_util, printer, paths, parsers
 from sinol_make.interfaces.BaseCommand import BaseCommand
 from sinol_make.commands.inwer import inwer_util
 
@@ -37,12 +36,11 @@ class Command(BaseCommand):
                             help='path to inwer source file, for example prog/abcinwer.cpp')
         parser.add_argument('-t', '--tests', type=str, nargs='+',
                             help='test to verify, for example in/abc{0,1}*')
-        parser.add_argument('-c', '--cpus', type=int,
-                            help=f'number of cpus to use (default: {util.default_cpu_count()})')
+        parsers.add_cpus_argument(parser, 'number of cpus to use when verifying tests')
         parser.add_argument('-f', '--fsanitize', default=False, action='store_true',
                             help='Use -fsanitize=address,undefined for compilation. Warning: this may fail on some '
                                  'systems. Tof fix this, run `sudo sysctl vm.mmap_rnd_bits = 28`.')
-        add_compilation_arguments(parser)
+        parsers.add_compilation_arguments(parser)
         return parser
 
     @staticmethod

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/src/sinol_make/commands/outgen/__init__.py

@@ -26,11 +26,7 @@ class Command(BaseCommand):
             help='Generate output files',
             description='Generate output files using the correct solution.'
         )
-
-        parser.add_argument('-c', '--cpus', type=int,
-                            help=f'number of cpus to use to generate output files '
-                                 f'(default: {util.default_cpu_count()})',
-                            default=util.default_cpu_count())
+        parsers.add_cpus_argument(parser, 'number of cpus to use to generate output files')
         parser.add_argument('-n', '--no-validate', default=False, action='store_true',
                             help='do not validate test contents')
         parsers.add_compilation_arguments(parser)
@@ -50,7 +46,7 @@ class Command(BaseCommand):
             for i, result in enumerate(pool.imap(generate_output, arguments)):
                 results.append(result)
                 if result:
-                    print(util.info(f'Successfully generated output file {os.path.basename(arguments[i].output_test)}'))
+                    print(f'Successfully generated output file {os.path.basename(arguments[i].output_test)}')
                 else:
                     print(util.error(f'Failed to generate output file {os.path.basename(arguments[i].output_test)}'))
 
@@ -130,7 +126,4 @@ class Command(BaseCommand):
                 yaml.dump(md5_sums, f)
 
         if not self.args.no_validate:
-            print(util.info('Validating output test contents.'))
-            for test in sorted(outputs_to_generate):
-                package_util.validate_test(test)
-            print(util.info('Output test contents are valid!'))
+            package_util.validate_tests(sorted(outputs_to_generate), self.args.cpus, 'outputs')

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/src/sinol_make/commands/run/__init__.py

@@ -8,21 +8,23 @@ import time
 import psutil
 import glob
 import shutil
+import os
+import collections
+import sys
+import math
+import dictdiffer
+import multiprocessing as mp
 from io import StringIO
 from typing import Dict
 
-from sinol_make import contest_types, oiejq
+from sinol_make import contest_types, oiejq, util
 from sinol_make.structs.run_structs import ExecutionData, PrintData
 from sinol_make.structs.cache_structs import CacheTest, CacheFile
-from sinol_make.helpers.parsers import add_compilation_arguments
 from sinol_make.interfaces.BaseCommand import BaseCommand
 from sinol_make.interfaces.Errors import CompilationError, CheckerOutputException, UnknownContestType
-from sinol_make.helpers import compile, compiler, package_util, printer, paths, cache
+from sinol_make.helpers import compile, compiler, package_util, printer, paths, cache, parsers
 from sinol_make.structs.status_structs import Status, ResultChange, PointsChange, ValidationResult, ExecutionResult, \
     TotalPointsChange
-import sinol_make.util as util
-import yaml, os, collections, sys, re, math, dictdiffer
-import multiprocessing as mp
 
 
 def color_memory(memory, limit):
@@ -288,8 +290,7 @@ class Command(BaseCommand):
                             help='solutions to be run, for example prog/abc{b,s}*.{cpp,py}')
         parser.add_argument('-t', '--tests', type=str, nargs='+',
                             help='tests to be run, for example in/abc{0,1}*')
-        parser.add_argument('-c', '--cpus', type=int,
-                            help=f'number of cpus to use (default: {util.default_cpu_count()}')
+        parsers.add_cpus_argument(parser, 'number of cpus to use when running solutions')
         parser.add_argument('--tl', type=float, help='time limit for all tests (in s)')
         parser.add_argument('--ml', type=float, help='memory limit for all tests (in MB)')
         parser.add_argument('--hide-memory', dest='hide_memory', action='store_true',
@@ -300,7 +301,10 @@ class Command(BaseCommand):
                             help='path to oiejq executable (default: `~/.local/bin/oiejq`)')
         parser.add_argument('-a', '--apply-suggestions', dest='apply_suggestions', action='store_true',
                             help='apply suggestions from expected scores report')
-        add_compilation_arguments(parser)
+        parser.add_argument('--ignore-expected', dest='ignore_expected', action='store_true',
+                            help='ignore expected scores from config.yml. When this flag is set, '
+                                 'the expected scores are not compared with the actual scores.')
+        parsers.add_compilation_arguments(parser)
         return parser
 
     def parse_time(self, time_str):
@@ -1017,7 +1021,7 @@ class Command(BaseCommand):
 
                 self.config["sinol_expected_scores"] = self.convert_status_to_string(config_expected_scores)
                 util.save_config(self.config)
-                print(util.info("Saved suggested expected scores description."))
+                print("Saved suggested expected scores description.")
             else:
                 util.exit_with_error("Use flag --apply-suggestions to apply suggestions.")
 
@@ -1211,7 +1215,7 @@ class Command(BaseCommand):
 
         checker = package_util.get_files_matching_pattern(self.ID, f'{self.ID}chk.*')
         if len(checker) != 0:
-            print(util.info("Checker found: %s" % os.path.basename(checker[0])))
+            print("Checker found: %s" % os.path.basename(checker[0]))
             self.checker = checker[0]
             self.compile_checker()
         else:
@@ -1238,6 +1242,11 @@ class Command(BaseCommand):
 
         results, all_results = self.compile_and_run(solutions)
         self.check_errors(all_results)
+        if self.args.ignore_expected:
+            print(util.warning("Ignoring expected scores."))
+            self.exit()
+            return
+
         try:
             validation_results = self.validate_expected_scores(results)
         except Exception:

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/src/sinol_make/commands/verify/__init__.py

@@ -40,6 +40,10 @@ class Command(BaseCommand):
                             help=f'number of cpus that sinol-make will use '
                                  f'(default: {util.default_cpu_count()})',
                             default=util.default_cpu_count())
+        parser.add_argument('--ignore-expected', dest='ignore_expected', action='store_true',
+                            help='ignore expected scores from config.yml. When this flag is set, '
+                                 'the expected scores are not compared with the actual scores. '
+                                 'This flag will be passed to the run command.')
         parsers.add_compilation_arguments(parser)
 
     def remove_cache(self):

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/src/sinol_make/helpers/compiler.py

@@ -1,12 +1,12 @@
 from typing import List
-
+import subprocess
 import argparse
+import sys
 import os
 
-import sinol_make.util as util
-import sys, subprocess
-
+from sinol_make import util
 from sinol_make.structs.compiler_structs import Compilers
+from sinol_make.helpers.func_cache import cache_result
 
 
 def check_if_installed(compiler):
@@ -22,6 +22,7 @@ def check_if_installed(compiler):
     return True
 
 
+@cache_result()
 def get_c_compiler_path():
     """
     Get the C compiler
@@ -41,6 +42,7 @@ def get_c_compiler_path():
         return None
 
 
+@cache_result()
 def get_cpp_compiler_path():
     """
     Get the C++ compiler
@@ -62,6 +64,7 @@ def get_cpp_compiler_path():
         return None
 
 
+@cache_result()
 def get_python_interpreter_path():
     """
     Get the Python interpreter
@@ -75,6 +78,7 @@ def get_python_interpreter_path():
     return None
 
 
+@cache_result()
 def get_java_compiler_path():
     """
     Get the Java compiler
@@ -94,7 +98,8 @@ def get_default_compilers():
         c_compiler_path=get_c_compiler_path(),
         cpp_compiler_path=get_cpp_compiler_path(),
         python_interpreter_path=get_python_interpreter_path(),
-        java_compiler_path=get_java_compiler_path()
+        # Java is not currently supported by sinol-make
+        # java_compiler_path=get_java_compiler_path()
     )
 
 
@@ -141,5 +146,5 @@ def verify_compilers(args: argparse.Namespace, solutions: List[str]) -> Compiler
         c_compiler_path=args.c_compiler_path,
         cpp_compiler_path=args.cpp_compiler_path,
         python_interpreter_path=args.python_interpreter_path,
-        java_compiler_path=args.java_compiler_path
+        java_compiler_path=None
     )

sinol_make-1.6.0.dev4/src/sinol_make/helpers/func_cache.py

@@ -0,0 +1,30 @@
+import os
+
+__cache = {}
+
+
+def cache_result(cwd=False):
+    """
+    Function to cache the result of a function.
+    """
+    def decorator(func):
+        def wrapper(*args, **kwargs):
+            if cwd:
+                key = (func.__name__, os.getcwd())
+            else:
+                key = func.__name__
+
+            if key in __cache:
+                return __cache[key]
+            result = func(*args, **kwargs)
+            __cache[key] = result
+            return result
+        return wrapper
+    return decorator
+
+
+def clear_cache():
+    """
+    Function to clear the cache.
+    """
+    __cache.clear()

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/src/sinol_make/helpers/package_util.py

@@ -3,13 +3,16 @@ import re
 import yaml
 import glob
 import fnmatch
+import multiprocessing as mp
 from enum import Enum
-from typing import List, Union, Dict, Any
+from typing import List, Union, Dict, Any, Tuple
 
+from sinol_make.helpers.func_cache import cache_result
 from sinol_make import util
 from sinol_make.helpers import paths
 
 
+@cache_result(cwd=True)
 def get_task_id() -> str:
     config = get_config()
     if "sinol_task_id" in config:
@@ -353,11 +356,12 @@ def save_contest_type_to_cache(contest_type):
         contest_type_file.write(contest_type)
 
 
-def validate_test(test_path: str):
+def validate_test(test_path: str) -> Tuple[bool, str]:
     """
     Check if test doesn't contain leading/trailing whitespaces,
     has only one space between tokens and ends with newline.
     Exits with error if any of the conditions is not met.
+    :return: Tuple of two values: True if test is valid, error message otherwise.
     """
     basename = os.path.basename(test_path)
     num_empty = 0
@@ -366,24 +370,45 @@ def validate_test(test_path: str):
         for i, line in enumerate(lines):
             line = line.decode('utf-8')
             if len(line) > 0 and line[0] == ' ':
-                util.exit_with_error(f'Leading whitespace in {basename}:{i + 1}')
+                return False, util.error(f'Leading whitespace in {basename}:{i + 1}')
             if len(line) > 0 and (line[-2:] == '\r\n' or line[-2:] == '\n\r' or line[-1] == '\r'):
-                util.exit_with_error(f'Carriage return at the end of {basename}:{i + 1}')
+                return False, util.error(f'Carriage return at the end of {basename}:{i + 1}')
             if len(line) > 0 and line[-1] != '\n':
-                util.exit_with_error(f'No newline at the end of {basename}')
+                return False, util.error(f'No newline at the end of {basename}')
             if line == '\n' or line == '':
                 num_empty += 1
                 continue
             elif i == len(lines) - 1:
                 num_empty = 0
             if line[-2] == ' ':
-                util.exit_with_error(f'Trailing whitespace in {basename}:{i + 1}')
+                return False, util.error(f'Trailing whitespace in {basename}:{i + 1}')
             for j in range(len(line) - 1):
                 if line[j] == ' ' and line[j + 1] == ' ':
-                    util.exit_with_error(f'Tokens not separated by one space in {basename}:{i + 1}')
+                    return False, util.error(f'Tokens not separated by one space in {basename}:{i + 1}')
 
         if num_empty != 0:
-            util.exit_with_error(f'Exactly one empty line expected in {basename}')
+            return False, util.error(f'Exactly one empty line expected in {basename}')
+
+    return True, ''
+
+
+def validate_tests(tests: List[str], cpus: int, type: str = 'input'):
+    """
+    Validate all tests in parallel.
+    """
+    if not tests:
+        return
+    print(f'Validating {type} test contents.')
+    num_tests = len(tests)
+    finished = 0
+    with mp.Pool(cpus) as pool:
+        for valid, message in pool.imap(validate_test, tests):
+            if not valid:
+                util.exit_with_error(message)
+            finished += 1
+            print(f'Validated {finished}/{num_tests} tests', end='\r')
+    print()
+    print(util.info(f'All {type} tests are valid!'))
 
 
 def get_all_inputs(task_id):

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/src/sinol_make/helpers/parsers.py

@@ -1,7 +1,7 @@
 import sys
-
 import argparse
 
+from sinol_make import util
 from sinol_make.helpers import compiler
 
 
@@ -20,8 +20,9 @@ def add_compilation_arguments(parser: argparse.ArgumentParser):
     parser.add_argument('--python-interpreter-path', dest='python_interpreter_path', type=str,
                         default=compiler.get_python_interpreter_path(),
                         help='Python interpreter to use (default: python3)')
-    parser.add_argument('--java-compiler-path', dest='java_compiler_path', type=str,
-                        default=compiler.get_java_compiler_path(), help='Java compiler to use (default: javac)')
+    # Java is not currently supported by sinol-make
+    # parser.add_argument('--java-compiler-path', dest='java_compiler_path', type=str,
+    #                     default=compiler.get_java_compiler_path(), help='Java compiler to use (default: javac)')
     parser.add_argument('--compile-mode', '-C', dest='compile_mode', choices=['default', 'oioioi', 'weak', 'd', 'o', 'w'],
                         help='Warning flag groups used to compile C/C++ files. Available options:\n'
                              ' default / d - uses default flags: \n'
@@ -29,3 +30,10 @@ def add_compilation_arguments(parser: argparse.ArgumentParser):
                              ' oioioi / o - uses the same flags as oioioi:\n'
                              '    (-Wall -Wno-unused-result -Werror)'
                              ' weak / w - disable all warning flags during C and C++ compilation', default='default')
+
+
+def add_cpus_argument(parser: argparse.ArgumentParser, help: str):
+    parser.add_argument('-c', '--cpus', type=int,
+                        help=f'{help} '
+                             f'(default: {util.default_cpu_count()})',
+                        default=util.default_cpu_count())

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/src/sinol_make/util.py

@@ -1,6 +1,5 @@
 import glob, importlib, os, sys, requests, yaml
 import math
-import multiprocessing
 import platform
 import tarfile
 import hashlib
@@ -11,19 +10,15 @@ from packaging.version import parse as parse_version
 
 from sinol_make.contest_types import get_contest_type
 from sinol_make.helpers import paths, cache
+from sinol_make.helpers.func_cache import cache_result
 from sinol_make.structs.status_structs import Status
 
 
-__cache = {}
-
-
+@cache_result()
 def get_commands():
     """
     Function to get an array of all available commands.
     """
-    global __cache
-    if 'commands' in __cache:
-        return __cache['commands']
     commands_path = glob.glob(
         os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
@@ -35,7 +30,6 @@ def get_commands():
         temp = importlib.import_module('sinol_make.commands.' + os.path.basename(path), 'Command')
         commands.append(temp.Command())
 
-    __cache['commands'] = commands
     return commands
 
 

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4/src/sinol_make.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sinol_make
-Version: 1.6.0.dev3
+Version: 1.6.0.dev4
 Summary: CLI tool for creating sio2 task packages
 Author: Mateusz Masiarz
 Author-email: m.masiarz@fri.edu.pl

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/src/sinol_make.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ src/sinol_make/helpers/__init__.py
 src/sinol_make/helpers/cache.py
 src/sinol_make/helpers/compile.py
 src/sinol_make/helpers/compiler.py
+src/sinol_make/helpers/func_cache.py
 src/sinol_make/helpers/package_util.py
 src/sinol_make/helpers/parsers.py
 src/sinol_make/helpers/paths.py

{sinol_make-1.6.0.dev3 → sinol_make-1.6.0.dev4}/tests/test_util.py

@@ -52,24 +52,27 @@ def test_check_version(**kwargs):
     """
     mocker = kwargs["mocker"]
 
-    mocker.get("https://pypi.python.org/pypi/sinol-make/json", json={"info": {"version": "1.0.0.dev2"}})
+    def create_response(version):
+        return {"releases": {version: "something"}}
+
+    mocker.get("https://pypi.python.org/pypi/sinol-make/json", json=create_response("1.0.0.dev2"))
     util.check_version()
     version = util.check_for_updates("1.0.0.dev1", False)
     assert version == "1.0.0.dev2"
     assert util.is_dev(version)
 
-    mocker.get("https://pypi.python.org/pypi/sinol-make/json", json={"info": {"version": "1.0.0"}})
+    mocker.get("https://pypi.python.org/pypi/sinol-make/json", json=create_response("1.0.0"))
     util.check_version()
     version = util.check_for_updates("1.0.0.dev1", False)
     assert version == "1.0.0"
     assert not util.is_dev(version)
 
-    mocker.get("https://pypi.python.org/pypi/sinol-make/json", json={"info": {"version": "2.0.0.dev1"}})
+    mocker.get("https://pypi.python.org/pypi/sinol-make/json", json=create_response("2.0.0.dev1"))
     util.check_version()
     version = util.check_for_updates("1.0.0", False)
     assert version is None
 
-    mocker.get("https://pypi.python.org/pypi/sinol-make/json", json={"info": {"version": "1.0.1"}})
+    mocker.get("https://pypi.python.org/pypi/sinol-make/json", json=create_response("1.0.1"))
     util.check_version()
     version = util.check_for_updates("1.0.0", False)
     assert version == "1.0.1"
@@ -86,7 +89,7 @@ def test_check_version(**kwargs):
         version_file.unlink()
 
     # Test correct request
-    mocker.get("https://pypi.python.org/pypi/sinol-make/json", json={"info": {"version": "1.0.0"}})
+    mocker.get("https://pypi.python.org/pypi/sinol-make/json", json=create_response(("1.0.0")))
     util.check_version()
     assert version_file.is_file()
     assert version_file.read_text() == "1.0.0"