From 9d52ef385765d7ac5cbc069e43cd6d127f9ce548 Mon Sep 17 00:00:00 2001 From: Jad Chaar Date: Mon, 3 Jun 2019 00:54:00 -0400 Subject: [PATCH 1/3] Fixed regression from 0.14.0 --- setup.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 4a2febcb0..731e8044d 100644 --- a/setup.py +++ b/setup.py @@ -1,14 +1,21 @@ # -*- coding: utf-8 -*- -from setuptools import setup +import re -from arrow import __version__ +from setuptools import setup with open("README.rst", "r") as f: readme = f.read() + +def grep(attrname): + pattern = r'{}\W*=\W*"([^"]+)"'.format(attrname) + strval, = re.findall(pattern, readme) + return strval + + setup( name="arrow", - version=__version__, + version=grep("__version__"), description="Better dates and times for Python", long_description=readme, long_description_content_type="text/x-rst", From 09d2071ed725b97e0f49d24e0531e128f88508cf Mon Sep 17 00:00:00 2001 From: Jad Chaar Date: Mon, 3 Jun 2019 01:08:31 -0400 Subject: [PATCH 2/3] Fix unpack --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 731e8044d..8e7242a3f 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ def grep(attrname): pattern = r'{}\W*=\W*"([^"]+)"'.format(attrname) - strval, = re.findall(pattern, readme) + strval = re.findall(pattern, readme) return strval From fa4f2e4dd191dec14938f79a548c0bd6a5b78a80 Mon Sep 17 00:00:00 2001 From: Jad Chaar Date: Mon, 3 Jun 2019 01:31:36 -0400 Subject: [PATCH 3/3] Updated versions and history and fixed grep function --- HISTORY.md | 4 ++++ arrow/__init__.py | 2 +- setup.py | 11 +++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index e6653121c..dd1c31ae3 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ ## History +### 0.14.1 + +- [FIX] Fixed "ImportError: No module named 'dateutil'" (#598). + ### 0.14.0 - [NEW] Added provisional support for Python 3.8. diff --git a/arrow/__init__.py b/arrow/__init__.py index 1882ba02c..39546b1c4 100644 --- a/arrow/__init__.py +++ b/arrow/__init__.py @@ -4,4 +4,4 @@ from .arrow import Arrow from .factory import ArrowFactory -__version__ = "0.14.0" +__version__ = "0.14.1" diff --git a/setup.py b/setup.py index 8e7242a3f..ad611c99f 100644 --- a/setup.py +++ b/setup.py @@ -6,16 +6,19 @@ with open("README.rst", "r") as f: readme = f.read() +with open("arrow/__init__.py", "r") as f: + init = f.read() -def grep(attrname): - pattern = r'{}\W*=\W*"([^"]+)"'.format(attrname) - strval = re.findall(pattern, readme) + +def get_version(): + pattern = r'{}\W*=\W*"([^"]+)"'.format("__version__") + strval = re.findall(pattern, init)[0] return strval setup( name="arrow", - version=grep("__version__"), + version=get_version(), description="Better dates and times for Python", long_description=readme, long_description_content_type="text/x-rst",