diff --git a/.travis.yml b/.travis.yml index 713fed4b0..11a0b06ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ script: - python scripts/lint.py - python scripts/readme.py - python scripts/tdd.py +- python3 website/main.py after_success: - chmod +x .travis/push.sh - .travis/push.sh diff --git a/.travis/push.sh b/.travis/push.sh index 903d4273d..03a3f2316 100755 --- a/.travis/push.sh +++ b/.travis/push.sh @@ -31,6 +31,9 @@ upload_files() { echo "Pushing to master branch..." git push --force "https://${GH_TOKEN}@github.com/kriadmin/30-seconds-of-python-code.git" master > /dev/null 2>&1 echo "Pushing done" + echo "Pushing to website" + git subtree push --prefix website "https://${GH_TOKEN}@github.com/kriadmin/30-seconds-of-python-code.git" website --force + echo "Pushed to master branch" git status fi fi diff --git a/requirements.txt b/requirements.txt index c7b0fd7e2..38ed59c31 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,12 @@ -autopep8==1.3.3 \ No newline at end of file +autopep8==1.3.3 +cffi==1.11.4 +click==6.7 +emoji==0.4.5 +Flask==0.12.2 +gunicorn==19.7.1 +itsdangerous==0.24 +Jinja2==2.10 +MarkupSafe==1.0 +misaka==2.1.0 +pycparser==2.18 +Werkzeug==0.14.1 \ No newline at end of file diff --git a/scripts/tdd.py b/scripts/tdd.py index 120ff9d3a..d3c647d3e 100644 --- a/scripts/tdd.py +++ b/scripts/tdd.py @@ -10,15 +10,18 @@ for snippet in snippets: content = f.read() code = re.search(codeRe,content).group(1).strip() file_to_write_to = open(f'test/{snippet}/{snippet}.py','w') - test_file = open(f'test/{snippet}/{snippet}.test.py','w') file_to_write_to.write(code) file_to_write_to.close() - test_file.write(f''' + if not os.path.isfile(f'test/{snippet}/{snippet}.test.py'): + test_file = open(f'test/{snippet}/{snippet}.test.py','w') + test_file.write(f''' import types,functools from pytape import test from {snippet} import {snippet} def {snippet}_test(t): t.true(isinstance({snippet}, (types.BuiltinFunctionType, types.FunctionType, functools.partial)),'{snippet} is a function') test('Testing {snippet}',{snippet}_test) - '''.strip()) - test_file.close() \ No newline at end of file + '''.strip()) + test_file.close() + else: + pass \ No newline at end of file diff --git a/website/app/templates/base.html b/website/app/templates/base.html index 335d59039..7400ebdff 100644 --- a/website/app/templates/base.html +++ b/website/app/templates/base.html @@ -3,6 +3,7 @@ +30 seconds of python code diff --git a/website/main.py b/website/main.py index 49e18b76e..b113d5919 100644 --- a/website/main.py +++ b/website/main.py @@ -62,7 +62,7 @@ end = '{% endblock %}' footer = ''' ''' -rendered = f'
{nav_string}
' + rendered + f'{footer}
' +rendered = f'
{nav_string}
' + rendered + f'{footer}
' rendered = re.sub('','',rendered) open('website/app/templates/index.html','w',encoding='utf-8').write(start + rendered + end) snippets = [snippet.replace('.md','') for snippet in snippets]