Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAINT!: merge setup.cfg into pyproject.toml #309

Merged
merged 2 commits into from
Jul 11, 2023
Merged
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
7 changes: 4 additions & 3 deletions .constraints/py3.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.10.txt --resolver=backtracking --strip-extras
# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.10.txt --resolver=backtracking --strip-extras --unsafe-package=pip --unsafe-package=polarimetry --unsafe-package=setuptools
#
accessible-pygments==0.0.4
alabaster==0.7.13
Expand All @@ -17,7 +17,7 @@ attrs==23.1.0
babel==2.12.1
backcall==0.2.0
beautifulsoup4==4.12.2
black==23.3.0
black==23.7.0
bleach==6.0.0
cachetools==5.3.1
cairocffi==1.6.0
Expand Down Expand Up @@ -122,7 +122,7 @@ platformdirs==3.8.1
plotly==5.15.0
pluggy==1.2.0
pre-commit==3.3.3
prometheus-client==0.17.0
prometheus-client==0.17.1
prompt-toolkit==3.0.39
psutil==5.9.5
ptyprocess==0.7.0
Expand Down Expand Up @@ -201,4 +201,5 @@ wrapt==1.15.0
zipp==3.16.0

# The following packages are considered to be unsafe in a requirements file:
# polarimetry
# setuptools
7 changes: 4 additions & 3 deletions .constraints/py3.11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.11.txt --resolver=backtracking --strip-extras
# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.11.txt --resolver=backtracking --strip-extras --unsafe-package=pip --unsafe-package=polarimetry --unsafe-package=setuptools
#
accessible-pygments==0.0.4
alabaster==0.7.13
Expand All @@ -17,7 +17,7 @@ attrs==23.1.0
babel==2.12.1
backcall==0.2.0
beautifulsoup4==4.12.2
black==23.3.0
black==23.7.0
bleach==6.0.0
cachetools==5.3.1
cairocffi==1.6.0
Expand Down Expand Up @@ -121,7 +121,7 @@ platformdirs==3.8.1
plotly==5.15.0
pluggy==1.2.0
pre-commit==3.3.3
prometheus-client==0.17.0
prometheus-client==0.17.1
prompt-toolkit==3.0.39
psutil==5.9.5
ptyprocess==0.7.0
Expand Down Expand Up @@ -199,4 +199,5 @@ wrapt==1.15.0
zipp==3.16.0

# The following packages are considered to be unsafe in a requirements file:
# polarimetry
# setuptools
11 changes: 6 additions & 5 deletions .constraints/py3.7.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.7.txt --resolver=backtracking --strip-extras
# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.7.txt --resolver=backtracking --strip-extras --unsafe-package=pip --unsafe-package=polarimetry --unsafe-package=setuptools
#
accessible-pygments==0.0.4
aiofiles==22.1.0
Expand Down Expand Up @@ -52,7 +52,7 @@ identify==2.5.24
idna==3.4
imagesize==1.4.1
iminuit==2.18.0
importlib-metadata==6.7.0 ; python_version < "3.8.0"
importlib-metadata==6.7.0
importlib-resources==5.12.0
iniconfig==2.0.0
ipykernel==6.16.2
Expand Down Expand Up @@ -102,7 +102,7 @@ nbclassic==1.0.0
nbclient==0.5.13
nbconvert==7.6.0
nbformat==5.8.0
nbmake==1.2.1 ; python_version < "3.8.0"
nbmake==1.2.1
nest-asyncio==1.5.6
nodeenv==1.8.0
notebook==6.5.4
Expand All @@ -123,7 +123,7 @@ platformdirs==3.8.1
plotly==5.15.0
pluggy==1.2.0
pre-commit==2.21.0
prometheus-client==0.17.0
prometheus-client==0.17.1
prompt-toolkit==3.0.39
psutil==5.9.5
ptyprocess==0.7.0
Expand Down Expand Up @@ -198,8 +198,9 @@ wheel==0.40.0
widgetsnbextension==4.0.8
wrapt==1.15.0
y-py==0.5.9
ypy-websocket==0.8.2 ; python_version < "3.8.0"
ypy-websocket==0.8.2
zipp==3.15.0

# The following packages are considered to be unsafe in a requirements file:
# polarimetry
# setuptools
7 changes: 4 additions & 3 deletions .constraints/py3.8.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.8.txt --resolver=backtracking --strip-extras
# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.8.txt --resolver=backtracking --strip-extras --unsafe-package=pip --unsafe-package=polarimetry --unsafe-package=setuptools
#
accessible-pygments==0.0.4
alabaster==0.7.13
Expand All @@ -17,7 +17,7 @@ attrs==23.1.0
babel==2.12.1
backcall==0.2.0
beautifulsoup4==4.12.2
black==23.3.0
black==23.7.0
bleach==6.0.0
cachetools==5.3.1
cairocffi==1.6.0
Expand Down Expand Up @@ -124,7 +124,7 @@ platformdirs==3.8.1
plotly==5.15.0
pluggy==1.2.0
pre-commit==3.3.3
prometheus-client==0.17.0
prometheus-client==0.17.1
prompt-toolkit==3.0.39
psutil==5.9.5
ptyprocess==0.7.0
Expand Down Expand Up @@ -203,4 +203,5 @@ wrapt==1.15.0
zipp==3.16.0

