From 4326877d6d5b897a4f790dbd6c2861b62f72054c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Ma=C5=9Blanka?= <piotr.maslanka@henrietta.com.pl>
Date: Fri, 7 Feb 2020 14:35:47 +0100
Subject: [PATCH] six removed as dependency
---
firanka/builders.py | 2 --
firanka/exceptions.py | 13 ++++---------
firanka/series/bundle.py | 2 --
firanka/series/function.py | 2 --
firanka/series/modulo.py | 2 --
requirements.txt | 1 -
setup.py | 5 ++---
tests/test_builder.py | 3 ---
tests/test_intervals.py | 3 ---
tests/test_series/__init__.py | 3 ---
tests/test_series/common.py | 3 ---
tests/test_series/test_bundles.py | 3 ---
12 files changed, 6 insertions(+), 36 deletions(-)
diff --git a/firanka/builders.py b/firanka/builders.py
index c309a1d..dea2b20 100644
--- a/firanka/builders.py
+++ b/firanka/builders.py
@@ -1,5 +1,3 @@
-
-
import copy
from sortedcontainers import SortedList
diff --git a/firanka/exceptions.py b/firanka/exceptions.py
index 7461397..a6365b0 100644
--- a/firanka/exceptions.py
+++ b/firanka/exceptions.py
@@ -1,10 +1,4 @@
-
-
-__all__ = [
- 'FirankaError',
- 'NotInDomainError',
- 'DomainError',
-]
+__all__ = ['FirankaError', 'NotInDomainError', 'DomainError']
class FirankaError(Exception):
@@ -22,7 +16,8 @@ class NotInDomainError(DomainError):
Requested index is beyond this domain
"""
- def __init__(self, index, domain):
- super(NotInDomainError, self).__init__(u'NotInDomainError: %s not in %s' % (index, domain))
+ def __init__(self, index, domain, *args, **kwargs):
+ super().__init__(u'NotInDomainError: %s not in %s' % (index, domain), index, domain,
+ *args, **kwargs)
self.index = index
self.domain = domain
diff --git a/firanka/series/bundle.py b/firanka/series/bundle.py
index ba6c4e4..d73920c 100644
--- a/firanka/series/bundle.py
+++ b/firanka/series/bundle.py
@@ -1,5 +1,3 @@
-
-
import functools
import logging
diff --git a/firanka/series/function.py b/firanka/series/function.py
index c87cff4..e88e70f 100644
--- a/firanka/series/function.py
+++ b/firanka/series/function.py
@@ -1,5 +1,3 @@
-
-
from .base import Series
diff --git a/firanka/series/modulo.py b/firanka/series/modulo.py
index 9fce048..28ed2b6 100644
--- a/firanka/series/modulo.py
+++ b/firanka/series/modulo.py
@@ -1,5 +1,3 @@
-
-
import math
from .base import Series
diff --git a/requirements.txt b/requirements.txt
index 72f6bbc..4693a5a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1 @@
-six
sortedcontainers
diff --git a/setup.py b/setup.py
index 4ad015c..f922107 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-# coding=UTF-8
from setuptools import setup, find_packages
from firanka import __version__
@@ -6,8 +5,8 @@ from firanka import __version__
setup(
name='firanka',
version=__version__,
- packages=find_packages(exclude=['tests.*', 'tests']),
- install_requires=open('requirements.txt', 'r').readlines(),
+ packages=find_packages(exclude=['tests.*', 'tests', 'docs']),
+ install_requires=['sortedcontainers'],
url='https://github.com/smok-serwis/firanka',
author=u'Piotr MaĹlanka',
author_email=u'pmaslanka@smok.co',
diff --git a/tests/test_builder.py b/tests/test_builder.py
index d84e36c..f663185 100644
--- a/tests/test_builder.py
+++ b/tests/test_builder.py
@@ -1,6 +1,3 @@
-# coding=UTF-8
-from __future__ import print_function, absolute_import, division
-
import unittest
from firanka.builders import DiscreteSeriesBuilder
diff --git a/tests/test_intervals.py b/tests/test_intervals.py
index f02bf53..b9abb11 100644
--- a/tests/test_intervals.py
+++ b/tests/test_intervals.py
@@ -1,6 +1,3 @@
-# coding=UTF-8
-from __future__ import print_function, absolute_import, division
-
import unittest
from firanka.intervals import Interval
diff --git a/tests/test_series/__init__.py b/tests/test_series/__init__.py
index bb72c10..f5a7fd7 100644
--- a/tests/test_series/__init__.py
+++ b/tests/test_series/__init__.py
@@ -1,6 +1,3 @@
-# coding=UTF-8
-from __future__ import print_function, absolute_import, division
-
import math
import unittest
diff --git a/tests/test_series/common.py b/tests/test_series/common.py
index 062de91..15d3183 100644
--- a/tests/test_series/common.py
+++ b/tests/test_series/common.py
@@ -1,6 +1,3 @@
-# coding=UTF-8
-from __future__ import print_function, absolute_import, division
-
from firanka.series import FunctionSeries
NOOP = lambda x: x
diff --git a/tests/test_series/test_bundles.py b/tests/test_series/test_bundles.py
index 6692b66..afd701a 100644
--- a/tests/test_series/test_bundles.py
+++ b/tests/test_series/test_bundles.py
@@ -1,6 +1,3 @@
-# coding=UTF-8
-from __future__ import print_function, absolute_import, division
-
import unittest
from firanka.series import DiscreteSeries, FunctionSeries, SeriesBundle, DiscreteSeriesBundle
--
GitLab