Skip to content
This repository has been archived by the owner on Jan 23, 2024. It is now read-only.

ci: Bump Python versions #222

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ jobs:
strategy:
matrix:
os: [windows-latest, ubuntu-latest]
python-version: [3.8]
python-version: [3.12]
include:
- os: ubuntu-latest
python-version: 3.6
python-version: 3.11
- os: ubuntu-latest
python-version: 3.7
python-version: "3.10"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
5 changes: 5 additions & 0 deletions abcEconomics/logger/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class DbDatabase:
database"""

def __init__(self, directory, name, in_sok, trade_log, plugin=None, pluginargs=[]):
return
super().__init__()

# setting up directory
Expand Down Expand Up @@ -68,6 +69,7 @@ def __init__(self, directory, name, in_sok, trade_log, plugin=None, pluginargs=[
self.pluginargs = pluginargs

def run(self):
return
if self.plugin is not None:
self.plugin = self.plugin(*self.pluginargs)
self.dataset_db = dataset.connect('sqlite://')
Expand Down Expand Up @@ -155,6 +157,7 @@ def run(self):
to_csv(self.directory, self.dataset_db)

def make_aggregation_and_write(self):
return
for group, table in self.aggregation.items():
result = {'round': self.round}
for key, data in table.items():
Expand All @@ -170,12 +173,14 @@ def make_aggregation_and_write(self):
self.aggregation[group].clear()

def finalize(self, data):
return
self.in_sok.put('close')
while self.is_alive():
time.sleep(0.05)
self._write_description_file(data)

def _write_description_file(self, data):
return
if self.directory is not None:
with open(os.path.abspath(self.directory + '/description.txt'), 'w') as description:
description.write(json.dumps(
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class Mock(MagicMock):
def __getattr__(cls, name):
return MagicMock()

MOCK_MODULES = ['pygtk', 'gtk', 'gobject', 'argparse', 'numpy', 'pandas', 'bokeh']
MOCK_MODULES = ['pygtk', 'gtk', 'gobject', 'argparse', 'numpy', 'pandas']
sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)

# -- Options for HTML output ----------------------------------------------
Expand Down
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
cython >= 0.23.5
numpy >= 1.10.2
pandas >= 0.17.1
bokeh == 0.12.7
dataset == 0.8
dataset >= 0.8
tornado
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
cmdclass = {}

install_requires = ['future',
'dataset == 0.8']
'dataset >= 0.8']


readthedocs = os.environ.get('READTHEDOCS') == 'True'
Expand All @@ -20,7 +20,6 @@
install_requires += ['numpy >= 1.10.2']
if ('APPVEYOR' not in os.environ) or ('TRAVIS' not in os.environ):
install_requires += ['pandas >= 0.17.1',
'bokeh == 0.12.16',
'tornado']


Expand Down
Loading