# The following packages are considered to be unsafe in a requirements file:
# polarimetry
# setuptools
7 changes: 4 additions & 3 deletions .constraints/py3.9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.9.txt --resolver=backtracking --strip-extras
# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.9.txt --resolver=backtracking --strip-extras --unsafe-package=pip --unsafe-package=polarimetry --unsafe-package=setuptools
#
accessible-pygments==0.0.4
alabaster==0.7.13
Expand All @@ -17,7 +17,7 @@ attrs==23.1.0
babel==2.12.1
backcall==0.2.0
beautifulsoup4==4.12.2
black==23.3.0
black==23.7.0
bleach==6.0.0
cachetools==5.3.1
cairocffi==1.6.0
Expand Down Expand Up @@ -123,7 +123,7 @@ platformdirs==3.8.1
plotly==5.15.0
pluggy==1.2.0
pre-commit==3.3.3
prometheus-client==0.17.0
prometheus-client==0.17.1
prompt-toolkit==3.0.39
psutil==5.9.5
ptyprocess==0.7.0
Expand Down Expand Up @@ -202,4 +202,5 @@ wrapt==1.15.0
zipp==3.16.0

# The following packages are considered to be unsafe in a requirements file:
# polarimetry
# setuptools
1 change: 0 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
"miscellchecks/**.C",
"pyproject.toml",
"pytest.ini",
"setup.cfg",
"tox.ini"
],
"language": "en-US",
Expand Down
1 change: 1 addition & 0 deletions .cspell/this-project.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ pdfnb
phsp
pushd
PyPI
pyproject
pyright
pytest
PYTHONHASHSEED
Expand Down
29 changes: 13 additions & 16 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
root = true

[*]
end_of_line = lf
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[Makefile]
indent_style = tab

[*.{py,toml}]
indent_size = 4

[setup.cfg]
indent_size = 4
root = true

[*]
end_of_line = lf
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[Makefile]
indent_style = tab

[*.{py,toml}]
indent_size = 4
14 changes: 7 additions & 7 deletions .github/workflows/ci-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,27 +106,27 @@ jobs:
uses: actions/cache@v3
with:
key: |
sympy-${{hashFiles('.constraints/py3.*.txt', 'setup.cfg')}}-${{hashFiles('src/**')}}-${{hashFiles('docs/**.ipynb')}}
sympy-${{hashFiles('.constraints/py3.*.txt')}}-${{hashFiles('src/**')}}-${{hashFiles('docs/**.ipynb')}}
restore-keys: |
sympy-${{hashFiles('.constraints/py3.*.txt', 'setup.cfg')}}-${{hashFiles('src/**')}}
sympy-${{hashFiles('.constraints/py3.*.txt', 'setup.cfg')}}
sympy-${{hashFiles('.constraints/py3.*.txt')}}-${{hashFiles('src/**')}}
sympy-${{hashFiles('.constraints/py3.*.txt')}}
path: ~/.sympy-cache*/
- name: Fetch Jupyter cache
uses: actions/cache@v3
with:
key: |
jupyter-cache-${{hashFiles('.constraints/py3.*.txt', 'data/**', 'setup.cfg', 'src/**')}}-${{hashFiles('docs/**')}}
jupyter-cache-${{hashFiles('.constraints/py3.*.txt', 'data/**', 'src/**')}}-${{hashFiles('docs/**')}}
restore-keys: |
jupyter-cache-${{hashFiles('.constraints/py3.*.txt', 'data/**', 'setup.cfg', 'src/**')}}
jupyter-cache-${{hashFiles('.constraints/py3.*.txt', 'data/**', 'src/**')}}
path: |
./docs/_build/.jupyter_cache
- name: Fetch output files
uses: actions/cache@v3
with:
key: |
output-files-${{hashFiles('.constraints/py3.*.txt', 'data/**', 'setup.cfg', 'src/**')}}-${{hashFiles('docs/**')}}
output-files-${{hashFiles('.constraints/py3.*.txt', 'data/**', 'src/**')}}-${{hashFiles('docs/**')}}
restore-keys: |
output-files-${{hashFiles('.constraints/py3.*.txt', 'data/**', 'setup.cfg', 'src/**')}}
output-files-${{hashFiles('.constraints/py3.*.txt', 'data/**', 'src/**')}}
output-files
path: |
./docs/_images
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
paths:
- .constraints/py3.*.txt
- .pre-commit-config.yaml
- setup.cfg
- pyproject.toml
schedule:
- cron: "0 3 7 */3 *"
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/psf/black
rev: 23.3.0
rev: 23.7.0
hooks:
- id: black

Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- defaults
dependencies:
- python==3.8.*
- pip
- pip>=21.3 # pyproject.toml
- pip:
- |
-c .constraints/py3.8.txt
Expand Down
Loading