From a9e87a78444a98a83758e478c7cf2d354786116b Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Thu, 3 Aug 2023 13:01:47 -0400 Subject: [PATCH 01/20] Attempting to fix #296. Seems like the general SO info points to windows system needing stdin even as a null device. Other fix seems like it could be leaky resources from GitPython for long running processes. Make sure to call close() to help prevent resource leak. Also bump all the github actions ubuntu verion to 20.04 since 18.04 got deprecated --- .github/workflows/python-coverage.yaml | 2 +- .github/workflows/python-docs.yaml | 2 +- .github/workflows/python-lint.yaml | 2 +- .github/workflows/python-manual-docs.yaml | 2 +- .github/workflows/python-publish.yaml | 2 +- .github/workflows/python-pytest-s3.yaml | 2 +- .github/workflows/python-pytest-tune.yaml | 2 +- .github/workflows/python-pytest.yml | 2 +- .github/workflows/python-test-docs.yaml | 2 +- spock/utils.py | 5 +++++ 10 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python-coverage.yaml b/.github/workflows/python-coverage.yaml index b50d8ee8..9a15a9a4 100644 --- a/.github/workflows/python-coverage.yaml +++ b/.github/workflows/python-coverage.yaml @@ -11,7 +11,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/python-docs.yaml b/.github/workflows/python-docs.yaml index 5fcd99ad..6696b267 100644 --- a/.github/workflows/python-docs.yaml +++ b/.github/workflows/python-docs.yaml @@ -10,7 +10,7 @@ on: jobs: deploy: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/python-lint.yaml b/.github/workflows/python-lint.yaml index 94325eb3..3d524ac7 100644 --- a/.github/workflows/python-lint.yaml +++ b/.github/workflows/python-lint.yaml @@ -12,7 +12,7 @@ on: jobs: run_lint: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/python-manual-docs.yaml b/.github/workflows/python-manual-docs.yaml index 83f090fb..139d9976 100644 --- a/.github/workflows/python-manual-docs.yaml +++ b/.github/workflows/python-manual-docs.yaml @@ -7,7 +7,7 @@ on: workflow_dispatch jobs: deploy: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/python-publish.yaml b/.github/workflows/python-publish.yaml index c9776df1..8e0eca4d 100644 --- a/.github/workflows/python-publish.yaml +++ b/.github/workflows/python-publish.yaml @@ -11,7 +11,7 @@ on: jobs: deploy: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/python-pytest-s3.yaml b/.github/workflows/python-pytest-s3.yaml index 27961247..80d9d32c 100644 --- a/.github/workflows/python-pytest-s3.yaml +++ b/.github/workflows/python-pytest-s3.yaml @@ -11,7 +11,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"] diff --git a/.github/workflows/python-pytest-tune.yaml b/.github/workflows/python-pytest-tune.yaml index 2f053ce6..f276211e 100644 --- a/.github/workflows/python-pytest-tune.yaml +++ b/.github/workflows/python-pytest-tune.yaml @@ -11,7 +11,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: python-version: ["3.7", "3.8", "3.9", "3.10"] diff --git a/.github/workflows/python-pytest.yml b/.github/workflows/python-pytest.yml index b4a9976e..38bca867 100644 --- a/.github/workflows/python-pytest.yml +++ b/.github/workflows/python-pytest.yml @@ -11,7 +11,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"] diff --git a/.github/workflows/python-test-docs.yaml b/.github/workflows/python-test-docs.yaml index 381736c7..75ed90ac 100644 --- a/.github/workflows/python-test-docs.yaml +++ b/.github/workflows/python-test-docs.yaml @@ -15,7 +15,7 @@ on: jobs: deploy: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 diff --git a/spock/utils.py b/spock/utils.py index 7c0bb86a..60811422 100644 --- a/spock/utils.py +++ b/spock/utils.py @@ -602,6 +602,7 @@ def add_repo_info(out_dict: Dict) -> Dict: head_result = subprocess.run( "git rev-parse --abbrev-ref --symbolic-full-name HEAD", stdout=subprocess.PIPE, + stdin=subprocess.DEVNULL if sys.platform == "win32" else None, shell=True, check=False, ) @@ -609,6 +610,7 @@ def add_repo_info(out_dict: Dict) -> Dict: head_result = subprocess.run( "git rev-parse --abbrev-ref --symbolic-full-name HEAD", capture_output=True, + stdin=subprocess.DEVNULL if sys.platform == "win32" else None, shell=True, check=False, ) @@ -631,6 +633,9 @@ def add_repo_info(out_dict: Dict) -> Dict: out_dict.update( {"# Git Origin": repo.active_branch.commit.repo.remotes.origin.url} ) + # Attempt to close to not leak resources + # https://github.com/gitpython-developers/GitPython#leakage-of-system-resources + repo.close() except git.InvalidGitRepositoryError: # pragma: no cover # But it's okay if we are not out_dict = make_blank_git(out_dict) From 79d24c92a677c0e58dcf22bf4bab7d89ca7a8cd3 Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Fri, 4 Aug 2023 09:59:58 -0400 Subject: [PATCH 02/20] hotfix for help print of empty spock class --- spock/backend/help.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/spock/backend/help.py b/spock/backend/help.py index eff779e8..d7b94510 100644 --- a/spock/backend/help.py +++ b/spock/backend/help.py @@ -110,20 +110,22 @@ def handle_attributes_print(info_dict, max_indent: int): max_indent: max indent for pretty print of help """ - # Figure out indents - max_param_length = max([len(k) for k in info_dict.keys()]) - max_type_length = max([v["len"]["type"] for v in info_dict.values()]) - # Print akin to the argparser - for k, v in info_dict.items(): - print( - f" {k}" - + (" " * (max_param_length - v["len"]["name"] + max_indent)) - + f'{v["type"]}' - + (" " * (max_type_length - v["len"]["type"] + max_indent)) - + f'{v["desc"]} {v["default"]}' - ) - # Blank for spacing :-/ - print("") + # Add check for an empty dict (corresponds to any empty spock class) + if len(info_dict) > 0: + # Figure out indents + max_param_length = max([len(k) for k in info_dict.keys()]) + max_type_length = max([v["len"]["type"] for v in info_dict.values()]) + # Print akin to the argparser + for k, v in info_dict.items(): + print( + f" {k}" + + (" " * (max_param_length - v["len"]["name"] + max_indent)) + + f'{v["type"]}' + + (" " * (max_type_length - v["len"]["type"] + max_indent)) + + f'{v["desc"]} {v["default"]}' + ) + # Blank for spacing :-/ + print("") def get_type_string(val, nested_others): From c9c1318acd729ab39e05c4a51a614eb732c7ab5b Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Thu, 10 Aug 2023 10:20:53 -0400 Subject: [PATCH 03/20] bump pyyaml to get over cython error in 3.10 --- REQUIREMENTS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/REQUIREMENTS.txt b/REQUIREMENTS.txt index 9b67642a..245cfd04 100644 --- a/REQUIREMENTS.txt +++ b/REQUIREMENTS.txt @@ -2,5 +2,6 @@ attrs~=21.4 cryptography~=37.0 GitPython~=3.1 pytomlpp~=1.0 -pyYAML~=5.4 +# pyYAML~=5.4 +pyYAML~=6.0 setuptools~=59.6 From ea9066cda24db04b118d43de7b1fa9c003489ce8 Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 11:15:49 -0400 Subject: [PATCH 04/20] upgrading a ton of deps that seem to be breaking ci/cd. Removing coveralls python dep and switching to the GHA for pushing coverage results to coveralls.io --- .github/workflows/python-coverage.yaml | 12 ++++++------ .github/workflows/python-docs.yaml | 2 +- REQUIREMENTS.txt | 4 ++-- requirements/DEV_REQUIREMENTS.txt | 18 +++++++++--------- requirements/S3_REQUIREMENTS.txt | 6 +++--- requirements/TUNE_REQUIREMENTS.txt | 6 +++--- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/python-coverage.yaml b/.github/workflows/python-coverage.yaml index 9a15a9a4..7e94a2a8 100644 --- a/.github/workflows/python-coverage.yaml +++ b/.github/workflows/python-coverage.yaml @@ -38,11 +38,11 @@ jobs: - name: Test with pytest run: | coverage run -m pytest --cov-config=.coveragerc - - - name: Debug coverage - run: coverage report -m + + - name: Convert to LCO + run: coverage lcov --cov-config=.coveragerc - name: Upload coverage data to coveralls.io - run: coveralls --service=github --rcfile=.coveragerc - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: coverallsapp/github-action@v2 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/python-docs.yaml b/.github/workflows/python-docs.yaml index 6696b267..97769414 100644 --- a/.github/workflows/python-docs.yaml +++ b/.github/workflows/python-docs.yaml @@ -28,7 +28,7 @@ jobs: run: | python -m pip install --upgrade pip pip install -e .[s3,tune] - pip install -r ./requirements/DEV_REQUIREMENTS.txt + pip install -r ./requirements/S3_REQUIREMENTS.txt pip install -r ./requirements/TUNE_REQUIREMENTS.txt pip install -r ./requirements/TEST_EXTRAS_REQUIREMENTS.txt diff --git a/REQUIREMENTS.txt b/REQUIREMENTS.txt index 245cfd04..78fe8165 100644 --- a/REQUIREMENTS.txt +++ b/REQUIREMENTS.txt @@ -1,7 +1,7 @@ -attrs~=21.4 +attrs~=23.1 cryptography~=37.0 GitPython~=3.1 pytomlpp~=1.0 # pyYAML~=5.4 pyYAML~=6.0 -setuptools~=59.6 +setuptools~=68.1 diff --git a/requirements/DEV_REQUIREMENTS.txt b/requirements/DEV_REQUIREMENTS.txt index ff176e24..e5a45b16 100644 --- a/requirements/DEV_REQUIREMENTS.txt +++ b/requirements/DEV_REQUIREMENTS.txt @@ -1,13 +1,13 @@ -black~=22.1 ; python_version >= '3.7' +black~=23.7 ; python_version >= '3.7' black~=21.4b0 ; python_version == '3.6' -coveralls~=3.3 -coverage[toml]~=6.1 -isort~=5.10 +# coveralls~=3.3 +coverage[toml]~=7.3 +isort~=5.12 moto~=3.1 -pre-commit~=2.20 ; python_version >= '3.7' +pre-commit~=3.3 ; python_version >= '3.7' pre-commit~=2.17 ; python_version == '3.6' -pydoc-markdown~=4.3, < 4.6.* ; python_version >= '3.7' +pydoc-markdown~=4.8 ; python_version >= '3.7' pydoc-markdown~=3.13 ; python_version == '3.6' -pytest~=7.0 -pytest-cov~=3.0 -pylint~=2.11 +pytest~=7.4 +pytest-cov~=4.1 +pylint~=2.17 diff --git a/requirements/S3_REQUIREMENTS.txt b/requirements/S3_REQUIREMENTS.txt index 92aac2cd..252cce4b 100644 --- a/requirements/S3_REQUIREMENTS.txt +++ b/requirements/S3_REQUIREMENTS.txt @@ -1,4 +1,4 @@ -boto3~=1.20 -botocore~=1.26 +boto3~=1.28 +botocore~=1.31 hurry.filesize~=0.9 -s3transfer~=0.5 +s3transfer~=0.6 diff --git a/requirements/TUNE_REQUIREMENTS.txt b/requirements/TUNE_REQUIREMENTS.txt index 954ef1ce..5a4e4139 100644 --- a/requirements/TUNE_REQUIREMENTS.txt +++ b/requirements/TUNE_REQUIREMENTS.txt @@ -1,4 +1,4 @@ mypy_extensions~=0.4; python_version < '3.8' -optuna~=2.10 -torch>=1.8.1 -ax-platform~=0.2.4; python_version >= '3.7' +optuna~=3.3 +torch~=2.0 +ax-platform~=0.3.4; python_version >= '3.7' From 455d667414fa79f79f35bb7403e8654abccbcc3f Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 11:20:58 -0400 Subject: [PATCH 05/20] handling ax python version dep bump --- requirements/TUNE_REQUIREMENTS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/TUNE_REQUIREMENTS.txt b/requirements/TUNE_REQUIREMENTS.txt index 5a4e4139..f1fcfd91 100644 --- a/requirements/TUNE_REQUIREMENTS.txt +++ b/requirements/TUNE_REQUIREMENTS.txt @@ -1,4 +1,5 @@ mypy_extensions~=0.4; python_version < '3.8' optuna~=3.3 torch~=2.0 -ax-platform~=0.3.4; python_version >= '3.7' +ax-platform~=0.3.4; python_version >= '3.9' +ax-platform~=0.3.3; python_version == '3.8' From fc5cb222e7cf26cd35e7c4278f864dc1fb445928 Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 11:24:54 -0400 Subject: [PATCH 06/20] dependency hell --- REQUIREMENTS.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/REQUIREMENTS.txt b/REQUIREMENTS.txt index 78fe8165..3b10d0ca 100644 --- a/REQUIREMENTS.txt +++ b/REQUIREMENTS.txt @@ -4,4 +4,6 @@ GitPython~=3.1 pytomlpp~=1.0 # pyYAML~=5.4 pyYAML~=6.0 -setuptools~=68.1 +setuptools~=68.1 ; python_version >= '3.8' +setuptools~=68.0 ; python_version == '3.7' +setuptools~=59.6 ; python_version == '3.6' \ No newline at end of file From e76eff5db035a58352768dbc34db02282f2c3f26 Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 11:33:26 -0400 Subject: [PATCH 07/20] everyone dropped 3.6 support - there will be more single dep commits --- REQUIREMENTS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/REQUIREMENTS.txt b/REQUIREMENTS.txt index 3b10d0ca..ab9f7b5f 100644 --- a/REQUIREMENTS.txt +++ b/REQUIREMENTS.txt @@ -1,4 +1,5 @@ -attrs~=23.1 +attrs~=23.1 ; python_version >= '3.7' +attrs~=22.2 ; python_version == '3.6' cryptography~=37.0 GitPython~=3.1 pytomlpp~=1.0 From 6a9da0471be1de6543b4a2a38965d83af84d6b25 Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 11:39:58 -0400 Subject: [PATCH 08/20] everyone dropped 3.6 support - there will be more single dep commits --- requirements/DEV_REQUIREMENTS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/DEV_REQUIREMENTS.txt b/requirements/DEV_REQUIREMENTS.txt index e5a45b16..beaed1d3 100644 --- a/requirements/DEV_REQUIREMENTS.txt +++ b/requirements/DEV_REQUIREMENTS.txt @@ -1,7 +1,8 @@ black~=23.7 ; python_version >= '3.7' black~=21.4b0 ; python_version == '3.6' # coveralls~=3.3 -coverage[toml]~=7.3 +coverage[toml]~=7.3 ; python_version >= '3.7' +coverage[toml]~=6.2 ; python_version == '3.6' isort~=5.12 moto~=3.1 pre-commit~=3.3 ; python_version >= '3.7' From 8ed9cf1d9aed91a7bf16bfc2e0d41991797feb15 Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 13:15:42 -0400 Subject: [PATCH 09/20] fixing deps --- .github/workflows/python-coverage.yaml | 2 +- .github/workflows/python-lint.yaml | 4 ++-- requirements/DEV_REQUIREMENTS.txt | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-coverage.yaml b/.github/workflows/python-coverage.yaml index 7e94a2a8..43b66921 100644 --- a/.github/workflows/python-coverage.yaml +++ b/.github/workflows/python-coverage.yaml @@ -40,7 +40,7 @@ jobs: coverage run -m pytest --cov-config=.coveragerc - name: Convert to LCO - run: coverage lcov --cov-config=.coveragerc + run: coverage lcov --rcfile=.coveragerc - name: Upload coverage data to coveralls.io uses: coverallsapp/github-action@v2 diff --git a/.github/workflows/python-lint.yaml b/.github/workflows/python-lint.yaml index 3d524ac7..1c033955 100644 --- a/.github/workflows/python-lint.yaml +++ b/.github/workflows/python-lint.yaml @@ -37,8 +37,8 @@ jobs: - name: Run isort linter run: | - isort --check . --skip="debug" --skip="versioneer.py" --skip="tests" --skip="_version.py" + isort --check . - name: Run black linter run: | - black --check . --exclude="versioneer.py|_version.py|debug|tests" + black --check . diff --git a/requirements/DEV_REQUIREMENTS.txt b/requirements/DEV_REQUIREMENTS.txt index beaed1d3..905b7a13 100644 --- a/requirements/DEV_REQUIREMENTS.txt +++ b/requirements/DEV_REQUIREMENTS.txt @@ -1,4 +1,5 @@ -black~=23.7 ; python_version >= '3.7' +black~=23.7 ; python_version >= '3.8' +black~=23.3 ; python_version == '3.7' black~=21.4b0 ; python_version == '3.6' # coveralls~=3.3 coverage[toml]~=7.3 ; python_version >= '3.7' From cf95dff72f90340083e7eabdb3d876e9a713eabc Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 13:17:26 -0400 Subject: [PATCH 10/20] fixing deps --- requirements/DEV_REQUIREMENTS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/DEV_REQUIREMENTS.txt b/requirements/DEV_REQUIREMENTS.txt index 905b7a13..d7d99997 100644 --- a/requirements/DEV_REQUIREMENTS.txt +++ b/requirements/DEV_REQUIREMENTS.txt @@ -2,7 +2,8 @@ black~=23.7 ; python_version >= '3.8' black~=23.3 ; python_version == '3.7' black~=21.4b0 ; python_version == '3.6' # coveralls~=3.3 -coverage[toml]~=7.3 ; python_version >= '3.7' +coverage[toml]~=7.3 ; python_version >= '3.8' +coverage[toml]~=7.2 ; python_version == '3.7' coverage[toml]~=6.2 ; python_version == '3.6' isort~=5.12 moto~=3.1 From f7ddd4e6b92ae32bac1c3e4808d29e754ceb79fa Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 13:23:11 -0400 Subject: [PATCH 11/20] fixing deps --- requirements/DEV_REQUIREMENTS.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements/DEV_REQUIREMENTS.txt b/requirements/DEV_REQUIREMENTS.txt index d7d99997..ca856c41 100644 --- a/requirements/DEV_REQUIREMENTS.txt +++ b/requirements/DEV_REQUIREMENTS.txt @@ -5,7 +5,9 @@ black~=21.4b0 ; python_version == '3.6' coverage[toml]~=7.3 ; python_version >= '3.8' coverage[toml]~=7.2 ; python_version == '3.7' coverage[toml]~=6.2 ; python_version == '3.6' -isort~=5.12 +isort~=5.12 ; python_version >= '3.8' +isort~=5.11 ; python_version == '3.7' +isort~=5.10 ; python_version == '3.6' moto~=3.1 pre-commit~=3.3 ; python_version >= '3.7' pre-commit~=2.17 ; python_version == '3.6' From d0e272ec3f7d9ff0882dff385c5d59a4e1512445 Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 13:26:12 -0400 Subject: [PATCH 12/20] fixing deps --- requirements/DEV_REQUIREMENTS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/DEV_REQUIREMENTS.txt b/requirements/DEV_REQUIREMENTS.txt index ca856c41..1d66471e 100644 --- a/requirements/DEV_REQUIREMENTS.txt +++ b/requirements/DEV_REQUIREMENTS.txt @@ -9,7 +9,8 @@ isort~=5.12 ; python_version >= '3.8' isort~=5.11 ; python_version == '3.7' isort~=5.10 ; python_version == '3.6' moto~=3.1 -pre-commit~=3.3 ; python_version >= '3.7' +pre-commit~=3.3 ; python_version >= '3.8' +pre-commit~=3.21 ; python_version == '3.7' pre-commit~=2.17 ; python_version == '3.6' pydoc-markdown~=4.8 ; python_version >= '3.7' pydoc-markdown~=3.13 ; python_version == '3.6' From 690fe75714fc9f7c8b48af1a0e3ea5d25cdd6a9c Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 13:28:16 -0400 Subject: [PATCH 13/20] fixing deps --- requirements/DEV_REQUIREMENTS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/DEV_REQUIREMENTS.txt b/requirements/DEV_REQUIREMENTS.txt index 1d66471e..e2a384ec 100644 --- a/requirements/DEV_REQUIREMENTS.txt +++ b/requirements/DEV_REQUIREMENTS.txt @@ -10,7 +10,7 @@ isort~=5.11 ; python_version == '3.7' isort~=5.10 ; python_version == '3.6' moto~=3.1 pre-commit~=3.3 ; python_version >= '3.8' -pre-commit~=3.21 ; python_version == '3.7' +pre-commit~=2.21 ; python_version == '3.7' pre-commit~=2.17 ; python_version == '3.6' pydoc-markdown~=4.8 ; python_version >= '3.7' pydoc-markdown~=3.13 ; python_version == '3.6' From 75dbd3faad007d8073f5c98c3d0a61e6197f0678 Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 13:32:24 -0400 Subject: [PATCH 14/20] fixing deps --- requirements/DEV_REQUIREMENTS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/DEV_REQUIREMENTS.txt b/requirements/DEV_REQUIREMENTS.txt index e2a384ec..5883b7f2 100644 --- a/requirements/DEV_REQUIREMENTS.txt +++ b/requirements/DEV_REQUIREMENTS.txt @@ -14,6 +14,7 @@ pre-commit~=2.21 ; python_version == '3.7' pre-commit~=2.17 ; python_version == '3.6' pydoc-markdown~=4.8 ; python_version >= '3.7' pydoc-markdown~=3.13 ; python_version == '3.6' -pytest~=7.4 +pytest~=7.4 ; python_version >= '3.7' +pytest~=7.0 ; python_version == '3.6' pytest-cov~=4.1 pylint~=2.17 From f07d73dec53ab99515b4d2c4de16ad9035d2bb90 Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 13:33:33 -0400 Subject: [PATCH 15/20] fixing deps --- requirements/DEV_REQUIREMENTS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/DEV_REQUIREMENTS.txt b/requirements/DEV_REQUIREMENTS.txt index 5883b7f2..a3f12471 100644 --- a/requirements/DEV_REQUIREMENTS.txt +++ b/requirements/DEV_REQUIREMENTS.txt @@ -16,5 +16,6 @@ pydoc-markdown~=4.8 ; python_version >= '3.7' pydoc-markdown~=3.13 ; python_version == '3.6' pytest~=7.4 ; python_version >= '3.7' pytest~=7.0 ; python_version == '3.6' -pytest-cov~=4.1 +pytest-cov~=4.1 ; python_version >= '3.7' +pytest-cov~=4.0 ; python_version == '3.6' pylint~=2.17 From 7557b9cbc58573c408538284963d189af9666b41 Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 13:35:32 -0400 Subject: [PATCH 16/20] fixing deps --- requirements/DEV_REQUIREMENTS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/DEV_REQUIREMENTS.txt b/requirements/DEV_REQUIREMENTS.txt index a3f12471..409582de 100644 --- a/requirements/DEV_REQUIREMENTS.txt +++ b/requirements/DEV_REQUIREMENTS.txt @@ -18,4 +18,5 @@ pytest~=7.4 ; python_version >= '3.7' pytest~=7.0 ; python_version == '3.6' pytest-cov~=4.1 ; python_version >= '3.7' pytest-cov~=4.0 ; python_version == '3.6' -pylint~=2.17 +pylint~=2.17 ; python_version >= '3.7' +pylint~=2.13 ; python_version == '3.6' From edc75e0fa405e8238042f99f244b93ec9919f8f6 Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 13:40:16 -0400 Subject: [PATCH 17/20] fixing deps --- requirements/S3_REQUIREMENTS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/S3_REQUIREMENTS.txt b/requirements/S3_REQUIREMENTS.txt index 252cce4b..27438163 100644 --- a/requirements/S3_REQUIREMENTS.txt +++ b/requirements/S3_REQUIREMENTS.txt @@ -1,4 +1,5 @@ -boto3~=1.28 +boto3~=1.28 ; python_version >= '3.7' +boto3~=1.23 ; python_version == '3.6' botocore~=1.31 hurry.filesize~=0.9 s3transfer~=0.6 From 76358b7e331395a5ad5b8ae20dc95e0ec627b853 Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 13:50:14 -0400 Subject: [PATCH 18/20] plz just make it stop --- requirements/S3_REQUIREMENTS.txt | 6 ++++-- requirements/TUNE_REQUIREMENTS.txt | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/requirements/S3_REQUIREMENTS.txt b/requirements/S3_REQUIREMENTS.txt index 27438163..47d1bf5a 100644 --- a/requirements/S3_REQUIREMENTS.txt +++ b/requirements/S3_REQUIREMENTS.txt @@ -1,5 +1,7 @@ boto3~=1.28 ; python_version >= '3.7' boto3~=1.23 ; python_version == '3.6' -botocore~=1.31 +botocore~=1.31 ; python_version >= '3.7' +botocore~=1.26 ; python_version == '3.6' hurry.filesize~=0.9 -s3transfer~=0.6 +s3transfer~=0.6 ; python_version >= '3.7' +s3transfer~=0.5 ; python_version == '3.6' diff --git a/requirements/TUNE_REQUIREMENTS.txt b/requirements/TUNE_REQUIREMENTS.txt index f1fcfd91..c3b66fe2 100644 --- a/requirements/TUNE_REQUIREMENTS.txt +++ b/requirements/TUNE_REQUIREMENTS.txt @@ -1,5 +1,8 @@ mypy_extensions~=0.4; python_version < '3.8' optuna~=3.3 -torch~=2.0 +torch~=2.0 ; python_version >= '3.8' +torch~=1.13 ; python_version <= '3.7' ax-platform~=0.3.4; python_version >= '3.9' ax-platform~=0.3.3; python_version == '3.8' +ax-platform~=0.2.4; python_version == '3.7' + From 922667eff881c99a5aec6606f10a85635ee7a3b8 Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 14:02:06 -0400 Subject: [PATCH 19/20] changed linter to 3.10. bumped tune support to only 3.8+ --- .github/workflows/python-lint.yaml | 2 +- .github/workflows/python-pytest-tune.yaml | 2 +- README.md | 2 +- requirements/TUNE_REQUIREMENTS.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-lint.yaml b/.github/workflows/python-lint.yaml index 1c033955..8cf9f5c2 100644 --- a/.github/workflows/python-lint.yaml +++ b/.github/workflows/python-lint.yaml @@ -19,7 +19,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: '3.10' - uses: actions/cache@v2 with: diff --git a/.github/workflows/python-pytest-tune.yaml b/.github/workflows/python-pytest-tune.yaml index f276211e..4e1aded3 100644 --- a/.github/workflows/python-pytest-tune.yaml +++ b/.github/workflows/python-pytest-tune.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10"] + python-version: ["3.8", "3.9", "3.10"] steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index 1d0a03ad..9670609e 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ generating CLI arguments, and hierarchical configuration by composition. ## Quick Install -The basic install and `[s3]` extension require Python 3.6+ while the `[tune]` extension requires Python 3.7+ +The basic install and `[s3]` extension require Python 3.6+ while the `[tune]` extension requires Python 3.8+ | Base | w/ S3 Extension | w/ Hyper-Parameter Tuner | |------|-----------------|--------------------------| diff --git a/requirements/TUNE_REQUIREMENTS.txt b/requirements/TUNE_REQUIREMENTS.txt index c3b66fe2..4d89e88f 100644 --- a/requirements/TUNE_REQUIREMENTS.txt +++ b/requirements/TUNE_REQUIREMENTS.txt @@ -4,5 +4,5 @@ torch~=2.0 ; python_version >= '3.8' torch~=1.13 ; python_version <= '3.7' ax-platform~=0.3.4; python_version >= '3.9' ax-platform~=0.3.3; python_version == '3.8' -ax-platform~=0.2.4; python_version == '3.7' +# ax-platform~=0.2.4; python_version == '3.7' From 8ec6df2c5b9d53e4eb34721a1da0e269b9880b76 Mon Sep 17 00:00:00 2001 From: Nicholas Cilfone <23509131+ncilfone@users.noreply.github.com> Date: Wed, 30 Aug 2023 14:12:43 -0400 Subject: [PATCH 20/20] dropping 3.6 support because of dependency hell --- .github/workflows/python-coverage.yaml | 2 +- .github/workflows/python-docs.yaml | 2 +- .github/workflows/python-manual-docs.yaml | 2 +- .github/workflows/python-publish.yaml | 2 +- .github/workflows/python-pytest-s3.yaml | 2 +- .github/workflows/python-pytest.yml | 2 +- .github/workflows/python-test-docs.yaml | 2 +- README.md | 10 +++++++--- REQUIREMENTS.txt | 6 ++---- requirements/DEV_REQUIREMENTS.txt | 8 -------- requirements/S3_REQUIREMENTS.txt | 3 --- requirements/TUNE_REQUIREMENTS.txt | 1 - setup.py | 2 +- spock/backend/typed.py | 1 - spock/backend/validators.py | 1 - spock/graph.py | 1 - 16 files changed, 17 insertions(+), 30 deletions(-) diff --git a/.github/workflows/python-coverage.yaml b/.github/workflows/python-coverage.yaml index 43b66921..d7345020 100644 --- a/.github/workflows/python-coverage.yaml +++ b/.github/workflows/python-coverage.yaml @@ -19,7 +19,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: '3.10' - uses: actions/cache@v2 with: diff --git a/.github/workflows/python-docs.yaml b/.github/workflows/python-docs.yaml index 97769414..e628b26f 100644 --- a/.github/workflows/python-docs.yaml +++ b/.github/workflows/python-docs.yaml @@ -17,7 +17,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: '3.10' - uses: actions/cache@v2 with: diff --git a/.github/workflows/python-manual-docs.yaml b/.github/workflows/python-manual-docs.yaml index 139d9976..40d55f04 100644 --- a/.github/workflows/python-manual-docs.yaml +++ b/.github/workflows/python-manual-docs.yaml @@ -14,7 +14,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: '3.10' - uses: actions/cache@v2 with: diff --git a/.github/workflows/python-publish.yaml b/.github/workflows/python-publish.yaml index 8e0eca4d..f5ad99ec 100644 --- a/.github/workflows/python-publish.yaml +++ b/.github/workflows/python-publish.yaml @@ -20,7 +20,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: '3.10' - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/python-pytest-s3.yaml b/.github/workflows/python-pytest-s3.yaml index 80d9d32c..545118a9 100644 --- a/.github/workflows/python-pytest-s3.yaml +++ b/.github/workflows/python-pytest-s3.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10"] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/python-pytest.yml b/.github/workflows/python-pytest.yml index 38bca867..d550a708 100644 --- a/.github/workflows/python-pytest.yml +++ b/.github/workflows/python-pytest.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10"] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/python-test-docs.yaml b/.github/workflows/python-test-docs.yaml index 75ed90ac..141de20b 100644 --- a/.github/workflows/python-test-docs.yaml +++ b/.github/workflows/python-test-docs.yaml @@ -21,7 +21,7 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: '3.10' - uses: actions/cache@v2 with: diff --git a/README.md b/README.md index 9670609e..df832f9e 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@

