Skip to content

Commit

Permalink
Python < 3.11; Fix linting and node.js warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
patnr committed Jul 1, 2024
1 parent 85c7aef commit 619b48a
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest']
python-version: ['3.9', '3.10', '3.11']
python-version: ['3.9', '3.10'] # NB: also see versions for 'conda'
jobtype: ['test']
include:
- os: 'ubuntu-latest'
Expand All @@ -33,10 +33,10 @@ jobs:
JOBTYPE: ${{ matrix.jobtype }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
Expand Down Expand Up @@ -75,16 +75,16 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest']
python-version: ['3.9', '3.10', '3.11']
python-version: ['3.9', '3.10']
include:
- os: 'macos-latest'
python-version: '3.10'
- os: 'windows-latest'
python-version: '3.9'

steps:
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v2
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion dapper/xp_process.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ def label_xSection(self, label, *NoneAttrs, **sub_coord):
for coord in self.coords_matching(**self.intersect_dims(sub_coord)):
entry = copy.deepcopy(self[coord])
coord = coord._replace(xSect=label)
coord = coord._replace(**{a: None for a in NoneAttrs})
coord = coord._replace(**{a: None for a in NoneAttrs}) # noqa
self[coord] = entry


Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ max_line_length = 88
ignore = "W6"

[tool.flakeheaven]
exclude = [".*", "README.*", "examples/*.ipynb", "autoscaler.py"]
exclude = [".*", "README.*", "examples/*.ipynb", "autoscaler.py", "build"]
max_line_length = 88
format = "grouped" # also try "stat"
show_source = false
Expand Down
8 changes: 6 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@
'pytest-cov', 'pytest-sugar', 'pytest-benchmark',
'pytest-clarity', 'pytest-xdist', 'pytest-timeout'],
'lint': ['flake8<5', # https://github.com/flakeheaven/flakeheaven/issues/132
'flakeheaven', 'autopep8'],
'flakeheaven', 'autopep8',
'flake8-docstrings', 'flake8-bugbear', 'flake8-comprehensions',
'flake8-isort', 'flake8-builtins', 'pep8-naming', 'flake8-commas',
],
# 'flake8-docstrings', 'flake8-bugbear', 'flake8-comprehensions'],
'build': ['twine', 'pdoc', 'jupytext'],
}
Expand Down Expand Up @@ -92,7 +95,8 @@ def read(*parts):
# >=3.7 for dataclass, capture_output, dict ordering, np>=1.20.
# ==3.7 for Colab
# ==3.9 for the DAPPER/GCP cluster, since dill isn't compat. across versions.
python_requires='>=3.9',
# <3.11 because it failed with multiprocessing
python_requires='>=3.9,<3.11',
install_requires=INSTALL_REQUIRES,
extras_require=EXTRAS,

Expand Down

0 comments on commit 619b48a

Please sign in to comment.