From faf4d27d376d14dd3e7d183bb14e4b90ddfab798 Mon Sep 17 00:00:00 2001 From: rht Date: Mon, 22 Jan 2024 18:53:06 -0500 Subject: [PATCH 1/4] ci: Bump Python versions --- .github/workflows/python.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 0569cb5a..a9402bf6 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -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 From 8b3f9cbb34203765cc80d3451b55adca19c2b4b0 Mon Sep 17 00:00:00 2001 From: rht Date: Mon, 22 Jan 2024 18:55:43 -0500 Subject: [PATCH 2/4] Remove bokeh requirement --- docs/conf.py | 2 +- requirements.txt | 1 - setup.py | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 1dcab3d5..88ed2c64 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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 ---------------------------------------------- diff --git a/requirements.txt b/requirements.txt index ace3ad9b..0a30c90c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ cython >= 0.23.5 numpy >= 1.10.2 pandas >= 0.17.1 -bokeh == 0.12.7 dataset == 0.8 tornado diff --git a/setup.py b/setup.py index dddb5fe4..14d661ea 100644 --- a/setup.py +++ b/setup.py @@ -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'] From 70be5c1a7fa508a3fdd8fabf1f3b48fc143247a9 Mon Sep 17 00:00:00 2001 From: rht Date: Mon, 22 Jan 2024 19:00:25 -0500 Subject: [PATCH 3/4] Remove dataset requirement pin --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0a30c90c..ffb53988 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cython >= 0.23.5 numpy >= 1.10.2 pandas >= 0.17.1 -dataset == 0.8 +dataset >= 0.8 tornado diff --git a/setup.py b/setup.py index 14d661ea..252c4d5b 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ cmdclass = {} install_requires = ['future', - 'dataset == 0.8'] + 'dataset >= 0.8'] readthedocs = os.environ.get('READTHEDOCS') == 'True' From 33d6a113d28537ea5c1a5c950108ba46083ea2b4 Mon Sep 17 00:00:00 2001 From: rht Date: Mon, 22 Jan 2024 19:26:32 -0500 Subject: [PATCH 4/4] Disable logger db for now --- abcEconomics/logger/db.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/abcEconomics/logger/db.py b/abcEconomics/logger/db.py index 87a0ae22..d038ecd3 100644 --- a/abcEconomics/logger/db.py +++ b/abcEconomics/logger/db.py @@ -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 @@ -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://') @@ -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(): @@ -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(