Skip to content

Commit e16e29d

Browse files
HenrZuHenrZu
authored
1440 Move directory of python packages (#1441)
1 parent 31023f0 commit e16e29d

90 files changed

Lines changed: 75 additions & 179 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/test-py/action.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,20 @@ runs:
5050
shell: bash
5151
run: |
5252
export PYTHON_VERSION_NO_DOT=$(echo "${{ inputs.version }}" | sed 's/\.//g')
53-
for pkg in `ls pycode/wheelhouse/*cp$PYTHON_VERSION_NO_DOT*.whl`; do python -m pip install $pkg; done # packages that contain native extensions are version specific
54-
for pkg in `ls pycode/wheelhouse/*py3*.whl`; do python -m pip install $pkg; done # pure python packages are not version specific
55-
pip install -r pycode/memilio-${{ inputs.package }}/requirements-dev.txt
53+
shopt -s nullglob
54+
for pkg in pycode/wheelhouse/*cp$PYTHON_VERSION_NO_DOT*.whl; do python -m pip install "$pkg"; done # packages that contain native extensions are version specific
55+
for pkg in pycode/wheelhouse/*py3*.whl; do python -m pip install "$pkg"; done # pure python packages are not version specific
56+
python -m pip install --upgrade-strategy only-if-needed --prefer-binary --find-links pycode/wheelhouse "memilio-${{ inputs.package }}[dev]"
5657
- name: Run unit tests
5758
shell: bash
5859
run: |
59-
cd pycode/memilio-${{inputs.package}}/memilio/${{inputs.package}}_test
60+
cd pycode/memilio-${{inputs.package}}/tests
6061
if [[ "${{ inputs.coverage }}" == "ON" ]]; then
6162
python -W ignore::DeprecationWarning -m coverage run --include=**/site-packages/memilio/* -m unittest
6263
python -m coverage report
6364
python -m coverage xml -o coverage_python.xml
6465
python -m coverage html -d coverage_python
65-
cp -r coverage_python ../../../../
66+
cp -r coverage_python ../../../
6667
else
6768
python -m unittest
6869
fi

‎.github/actions/test-pylint/action.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ runs:
2323
uses: actions/download-artifact@v4
2424
with:
2525
name: python-wheels-${{ inputs.package }}
26+
path: pycode/wheelhouse
2627
- name: Install Python Wheels
2728
shell: bash
2829
run: |
29-
for pkg in `ls pycode/wheelhouse/*cp311*.whl`; do python -m pip install $pkg; done # packages that contain native extensions are version specific
30-
for pkg in `ls pycode/wheelhouse/*py3*.whl`; do python -m pip install $pkg; done # pure python packages are not version specific
31-
pip install -r pycode/memilio-${{ inputs.package }}/requirements-dev.txt
30+
shopt -s nullglob
31+
for pkg in pycode/wheelhouse/*cp311*.whl; do python -m pip install "$pkg"; done # packages that contain native extensions are version specific
32+
for pkg in pycode/wheelhouse/*py3*.whl; do python -m pip install "$pkg"; done # pure python packages are not version specific
33+
python -m pip install --upgrade-strategy only-if-needed --prefer-binary --find-links pycode/wheelhouse "memilio-${{ inputs.package }}[dev]"
3234
- name: Run pylint
3335
shell: bash
3436
run: |

‎pycode/memilio-epidata/README.rst‎

Lines changed: 10 additions & 7 deletions

‎pycode/memilio-epidata/memilio/epidata_test/__init__.py‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎pycode/memilio-epidata/pyproject.toml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,20 @@ dependencies = [
3030
"PyQt6",
3131
"python-calamine",
3232
"python-magic-bin; sys_platform == 'win32'",
33-
"python-magic; sys_platform != 'win32'"
33+
"python-magic; sys_platform != 'win32'",
34+
# first support of python 3.11 is 4.6
35+
# 5.3.4 has conflicts with openpyxl
36+
# 5.3.3 broken
37+
"pyfakefs>=4.6,<5.3.3"
3438
]
3539

3640
[project.optional-dependencies]
3741
dev = [
38-
"pyfakefs>=4.6,<5.3.3",
3942
"coverage>=7.0.1",
43+
# pylint 2.16 creates problem with wrapt package version
4044
"pylint>=2.13.0,<2.16",
4145
"pylint_json2html==0.4.0"
42-
]
46+
]
4347

4448
[project.scripts]
4549
getcasedata = "memilio.epidata.getCaseData:main"

‎pycode/memilio-epidata/requirements-dev.txt‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

pycode/memilio-epidata/memilio/epidata_test/test_data/TestSetCaseArcgis.json renamed to pycode/memilio-epidata/tests/test_data/TestSetCaseArcgis.json

File renamed without changes.

pycode/memilio-epidata/memilio/epidata_test/test_data/TestSetCaseEstimationsDeaths.json renamed to pycode/memilio-epidata/tests/test_data/TestSetCaseEstimationsDeaths.json

File renamed without changes.

pycode/memilio-epidata/memilio/epidata_test/test_data/TestSetCaseEstimationsDeathsWeekly.json renamed to pycode/memilio-epidata/tests/test_data/TestSetCaseEstimationsDeathsWeekly.json

File renamed without changes.

pycode/memilio-epidata/memilio/epidata_test/test_data/TestSetCaseEstimationsDeathsWeeklyGender.json renamed to pycode/memilio-epidata/tests/test_data/TestSetCaseEstimationsDeathsWeeklyGender.json

File renamed without changes.

0 commit comments

Comments
 (0)