From 1509a8171392f856d6f2851f85948023f170a30c Mon Sep 17 00:00:00 2001 From: Paulo Kim Date: Sat, 26 Nov 2022 18:46:19 -0300 Subject: [PATCH 1/3] modified setup.py due to 3.0 limitations. Also, a simpler approach to use versions --- setup.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index e3995180..aabaf271 100644 --- a/setup.py +++ b/setup.py @@ -1,10 +1,11 @@ import sys from setuptools import setup from setuptools.command.test import test as TestCommand +from datascience.version import __version__ -if sys.version_info < (3, 0): - raise ValueError('This package requires python >= 3.0') +if sys.version_info < (3, 6): + raise ValueError('This package requires python >= 3.6') with open('requirements.txt') as fid: install_requires = [l.strip() for l in fid.readlines() if l] @@ -16,13 +17,6 @@ 'bokeh' ] - -with open('datascience/version.py') as fid: - for line in fid: - if line.startswith('__version__'): - version = line.strip().split()[-1][1:-1] - break - class PyTest(TestCommand): user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")] @@ -46,7 +40,8 @@ def run_tests(self): setup( name = 'datascience', packages = ['datascience'], - version = version, + python_requires='>=3.6', + version = __version__, install_requires = install_requires, tests_require = tests_requires, cmdclass = {'test': PyTest}, From 3722d02929b754470e617151a18076b4d3bd96ef Mon Sep 17 00:00:00 2001 From: Paulo Kim Date: Sat, 26 Nov 2022 18:51:12 -0300 Subject: [PATCH 2/3] CHANGELOG.md updated --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c288d837..69708a6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +### v0.17.6 +* Updated project's setup.py to the requirement of python 3.6, due to use of f-strings. + ### v0.17.5 * Eliminated deprecation warnings involved arrays containing arrays/sequences. * Changed the column type of a table after a remove operation back to a NumPy array, as written in the documentation. From 9bb821627e9162727cdac43e9ced03109d2f00a4 Mon Sep 17 00:00:00 2001 From: Adnan Hemani Date: Sat, 8 Apr 2023 15:03:17 -0700 Subject: [PATCH 3/3] revert breaking changes --- setup.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index aabaf271..9609d723 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ import sys from setuptools import setup from setuptools.command.test import test as TestCommand -from datascience.version import __version__ if sys.version_info < (3, 6): @@ -17,6 +16,12 @@ 'bokeh' ] +with open('datascience/version.py') as fid: + for line in fid: + if line.startswith('__version__'): + version = line.strip().split()[-1][1:-1] + break + class PyTest(TestCommand): user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")] @@ -41,7 +46,7 @@ def run_tests(self): name = 'datascience', packages = ['datascience'], python_requires='>=3.6', - version = __version__, + version = version, install_requires = install_requires, tests_require = tests_requires, cmdclass = {'test': PyTest},