Skip to content

Commit

Permalink
dropping 3.6 support because of dependency hell
Browse files Browse the repository at this point in the history
  • Loading branch information
ncilfone committed Aug 30, 2023
1 parent 922667e commit 8ec6df2
Show file tree
Hide file tree
Showing 16 changed files with 17 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-manual-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-pytest-s3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-test-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

- uses: actions/setup-python@v2
with:
python-version: '3.8'
python-version: '3.10'

- uses: actions/cache@v2
with:
Expand Down
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</p>

<p align="center">
<a><img src="https://img.shields.io/badge/python-3.6+-informational.svg"/></a>
<a><img src="https://img.shields.io/badge/python-3.7+-informational.svg"/></a>
<a href="https://github.com/psf/black"><img src="https://img.shields.io/badge/code%20style-black-000000.svg"/></a>
<a href="https://badge.fury.io/py/spock-config"><img src="https://badge.fury.io/py/spock-config.svg"/></a>
<a href="https://pepy.tech/project/spock-config"><img src="https://static.pepy.tech/personalized-badge/spock-config?period=total&units=international_system&left_color=grey&right_color=orange&left_text=Downloads"/></a>
Expand Down Expand Up @@ -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 |
|------|-----------------|--------------------------|
Expand All @@ -102,7 +102,11 @@ See [Releases](https://github.com/fidelity/spock/releases) for more information.

<details>

### 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.
Expand Down
6 changes: 2 additions & 4 deletions REQUIREMENTS.txt
Original file line number Diff line number Diff line change
@@ -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'
setuptools~=68.0 ; python_version == '3.7'
8 changes: 0 additions & 8 deletions requirements/DEV_REQUIREMENTS.txt
Original file line number Diff line number Diff line change
@@ -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'
3 changes: 0 additions & 3 deletions requirements/S3_REQUIREMENTS.txt
Original file line number Diff line number Diff line change
@@ -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'
1 change: 0 additions & 1 deletion requirements/TUNE_REQUIREMENTS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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'

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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},
)
1 change: 0 additions & 1 deletion spock/backend/typed.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion spock/backend/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ def __call__(
validator(inst, attr, member)

def __repr__(self):

return (
f"<ordered is instance deep_iterable validator for types "
f"{self.ordered_types}>"
Expand Down
1 change: 0 additions & 1 deletion spock/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ def _build(self) -> Dict:


class SelfGraph(BaseGraph):

var_resolver = VarResolver()

def __init__(self, cls: _C, fields: Dict):
Expand Down

0 comments on commit 8ec6df2

Please sign in to comment.