Skip to content

Commit

Permalink
Fix dev-environment (#261)
Browse files Browse the repository at this point in the history
* check creation of dev-environment in CI

* fix conflicts in dev-requirements

* upgrade requirements,too
  • Loading branch information
hf-kklein authored Mar 28, 2024
1 parent 56f1f82 commit 141f6e3
Show file tree
Hide file tree
Showing 9 changed files with 83 additions and 71 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pythonlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
matrix:
python-version: [ "3.12" ]
os: [ ubuntu-latest ]
linter-env: [ "linting", "type_check" ]
linter-env: [ "linting", "type_check", "dev" ]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down
9 changes: 5 additions & 4 deletions dev_requirements/requirements-coverage.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# SHA1:6dafbcf610e9f81897b65ee9142715ab2e793f9e
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
# This file is autogenerated by pip-compile-multi
# To update, run:
#
# pip-compile '.\requirements-coverage.in'
# pip-compile-multi
#
coverage==7.4.4
# via -r dev_requirements/requirements-coverage.in
# via -r dev_requirements\requirements-coverage.in
17 changes: 10 additions & 7 deletions dev_requirements/requirements-formatting.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
# SHA1:2c7ffcd29222de3114c7f7994911f1b69d06b6b3
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
# This file is autogenerated by pip-compile-multi
# To update, run:
#
# pip-compile requirements-formatting.in
# pip-compile-multi
#
black==24.3.0
# via -r dev_requirements/requirements-formatting.in
# via -r dev_requirements\requirements-formatting.in
click==8.1.7
# via black
colorama==0.4.6
# via click
isort==5.13.2
# via -r dev_requirements/requirements-formatting.in
# via -r dev_requirements\requirements-formatting.in
mypy-extensions==1.0.0
# via black
packaging==23.2
packaging==24.0
# via black
pathspec==0.12.1
# via black
platformdirs==4.1.0
platformdirs==4.2.0
# via black
15 changes: 9 additions & 6 deletions dev_requirements/requirements-linting.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
# SHA1:0e15f8789b9d62fe90d1f1b0b6a7e32f13b99b19
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
# This file is autogenerated by pip-compile-multi
# To update, run:
#
# pip-compile '.\requirements-linting.in'
# pip-compile-multi
#
astroid==3.1.0
# via pylint
dill==0.3.7
colorama==0.4.6
# via pylint
dill==0.3.8
# via pylint
isort==5.13.2
# via pylint
mccabe==0.7.0
# via pylint
platformdirs==3.10.0
platformdirs==4.2.0
# via pylint
pylint==3.1.0
# via -r dev_requirements/requirements-linting.in
# via -r dev_requirements\requirements-linting.in
tomlkit==0.12.4
# via pylint
33 changes: 14 additions & 19 deletions dev_requirements/requirements-test_packaging.txt
Original file line number Diff line number Diff line change
@@ -1,35 +1,32 @@
# SHA1:93e4fbf2b6cce1574fe3d5315360512fa9927699
#
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
# This file is autogenerated by pip-compile-multi
# To update, run:
#
# pip-compile dev_requirements/requirements-test_packaging.in
# pip-compile-multi
#
build==1.1.1
# via -r dev_requirements/requirements-test_packaging.in
# via -r dev_requirements\requirements-test_packaging.in
certifi==2024.2.2
# via requests
cffi==1.16.0
# via cryptography
charset-normalizer==3.3.2
# via requests
cryptography==42.0.5
# via secretstorage
colorama==0.4.6
# via build
docutils==0.20.1
# via readme-renderer
idna==3.6
# via requests
importlib-metadata==7.1.0
# via twine
# via
# keyring
# twine
jaraco-classes==3.3.1
# via keyring
jaraco-context==4.3.0
# via keyring
jaraco-functools==4.0.0
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
keyring==25.0.0
# via twine
markdown-it-py==3.0.0
Expand All @@ -40,20 +37,20 @@ more-itertools==10.2.0
# via
# jaraco-classes
# jaraco-functools
nh3==0.2.15
nh3==0.2.17
# via readme-renderer
packaging==24.0
# via build
pkginfo==1.10.0
# via twine
pycparser==2.21
# via cffi
pygments==2.17.2
# via
# readme-renderer
# rich
pyproject-hooks==1.0.0
# via build
pywin32-ctypes==0.2.2
# via keyring
readme-renderer==43.0
# via twine
requests==2.31.0
Expand All @@ -66,10 +63,8 @@ rfc3986==2.0.0
# via twine
rich==13.7.1
# via twine
secretstorage==3.3.3
# via keyring
twine==5.0.0
# via -r dev_requirements/requirements-test_packaging.in
# via -r dev_requirements\requirements-test_packaging.in
urllib3==2.2.1
# via
# requests
Expand Down
17 changes: 10 additions & 7 deletions dev_requirements/requirements-tests.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
# SHA1:d8bf34f7830b949c538f22e73d2b6ebb2065a573
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
# This file is autogenerated by pip-compile-multi
# To update, run:
#
# pip-compile '.\requirements-tests.in'
# pip-compile-multi
#
colorama==0.4.6
# via pytest
dictdiffer==0.9.0
# via -r dev_requirements/requirements-tests.in
# via -r dev_requirements\requirements-tests.in
iniconfig==2.0.0
# via pytest
packaging==22.0
packaging==24.0
# via pytest
pluggy==1.4.0
# via pytest
pytest==8.1.1
# via
# -r dev_requirements/requirements-tests.in
# -r dev_requirements\requirements-tests.in
# pytest-datafiles
pytest-datafiles==3.0.0
# via -r dev_requirements/requirements-tests.in
# via -r dev_requirements\requirements-tests.in
37 changes: 20 additions & 17 deletions dev_requirements/requirements-type_check.txt
Original file line number Diff line number Diff line change
@@ -1,46 +1,49 @@
# SHA1:9cd1f3c474cd703c73c638f1d80652561b103054
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
# This file is autogenerated by pip-compile-multi
# To update, run:
#
# pip-compile '.\requirements-type_check.in'
# pip-compile-multi
#
colorama==0.4.6
# via pytest
iniconfig==2.0.0
# via pytest
mypy==1.9.0
# via -r dev_requirements/requirements-type_check.in
# via -r dev_requirements\requirements-type_check.in
mypy-extensions==1.0.0
# via mypy
networkx==3.1
networkx==3.2.1
# via networkx-stubs
networkx-stubs==0.0.1
# via -r dev_requirements/requirements-type_check.in
numpy==1.26.2
# via -r dev_requirements\requirements-type_check.in
numpy==1.26.4
# via
# pandas
# pandas-stubs
packaging==22.0
packaging==24.0
# via pytest
pandas==2.2.1
# via -r dev_requirements/requirements-type_check.in
# via -r dev_requirements\requirements-type_check.in
pandas-stubs==2.2.1.240316
# via -r dev_requirements/requirements-type_check.in
# via -r dev_requirements\requirements-type_check.in
pluggy==1.4.0
# via pytest
pytest==8.1.1
# via -r dev_requirements/requirements-type_check.in
python-dateutil==2.8.2
# via -r dev_requirements\requirements-type_check.in
python-dateutil==2.9.0.post0
# via pandas
pytz==2024.1
# via pandas
six==1.16.0
# via python-dateutil
types-pytz==2023.3.1.1
types-pytz==2024.1.0.20240203
# via pandas-stubs
types-requests==2.31.0.20240311
# via -r dev_requirements/requirements-type_check.in
typing-extensions==4.8.0
# via -r dev_requirements\requirements-type_check.in
typing-extensions==4.10.0
# via mypy
tzdata==2023.3
tzdata==2024.1
# via pandas
urllib3==2.1.0
urllib3==2.2.1
# via types-requests
20 changes: 12 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,31 @@ attrs==23.2.0
# maus
click==8.1.7
# via -r requirements.in
colorama==0.4.6
# via
# click
# colorlog
colorlog==6.8.2
# via -r requirements.in
et-xmlfile==1.1.0
# via openpyxl
lxml==4.9.3
lxml==5.1.0
# via python-docx
marshmallow==3.19.0
marshmallow==3.21.1
# via maus
maus==0.4.2
# via -r requirements.in
more-itertools==9.0.0
more-itertools==10.2.0
# via maus
numpy==1.26.2
numpy==1.26.4
# via pandas
openpyxl==3.1.2
# via -r requirements.in
packaging==22.0
packaging==24.0
# via marshmallow
pandas==2.2.1
# via -r requirements.in
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via pandas
python-docx==1.1.0
# via -r requirements.in
Expand All @@ -40,9 +44,9 @@ six==1.16.0
# via python-dateutil
tomlkit==0.12.4
# via -r requirements.in
typing-extensions==4.8.0
typing-extensions==4.10.0
# via python-docx
tzdata==2023.3
tzdata==2024.1
# via pandas
xlsxwriter==3.2.0
# via -r requirements.in
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ deps =
pre-commit
commands =
python -m pip install --upgrade pip
pip-compile requirements.in
# pip-compile requirements.in
pip install -r requirements.txt
pre-commit install
# pre-commit install

[testenv:test_packaging]
skip_install = true
Expand Down

0 comments on commit 141f6e3

Please sign in to comment.