- + @@ -84,7 +84,7 @@ generating CLI arguments, and hierarchical configuration by composition. ## Quick Install -The basic install and `[s3]` extension require Python 3.6+ while the `[tune]` extension requires Python 3.8+ +The basic install and `[s3]` extension require Python 3.7+ while the `[tune]` extension requires Python 3.8+ | Base | w/ S3 Extension | w/ Hyper-Parameter Tuner | |------|-----------------|--------------------------| @@ -102,7 +102,11 @@ See [Releases](https://github.com/fidelity/spock/releases) for more information.

-### Jan 12th, 2023 +#### August 30th, 2023 +* Removed Python 3.6 support as it was causing dependency hell +* Collection of bugfixes + +#### Jan 12th, 2023 * Added support for resolving value definitions from references to other defined variables with the following syntax,`${spock.var:SpockClass.defined_variable}` * Added support for new fundamental types: (1) file: this is an overload of a str that verifies file existence and (r/w) access (2) directory: this is an overload of a str that verifies directory existence, creation if not existing, and (r/w) access * Deprecated support for `List` of repeated `@spock` decorated classes. diff --git a/REQUIREMENTS.txt b/REQUIREMENTS.txt index ab9f7b5f..1cc4e214 100644 --- a/REQUIREMENTS.txt +++ b/REQUIREMENTS.txt @@ -1,10 +1,8 @@ -attrs~=23.1 ; python_version >= '3.7' -attrs~=22.2 ; python_version == '3.6' +attrs~=23.1 cryptography~=37.0 GitPython~=3.1 pytomlpp~=1.0 # pyYAML~=5.4 pyYAML~=6.0 setuptools~=68.1 ; python_version >= '3.8' -setuptools~=68.0 ; python_version == '3.7' -setuptools~=59.6 ; python_version == '3.6' \ No newline at end of file +setuptools~=68.0 ; python_version == '3.7' \ No newline at end of file diff --git a/requirements/DEV_REQUIREMENTS.txt b/requirements/DEV_REQUIREMENTS.txt index 409582de..e586773b 100644 --- a/requirements/DEV_REQUIREMENTS.txt +++ b/requirements/DEV_REQUIREMENTS.txt @@ -1,22 +1,14 @@ black~=23.7 ; python_version >= '3.8' black~=23.3 ; python_version == '3.7' -black~=21.4b0 ; python_version == '3.6' # coveralls~=3.3 coverage[toml]~=7.3 ; python_version >= '3.8' coverage[toml]~=7.2 ; python_version == '3.7' -coverage[toml]~=6.2 ; python_version == '3.6' isort~=5.12 ; python_version >= '3.8' isort~=5.11 ; python_version == '3.7' -isort~=5.10 ; python_version == '3.6' moto~=3.1 pre-commit~=3.3 ; python_version >= '3.8' pre-commit~=2.21 ; python_version == '3.7' -pre-commit~=2.17 ; python_version == '3.6' pydoc-markdown~=4.8 ; python_version >= '3.7' -pydoc-markdown~=3.13 ; python_version == '3.6' pytest~=7.4 ; python_version >= '3.7' -pytest~=7.0 ; python_version == '3.6' pytest-cov~=4.1 ; python_version >= '3.7' -pytest-cov~=4.0 ; python_version == '3.6' pylint~=2.17 ; python_version >= '3.7' -pylint~=2.13 ; python_version == '3.6' diff --git a/requirements/S3_REQUIREMENTS.txt b/requirements/S3_REQUIREMENTS.txt index 47d1bf5a..f91b9032 100644 --- a/requirements/S3_REQUIREMENTS.txt +++ b/requirements/S3_REQUIREMENTS.txt @@ -1,7 +1,4 @@ boto3~=1.28 ; python_version >= '3.7' -boto3~=1.23 ; python_version == '3.6' botocore~=1.31 ; python_version >= '3.7' -botocore~=1.26 ; python_version == '3.6' hurry.filesize~=0.9 s3transfer~=0.6 ; python_version >= '3.7' -s3transfer~=0.5 ; python_version == '3.6' diff --git a/requirements/TUNE_REQUIREMENTS.txt b/requirements/TUNE_REQUIREMENTS.txt index 4d89e88f..162264dd 100644 --- a/requirements/TUNE_REQUIREMENTS.txt +++ b/requirements/TUNE_REQUIREMENTS.txt @@ -4,5 +4,4 @@ torch~=2.0 ; python_version >= '3.8' torch~=1.13 ; python_version <= '3.7' ax-platform~=0.3.4; python_version >= '3.9' ax-platform~=0.3.3; python_version == '3.8' -# ax-platform~=0.2.4; python_version == '3.7' diff --git a/setup.py b/setup.py index 110657cd..338b8df9 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,7 @@ "": ["py.typed", "*.pyi"], }, include_package_data=True, - python_requires=">=3.6", + python_requires=">=3.7", install_requires=install_reqs, extras_require={"s3": s3_reqs, "tune": tune_reqs}, ) diff --git a/spock/backend/typed.py b/spock/backend/typed.py index db9d4d82..3cbbaeb2 100644 --- a/spock/backend/typed.py +++ b/spock/backend/typed.py @@ -73,7 +73,6 @@ def _recursive_generic_validator(typed): # Iterate through since there might be multiple types? # Handle Tuple type if _get_name_py_version(typed) == "Tuple": - # Tuples by def have len more than 1. We throw an exception if not since # a tuple is not necessary in that case. Tuples can also have mixed types, # thus we need to handle this oddity here -- we do this by passing each diff --git a/spock/backend/validators.py b/spock/backend/validators.py index b0428c7c..4f86c3c2 100644 --- a/spock/backend/validators.py +++ b/spock/backend/validators.py @@ -390,7 +390,6 @@ def __call__( validator(inst, attr, member) def __repr__(self): - return ( f"" diff --git a/spock/graph.py b/spock/graph.py index 8fd93d0c..e1703b64 100644 --- a/spock/graph.py +++ b/spock/graph.py @@ -230,7 +230,6 @@ def _build(self) -> Dict: class SelfGraph(BaseGraph): - var_resolver = VarResolver() def __init__(self, cls: _C, fields: Dict):