Skip to content

Commit 574084c

Browse files
committed
🔥 add ruamel-yaml pins to aid installation
Re-adds Python 3.4 support, broken by ruamel-yaml desupporting it in version 0.15.94. Also adds minimum version for ruamel-yaml on Python 3.7 and 3.8-dev. And avoids newer arrow desupported on Python 3.4. Fixes #274
1 parent 0d81242 commit 574084c

File tree

8 files changed

+35
-14
lines changed

8 files changed

+35
-14
lines changed

.moban.cd/moban.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ keywords:
1818
- jinja2
1919
- moban
2020
dependencies:
21-
- ruamel.yaml>=0.15.5
21+
- ruamel.yaml>=0.15.5,<=0.15.94;python_version == "3.4"
22+
- ruamel.yaml>=0.15.42;python_version == "3.7"
23+
- ruamel.yaml>=0.15.97;python_version == "3.8"
24+
- ruamel.yaml>=0.15.5;python_version != "3.4" and python_version < "3.7"
2225
- jinja2>=2.7.1
2326
- lml>=0.0.9
2427
- appdirs>=1.2.0

.moban.d/travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{% extends 'travis.yml.jj2' %}
22

33
{%block extra_matrix %}
4-
matrix:
5-
include:
6-
- python: 2.7
7-
env: MINREQ=1
4+
env:
5+
- MINREQ=0
6+
- MINREQ=1
87
{%endblock%}
98

109
{%block custom_python_versions%}
@@ -14,5 +13,6 @@ python:
1413
- 3.7
1514
- 3.6
1615
- 3.5
16+
- 3.4
1717
- 2.7
1818
{%endblock%}

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ python:
1010
- 3.7
1111
- 3.6
1212
- 3.5
13+
- 3.4
1314
- 2.7
14-
matrix:
15-
include:
16-
- python: 2.7
17-
env: MINREQ=1
15+
env:
16+
- MINREQ=0
17+
- MINREQ=1
1818

1919
stages:
2020
- test

min_requirements.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
ruamel.yaml==0.15.5
1+
ruamel.yaml==0.15.5;python_version == "3.4"
2+
ruamel.yaml==0.15.42;python_version == "3.7"
3+
ruamel.yaml==0.15.97;python_version == "3.8"
4+
ruamel.yaml==0.15.5;python_version != "3.4" and python_version < "3.7"
25
jinja2==2.7.1
36
lml==0.0.9
47
appdirs==1.2.0

mobanfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
requires:
2-
- pypi-mobans-pkg
2+
- type: git
3+
url: https://github.com/jayvdb/pypi-mobans
4+
branch: 201907-fixes
35
configuration:
46
template_dir:
5-
- "setupmobans:templates"
7+
- "pypi-mobans:templates"
68
- ".moban.d"
79
configuration: moban.yml
810
targets:

requirements.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
ruamel.yaml>=0.15.5
1+
ruamel.yaml>=0.15.5,<=0.15.94;python_version == "3.4"
2+
ruamel.yaml>=0.15.42;python_version == "3.7"
3+
ruamel.yaml>=0.15.97;python_version == "3.8"
4+
ruamel.yaml>=0.15.5;python_version != "3.4" and python_version < "3.7"
25
jinja2>=2.7.1
36
lml>=0.0.9
47
appdirs>=1.2.0

setup.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
]
6868

6969
INSTALL_REQUIRES = [
70-
"ruamel.yaml>=0.15.5",
7170
"jinja2>=2.7.1",
7271
"lml>=0.0.9",
7372
"appdirs>=1.2.0",
@@ -77,6 +76,14 @@
7776
]
7877
SETUP_COMMANDS = {}
7978

79+
if sys.version[:3] == "3.4":
80+
INSTALL_REQUIRES.append('ruamel.yaml>=0.15.5,<=0.15.94')
81+
if sys.version[:3] == "3.7":
82+
INSTALL_REQUIRES.append('ruamel.yaml>=0.15.42')
83+
if sys.version[:3] == "3.8":
84+
INSTALL_REQUIRES.append('ruamel.yaml>=0.15.97')
85+
if sys.version[:3] != "3.4" and sys.version[:3] < "3.7":
86+
INSTALL_REQUIRES.append('ruamel.yaml>=0.15.5')
8087

8188
PACKAGES = find_packages(exclude=["ez_setup", "examples", "tests"])
8289
EXTRAS_REQUIRE = {

tests/requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@ black;python_version>="3.6"
77
isort;python_version>="3.6"
88
moban-handlebars
99
pypi-mobans-pkg
10+
# arrow 0.14.0 doesnt support Python 3.4
11+
arrow<0.14.0;python_version=="3.4"
12+
arrow;python_version!="3.4"
1013
jinja2_time

0 commit comments

Comments
 (0)