From 75df02c7cfba05eea5220653fa0e040905a74a84 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Wed, 16 Jan 2019 16:30:56 +0100
Subject: [PATCH] [setup] Avoid packaging distro
---
bob/devtools/ci.py | 7 ++++---
conda/meta.yaml | 1 -
setup.py | 1 -
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/bob/devtools/ci.py b/bob/devtools/ci.py
index 4f794976..99d7897d 100644
--- a/bob/devtools/ci.py
+++ b/bob/devtools/ci.py
@@ -10,7 +10,7 @@ import logging
logger = logging.getLogger(__name__)
import git
-import packaging.version
+import distutils.version
def is_master(refname, tag):
@@ -71,9 +71,10 @@ def is_stable(package, refname, tag):
if tag is not None:
logger.info('Project %s tag is "%s"', package, tag)
- parsed_tag = packaging.version.Version(tag)
+ parsed_tag = distutils.version.LooseVersion(tag[1:]).version #remove 'v'
+ is_prerelease = any([isinstance(k, str) for k in parsed_tag])
- if parsed_tag.is_prerelease:
+ if is_prerelease:
logger.warn('Pre-release detected - not publishing to stable channels')
return False
diff --git a/conda/meta.yaml b/conda/meta.yaml
index c0d16c24..57f9e604 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -44,7 +44,6 @@ requirements:
- sphinx
- pyyaml
- twine
- - packaging
- lxml
test:
diff --git a/setup.py b/setup.py
index c9f5cf3c..b3fac33b 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,6 @@ requires = [
'sphinx',
'pyyaml',
'twine',
- 'packaging',
'lxml',
]
--
GitLab