Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
3c316bada3 | |||
ea03979943 | |||
9aae685b21 | |||
cae94d7aa8 |
@ -4,7 +4,7 @@
|
||||
|
||||
__author__ = """Eriks Karls"""
|
||||
__email__ = 'eriks@72.lv'
|
||||
__version__ = '0.25.0.2'
|
||||
__version__ = '0.25.0.4'
|
||||
|
||||
from erepublik.citizen import Citizen
|
||||
|
||||
|
@ -213,7 +213,7 @@ class BaseCitizen(access_points.CitizenAPI):
|
||||
self.division = int(citizen.get('division', 0))
|
||||
|
||||
self.energy.interval = citizen.get('energyPerInterval', 0)
|
||||
self.energy.limit = citizen.get('energyPoolLimit', 0)
|
||||
self.energy.limit = citizen.get('energyToRecover', 0)
|
||||
self.energy.energy = citizen.get('energy', 0)
|
||||
# self.energy.set_reference_time(utils.good_timedelta(self.now, timedelta(seconds=int(next_recovery[1]) * 60 + int(next_recovery[2]))))
|
||||
|
||||
|
@ -1,21 +1,21 @@
|
||||
bump2version==1.0.1
|
||||
coverage==5.5
|
||||
edx-sphinx-theme==2.0.0
|
||||
flake8==3.8.4
|
||||
ipython>=7.21.0
|
||||
edx-sphinx-theme==3.0.0
|
||||
flake8==3.9.2
|
||||
ipython>=7.25.0
|
||||
jedi!=0.18.0
|
||||
isort==5.7.0
|
||||
pip==21.0.1
|
||||
pre-commit==2.10.1
|
||||
pur==5.3.0
|
||||
PyInstaller==4.2
|
||||
isort==5.9.2
|
||||
pip==21.1.3
|
||||
pre-commit==2.13.0
|
||||
pur==5.4.2
|
||||
PyInstaller==4.3
|
||||
PySocks==1.7.1
|
||||
pytest==6.2.2
|
||||
pytest==6.2.4
|
||||
pytz==2021.1
|
||||
requests==2.25.1
|
||||
requests-toolbelt==0.9.1
|
||||
responses==0.12.1
|
||||
setuptools==54.0.0
|
||||
Sphinx==3.5.1
|
||||
twine==3.3.0
|
||||
responses==0.13.3
|
||||
setuptools==57.1.0
|
||||
Sphinx==4.0.3
|
||||
twine==3.4.1
|
||||
wheel==0.36.2
|
||||
|
@ -1,5 +1,5 @@
|
||||
[bumpversion]
|
||||
current_version = 0.25.0.2
|
||||
current_version = 0.25.0.4
|
||||
commit = True
|
||||
tag = True
|
||||
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?
|
||||
|
18
setup.py
18
setup.py
@ -12,17 +12,17 @@ with open('HISTORY.rst') as history_file:
|
||||
history = history_file.read()
|
||||
|
||||
requirements = [
|
||||
'PySocks==1.7.1',
|
||||
'pytz==2021.1',
|
||||
'requests==2.25.1',
|
||||
'requests-toolbelt==0.9.1',
|
||||
'PySocks>=1.7.1',
|
||||
'pytz>=2021.1',
|
||||
'requests>=2.25.0',
|
||||
'requests-toolbelt>=0.9.0',
|
||||
]
|
||||
|
||||
setup_requirements = []
|
||||
|
||||
test_requirements = [
|
||||
"pytest==6.1.2",
|
||||
"responses==0.12.1"
|
||||
"pytest==6.2.4",
|
||||
"responses==0.13.3"
|
||||
]
|
||||
|
||||
setup(
|
||||
@ -34,8 +34,8 @@ setup(
|
||||
'License :: OSI Approved :: MIT License',
|
||||
'Natural Language :: English',
|
||||
'Programming Language :: Python :: 3',
|
||||
'Programming Language :: Python :: 3.7',
|
||||
'Programming Language :: Python :: 3.8',
|
||||
'Programming Language :: Python :: 3.9',
|
||||
],
|
||||
description="Python package for automated eRepublik playing",
|
||||
entry_points={},
|
||||
@ -46,11 +46,11 @@ setup(
|
||||
keywords='erepublik',
|
||||
name='eRepublik',
|
||||
packages=find_packages(include=['erepublik']),
|
||||
python_requires='>=3.7, <4',
|
||||
python_requires='>=3.8, <4',
|
||||
setup_requires=setup_requirements,
|
||||
test_suite='tests',
|
||||
tests_require=test_requirements,
|
||||
url='https://github.com/eeriks/erepublik/',
|
||||
version='0.25.0.2',
|
||||
version='0.25.0.4',
|
||||
zip_safe=False,
|
||||
)
|
||||
|
Reference in New Issue
Block a user