Skip to content

Commit 47d57ee

Browse files
KwpolskaKwpolska
authoredAug 1, 2017
Merge pull request #2882 from getnikola/auto-aiohttp
Fix #2850 — rewrite `nikola auto` with asyncio and aiohttp
·
v8.3.1v8.0.0b1
2 parents a53a31f + 0fdadf5 commit 47d57ee

File tree

8 files changed

+318
-303
lines changed

8 files changed

+318
-303
lines changed
 

‎.travis.yml

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ addons:
1212
- language-pack-en-base
1313
- language-pack-pl-base
1414
python:
15-
- '3.3'
1615
- '3.4'
1716
- '3.5'
1817
- '3.6'
@@ -36,7 +35,6 @@ env:
3635
global:
3736
secure: GqUDW0j4Ay8pS9tS/g5JBYGtgBG0g0oD2g4X9JXgVchiFj3GIRL+dwiXpgx3LELy7nCWF3EzClFxxMdVqqxizQ/I8xqiA0XL/rf5z/y+9d9nmKOxV8SV73n0eCgsHWkbdSLJ6MKs6s0Trlz9jLu/P+Bhfu2ttqkOH8WttfEf3VE=
3837
install:
39-
- if [[ $NMODE == 'nikola' ]]; then scripts/getwheelhouse.sh $(scripts/getpyver.py short); fi
4038
- if [[ $NMODE == 'nikola' ]]; then pip install -r requirements-tests.txt; if [[ "$?" == '1' ]]; then cat /home/travis/.pip/pip.log; false; fi; fi
4139
- if [[ $NMODE == 'nikola' ]]; then pip install .; fi
4240
- if [[ $NMODE == 'flake8' ]]; then pip install flake8 pydocstyle; fi

‎CHANGES.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ New in master
44
Features
55
--------
66

7+
* Rewrite ``nikola auto`` with asyncio and aiohttp (Issue #2850)
78
* New ``listings`` shortcode similar to the reStructuredText listings
89
directive (Issue #2868)
910
* Switch to reStructuredText’s new HTML 5 renderer (Issue #2874)
@@ -36,7 +37,7 @@ Removed features
3637
----------------
3738

3839
* Removed the slides directive for docutils, it will now be a separate plugin.
39-
* Drop Python 2 support
40+
* Drop Python 2 and Python 3.3 support (oldest supported version is 3.4)
4041
* Remove ``nikola install_theme`` — use ``nikola theme`` instead
4142
* Drop insecure post encryption feature
4243
* Stop supporting all deprecated config options

‎README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ It has many features, but here are some of the nicer ones:
4343
* Syntax highlighting for almost any programming language or markup
4444
* Multilingual sites, `translated to 50 languages.`__
4545
* Doesn't reinvent wheels, leverages existing tools.
46-
* Python 3.3+ compatible.
46+
* Python 3.4+ compatible.
4747

4848
.. _Nikola Handbook: https://getnikola.com/handbook.html#why-static
4949
__ https://users.getnikola.com/

‎docs/manual.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ Obsolescence
136136
You may say those are long term issues, or that they won't matter for years. Well,
137137
I believe things should work forever, or as close to it as we can make them.
138138
Nikola's static output and its input files will work as long as you can install
139-
Python 3.3 or newer under Linux, Windows, or OS X and can find a server
139+
Python 3.4 or newer under Linux, Windows, or OS X and can find a server
140140
that sends files over HTTP. That's probably 10 or 15 years at least.
141141

142142
Also, static sites are easily handled by the Internet Archive.

‎nikola/plugins/command/auto/__init__.py

+308-271
Large diffs are not rendered by default.

‎requirements-extras.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ webassets>=0.10.1
1010
notebook>=4.0.0
1111
ipykernel>=4.0.0
1212
ghp-import2>=1.0.0
13-
ws4py==0.4.2
14-
watchdog==0.8.3
13+
aiohttp>=2.2.0
14+
watchdog>=0.8.3
1515
PyYAML==3.12
1616
toml==0.9.2
1717

‎scripts/getwheelhouse.sh

-7
This file was deleted.

‎setup.py

+4-18
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,12 @@
55
import shutil
66
from setuptools import setup, find_packages
77
from setuptools.command.install import install
8-
from setuptools.command.test import test as TestCommand
9-
10-
11-
class PyTest(TestCommand):
12-
def finalize_options(self):
13-
TestCommand.finalize_options(self)
14-
self.test_args = []
15-
self.test_suite = True
16-
17-
def run_tests(self):
18-
# import here, cause outside the eggs aren't loaded
19-
import pytest
20-
errno = pytest.main(self.test_args)
21-
sys.exit(errno)
228

239

2410
with open('requirements.txt', 'r') as fh:
2511
dependencies = [l.strip() for l in fh]
2612

27-
extras = {':python_version == "3.3"': ['enum34']}
13+
extras = {}
2814

2915
with open('requirements-extras.txt', 'r') as fh:
3016
extras['extras'] = [l.strip() for l in fh][1:]
@@ -37,8 +23,8 @@ def run_tests(self):
3723
# ########## platform specific stuff #############
3824
if sys.version_info[0] == 2:
3925
raise Exception('Python 2 is not supported')
40-
elif sys.version_info[0] == 3 and sys.version_info[1] < 3:
41-
raise Exception('Python 3 version < 3.3 is not supported')
26+
elif sys.version_info[0] == 3 and sys.version_info[1] < 4:
27+
raise Exception('Python 3 version < 3.4 is not supported')
4228

4329
##################################################
4430

@@ -144,7 +130,7 @@ def run(self):
144130
tests_require=['pytest'],
145131
include_package_data=True,
146132
python_requires='>=3.3',
147-
cmdclass={'install': nikola_install, 'test': PyTest},
133+
cmdclass={'install': nikola_install},
148134
data_files=[
149135
('share/doc/nikola', [
150136
'docs/manual.txt',

0 commit comments

Comments
 (0)
Please sign in to comment.