Some skel cleanup.

Author: ionelmc

ci/bootstrap.py

@@ -5,13 +5,16 @@
 from __future__ import unicode_literals
 
 import os
-import pathlib
 import subprocess
 import sys
+from os.path import abspath
+from os.path import dirname
+from os.path import exists
+from os.path import join
+from os.path import relpath
 
-self_path = pathlib.Path(__file__).resolve()
-base_path = self_path.parent.parent
-template_path = base_path.joinpath('ci', 'templates')
+base_path = dirname(dirname(abspath(__file__)))
+templates_path = join(base_path, 'ci', 'templates')
 
 
 def check_call(args):
@@ -20,12 +23,14 @@ def check_call(args):
 
 
 def exec_in_env():
-    env_path = base_path.joinpath('.tox', 'bootstrap')
+    env_path = join(base_path, '.tox', 'bootstrap')
     if sys.platform == 'win32':
-        bin_path = env_path.joinpath('Scripts')
+        bin_path = join(env_path, 'Scripts')
     else:
-        bin_path = env_path.joinpath('bin')
-    if not env_path.exists():
+        bin_path = join(env_path, 'bin')
+    if not exists(env_path):
+        import subprocess
+
         print('Making bootstrap env in: {0} ...'.format(env_path))
         try:
             check_call([sys.executable, '-m', 'venv', env_path])
@@ -35,29 +40,26 @@ def exec_in_env():
             except subprocess.CalledProcessError:
                 check_call(['virtualenv', env_path])
         print('Installing `jinja2` into bootstrap environment...')
-        check_call([bin_path.joinpath('pip'), 'install', 'jinja2', 'tox'])
-    python_executable = bin_path.joinpath('python')
-    if not python_executable.exists():
-        python_executable = '{}.exe'.format(python_executable)
-    else:
-        python_executable = str(python_executable)
+        check_call([join(bin_path, 'pip'), 'install', 'jinja2', 'tox'])
+    python_executable = join(bin_path, 'python')
+    if not os.path.exists(python_executable):
+        python_executable += '.exe'
 
     print('Re-executing with: {0}'.format(python_executable))
-    print('+ exec', python_executable, self_path, '--no-env')
-    os.execv(python_executable, [python_executable, self_path, '--no-env'])
+    print('+ exec', python_executable, __file__, '--no-env')
+    os.execv(python_executable, [python_executable, __file__, '--no-env'])
 
 
 def main():
     import jinja2
 
     print('Project path: {0}'.format(base_path))
 
-    # noinspection JinjaAutoinspect
     jinja = jinja2.Environment(
-        loader=jinja2.FileSystemLoader(str(template_path)),
+        loader=jinja2.FileSystemLoader(templates_path),
         trim_blocks=True,
         lstrip_blocks=True,
-        keep_trailing_newline=True,
+        keep_trailing_newline=True
     )
 
     tox_environments = [
@@ -71,13 +73,12 @@ def main():
     ]
     tox_environments = [line for line in tox_environments if line.startswith('py')]
 
-    for path in template_path.rglob('*'):
-        if path.is_dir():
-            continue
-        name = path.relative_to(template_path)
-        with base_path.joinpath(name).open('w') as fh:
-            fh.write(jinja.get_template(str(name)).render(tox_environments=tox_environments))
-        print('Wrote {}'.format(name))
+    for root, _, files in os.walk(templates_path):
+        for name in files:
+            relative = relpath(root, templates_path)
+            with open(join(base_path, relative, name), 'w') as fh:
+                fh.write(jinja.get_template(join(relative, name)).render(tox_environments=tox_environments))
+            print('Wrote {}'.format(name))
     print('DONE.')
 
 

ci/requirements.txt

@@ -2,3 +2,4 @@ virtualenv>=20.4.7
 pip>=19.1.1
 setuptools>=18.0.1
 six>=1.14.0
+tox

ci/templates/.github/workflows/github-actions.yml

@@ -71,7 +71,7 @@ jobs:
         architecture: {{ '${{ matrix.python_arch }}' }}
     - name: install dependencies
       run: |
-        python -mpip install --progress-bar=off twine tox cibuildwheel -r ci/requirements.txt
+        python -mpip install --progress-bar=off cibuildwheel -r ci/requirements.txt
         virtualenv --version
         pip --version
         tox --version