Skip to content

Commit

Permalink
🔥 add ruamel-yaml pins to aid installation
Browse files Browse the repository at this point in the history
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 moremoban#274
  • Loading branch information
jayvdb committed Jul 8, 2019
1 parent 0d81242 commit 62c314f
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 10 deletions.
5 changes: 4 additions & 1 deletion .moban.cd/moban.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ keywords:
- jinja2
- moban
dependencies:
- ruamel.yaml>=0.15.5
- ruamel.yaml>=0.15.5,<=0.15.94;python_version == "3.4"
- ruamel.yaml>=0.15.42;python_version == "3.7"
- ruamel.yaml>=0.15.97;python_version == "3.8"
- ruamel.yaml>=0.15.5;python_version != "3.4" and python_version < "3.7"
- jinja2>=2.7.1
- lml>=0.0.9
- appdirs>=1.2.0
Expand Down
8 changes: 4 additions & 4 deletions .moban.d/travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{% extends 'travis.yml.jj2' %}

{%block extra_matrix %}
matrix:
include:
- python: 2.7
env: MINREQ=1
env:
- MINREQ=0
- MINREQ=1
{%endblock%}

{%block custom_python_versions%}
Expand All @@ -14,5 +13,6 @@ python:
- 3.7
- 3.6
- 3.5
- 3.4
- 2.7
{%endblock%}
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ python:
- 3.7
- 3.6
- 3.5
- 3.4
- 2.7
matrix:
include:
Expand Down
5 changes: 4 additions & 1 deletion min_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
ruamel.yaml==0.15.5
ruamel.yaml==0.15.5;python_version == "3.4"
ruamel.yaml==0.15.42;python_version == "3.7"
ruamel.yaml==0.15.97;python_version == "3.8"
ruamel.yaml==0.15.5;python_version != "3.4" and python_version < "3.7"
jinja2==2.7.1
lml==0.0.9
appdirs==1.2.0
Expand Down
6 changes: 4 additions & 2 deletions mobanfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
requires:
- pypi-mobans-pkg
- type: git
url: https://github.com/jayvdb/pypi-mobans
branch: 201907-fixes
configuration:
template_dir:
- "setupmobans:templates"
- "pypi-mobans:templates"
- ".moban.d"
configuration: moban.yml
targets:
Expand Down
5 changes: 4 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
ruamel.yaml>=0.15.5
ruamel.yaml>=0.15.5,<=0.15.94;python_version == "3.4"
ruamel.yaml>=0.15.42;python_version == "3.7"
ruamel.yaml>=0.15.97;python_version == "3.8"
ruamel.yaml>=0.15.5;python_version != "3.4" and python_version < "3.7"
jinja2>=2.7.1
lml>=0.0.9
appdirs>=1.2.0
Expand Down
9 changes: 8 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
]

INSTALL_REQUIRES = [
"ruamel.yaml>=0.15.5",
"jinja2>=2.7.1",
"lml>=0.0.9",
"appdirs>=1.2.0",
Expand All @@ -77,6 +76,14 @@
]
SETUP_COMMANDS = {}

if sys.version[:3] == "3.4":
INSTALL_REQUIRES.append('ruamel.yaml>=0.15.5,<=0.15.94')
if sys.version[:3] == "3.7":
INSTALL_REQUIRES.append('ruamel.yaml>=0.15.42')
if sys.version[:3] == "3.8":
INSTALL_REQUIRES.append('ruamel.yaml>=0.15.97')
if sys.version[:3] != "3.4" and sys.version[:3] < "3.7":
INSTALL_REQUIRES.append('ruamel.yaml>=0.15.5')

PACKAGES = find_packages(exclude=["ez_setup", "examples", "tests"])
EXTRAS_REQUIRE = {
Expand Down
3 changes: 3 additions & 0 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ black;python_version>="3.6"
isort;python_version>="3.6"
moban-handlebars
pypi-mobans-pkg
# arrow 0.14.0 doesnt support Python 3.4
arrow<0.14.0;python_version=="3.4"
arrow;python_version!="3.4"
jinja2_time

0 comments on commit 62c314f

Please sign in to comment.