From 603604213dcaf4c7a2249c83c2b6e060303bcb22 Mon Sep 17 00:00:00 2001 From: Eriks K Date: Mon, 15 Jun 2020 16:22:53 +0300 Subject: [PATCH] Requirement update --- .travis.yml | 2 +- HISTORY.rst | 11 +++++++++++ erepublik/__init__.py | 2 +- requirements_dev.txt | 18 +++++++++--------- setup.cfg | 2 +- setup.py | 4 ++-- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index b58a6bb..bf26239 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: python python: + - 3.8 - 3.7 - - 3.6 # Command to install dependencies, e.g. pip install -r requirements_dev.txt --use-mirrors install: pip install -U tox-travis diff --git a/HISTORY.rst b/HISTORY.rst index f543bd5..d6dc56e 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,17 @@ History ======= +0.20.0 (2020-06-15) +------------------- +* Massive restructuring +* Restricted IP check +* Bomb deploy improvements +* More verbose action logging +* Division switching for maverick scripts +* New medal endpoint is correctly parsed +* WAM/Employ modularized + + 0.19.0 (2020-01-13) ------------------- * Created method for current products on sale. diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 6072c6e..725860b 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -5,7 +5,7 @@ __author__ = """Eriks Karls""" __email__ = 'eriks@72.lv' __version__ = '0.20.0' -__commit_id__ = "67677f3" +__commit_id__ = "f83df44" from erepublik import classes, utils from erepublik.citizen import Citizen diff --git a/requirements_dev.txt b/requirements_dev.txt index fd8fac1..bcb5ca3 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,16 +1,16 @@ -bumpversion==0.5.3 -coverage==5.0.3 +bump2version==1.0.0 +coverage==5.1 edx-sphinx-theme==1.5.0 -flake8==3.7.9 -ipython==7.12.0 +flake8==3.8.3 +ipython==7.15.0 isort==4.3.21 -pip==20.0.2 +pip==20.1.1 PyInstaller==3.6 -pytz==2019.3 +pytz==2020.1 requests==2.23.0 -setuptools==45.2.0 -Sphinx==2.4.2 -tox==3.14.5 +setuptools==47.1.1 +Sphinx==3.1.1 +tox==3.15.2 twine==3.1.1 watchdog==0.10.2 wheel==0.34.2 diff --git a/setup.cfg b/setup.cfg index 63e876f..dd66606 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,7 +3,7 @@ current_version = 0.20.0 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\.?(?P\d+)? -serialize = +serialize = {major}.{minor}.{patch}.{dev} {major}.{minor}.{patch} diff --git a/setup.py b/setup.py index 21429e3..3ad3afc 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ with open('README.rst') as readme_file: with open('HISTORY.rst') as history_file: history = history_file.read() -requirements = ['pytz==2019.3', 'requests==2.23.0'] +requirements = ['pytz==2020.1', 'requests==2.23.0'] setup_requirements = [] @@ -38,7 +38,7 @@ setup( keywords='erepublik', name='eRepublik', packages=find_packages(include=['erepublik']), - python_requires='>=3.7.*, <4', + python_requires='>=3.7, <4', setup_requires=setup_requirements, test_suite='tests', tests_require=test_requirements,