fix cf test script

bacali95 · Jan 4, 2020 · f54a8db · f54a8db
1 parent 7432e0b
commit f54a8db
Show file tree

Hide file tree

Showing 21 changed files with 12 additions and 16 deletions.
diff --git a/cf b/cf
@@ -2,7 +2,7 @@
 
 import sys
 
-from src import cf_main
+from cf_submit import cf_main
 
 if __name__ == '__main__':
     try:

diff --git a/cf_submit/__init__.py b/cf_submit/__init__.py
@@ -0,0 +1 @@
+__version__ = '1.3.1'
diff --git a/src/bash_completion/cf → cf_submit/bash_completion/cf b/src/bash_completion/cf → cf_submit/bash_completion/cf
diff --git a/src/bin/cf_checker → cf_submit/bin/cf_checker b/src/bin/cf_checker → cf_submit/bin/cf_checker
diff --git a/src/cf_colors.py → cf_submit/cf_colors.py b/src/cf_colors.py → cf_submit/cf_colors.py
diff --git a/src/cf_contests.py → cf_submit/cf_contests.py b/src/cf_contests.py → cf_submit/cf_contests.py
diff --git a/src/cf_groups.py → cf_submit/cf_groups.py b/src/cf_groups.py → cf_submit/cf_groups.py
diff --git a/src/cf_gyms.py → cf_submit/cf_gyms.py b/src/cf_gyms.py → cf_submit/cf_gyms.py
diff --git a/src/cf_hack.py → cf_submit/cf_hack.py b/src/cf_hack.py → cf_submit/cf_hack.py
diff --git a/src/cf_login.py → cf_submit/cf_login.py b/src/cf_login.py → cf_submit/cf_login.py
diff --git a/src/cf_main.py → cf_submit/cf_main.py b/src/cf_main.py → cf_submit/cf_main.py
diff --git a/src/cf_parse.py → cf_submit/cf_parse.py b/src/cf_parse.py → cf_submit/cf_parse.py
diff --git a/src/cf_problems.py → cf_submit/cf_problems.py b/src/cf_problems.py → cf_submit/cf_problems.py
diff --git a/src/cf_standings.py → cf_submit/cf_standings.py b/src/cf_standings.py → cf_submit/cf_standings.py
diff --git a/src/cf_submit.py → cf_submit/cf_submit.py b/src/cf_submit.py → cf_submit/cf_submit.py
diff --git a/src/cf_test.py → cf_submit/cf_test.py b/src/cf_test.py → cf_submit/cf_test.py
@@ -50,13 +50,13 @@ def execute(source, lang, executable, input_file, output_file):
     if lang == 'cpp' or lang == 'c':
         cmd = './%s' % executable
     elif lang == 'java':
-        cmd = ['java', '-DLOCAL', executable]
+        cmd = 'java -DLOCAL %s' % executable
     elif lang == 'kt':
-        cmd = ['java', '-DLOCAL', '-jar', executable + '.jar']
+        cmd = 'java -DLOCAL -jar %s.jar' % executable
     elif lang == 'py2':
-        cmd = ['python2', source]
+        cmd = 'python2 %s ' % source
     elif lang == 'py3':
-        cmd = ['python3', source]
+        cmd = 'python3 %s ' % source
     else:
         print('Sorry language not supported!')
         return exit(-1)
@@ -65,13 +65,13 @@ def execute(source, lang, executable, input_file, output_file):
 
 def comp(source, lang, executable):
     if lang == 'cpp':
-        cmd = ['g++', source, '-DLOCAL', '-O2', '-o', executable]
+        cmd = 'g++ %s -DLOCAL -O2 -o %s' % (source, executable)
     elif lang == 'c':
-        cmd = ['gcc', source, '-DLOCAL', '-O2', '-o', executable]
+        cmd = 'gcc %s -DLOCAL -O2 -o %s' % (source, executable)
     elif lang == 'java':
-        cmd = ['javac', source]
+        cmd = 'javac %s' % source
     elif lang == 'kt':
-        cmd = ['kotlinc', source, '-include-runtime', '-d', executable]
+        cmd = 'javac %s -include-runtime -d %s' % (source, executable)
     else:
         cmd = []
     Popen(cmd, shell=True).wait()
diff --git a/src/cf_utils.py → cf_submit/cf_utils.py b/src/cf_utils.py → cf_submit/cf_utils.py
diff --git a/src/codeforces.py → cf_submit/codeforces.py b/src/codeforces.py → cf_submit/codeforces.py
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='cf_submit',
-    version='1.3.0',
+    version='1.3.1',
     scripts=['cf'],
     author='Nasreddine Bac Ali',
     author_email='[email protected]',
@@ -15,7 +15,7 @@
     url='https://github.com/bacali95/cf_submit',
     packages=find_packages(),
     package_data={
-        'src': [
+        'cf_submit': [
             'bin/cf_checker',
             'bash_completion/cf'
         ]

diff --git a/src/__init__.py b/src/__init__.py
diff --git a/src/requirements.txt b/src/requirements.txt