From 5efa7eda940a94a19c053b0d6216213e57cb8cca Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 13 Jul 2023 11:42:35 +0200 Subject: [PATCH 1/9] change pipefile versions --- __tests__/cache-restore.test.ts | 2 +- __tests__/data/Pipfile | 4 +- __tests__/data/Pipfile.lock | 80 ++++++++++++++------------ __tests__/data/pipenv-requirements.txt | 2 +- 4 files changed, 46 insertions(+), 42 deletions(-) diff --git a/__tests__/cache-restore.test.ts b/__tests__/cache-restore.test.ts index b4b48ad21..a1a8d8d23 100644 --- a/__tests__/cache-restore.test.ts +++ b/__tests__/cache-restore.test.ts @@ -8,7 +8,7 @@ import {State} from '../src/cache-distributions/cache-distributor'; describe('restore-cache', () => { const pipFileLockHash = - 'a3bdcc71289e4979ca9e051810d81999cc99823109faf6912e17ff14c8e621a6'; + 'f8428d7cf00ea53a5c3702f0a9cb3cc467f76cd86a34723009350c4e4b32751a'; const requirementsHash = 'd8110e0006d7fb5ee76365d565eef9d37df1d11598b912d3eb66d398d57a1121'; const requirementsLinuxHash = diff --git a/__tests__/data/Pipfile b/__tests__/data/Pipfile index 8db54551e..57597d329 100644 --- a/__tests__/data/Pipfile +++ b/__tests__/data/Pipfile @@ -4,8 +4,8 @@ verify_ssl = true name = "pypi" [packages] -flake8 = "==4.0.1" -numpy = "==1.23.0" +flake8 = "==6.0.0" +numpy = "==1.25.1" [dev-packages] diff --git a/__tests__/data/Pipfile.lock b/__tests__/data/Pipfile.lock index 9fcecefbd..70f294580 100644 --- a/__tests__/data/Pipfile.lock +++ b/__tests__/data/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "e9c37110984955621040e2dc8548c026eb8466c23db1b8e69430289b10be8938" + "sha256": "dcea65dabfe8442466b5e9280ecab72cfa7bf555791ee0ad55b6e7255dca1f43" }, "pipfile-spec": 6, "requires": { @@ -18,62 +18,66 @@ "default": { "flake8": { "hashes": [ - "sha256:479b1304f72536a55948cb40a32dce8bb0ffe3501e26eaf292c7e60eb5e0428d", - "sha256:806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d" + "sha256:3833794e27ff64ea4e9cf5d410082a8b97ff1a06c16aa3d2027339cd0f1195c7", + "sha256:c61007e76655af75e6785a931f452915b371dc48f56efd765247c8fe68f2b181" ], "index": "pypi", - "version": "==4.0.1" + "version": "==6.0.0" }, "mccabe": { "hashes": [ - "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", - "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f" + "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", + "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e" ], - "version": "==0.6.1" + "markers": "python_version >= '3.6'", + "version": "==0.7.0" }, "numpy": { "hashes": [ - "sha256:092f5e6025813e64ad6d1b52b519165d08c730d099c114a9247c9bb635a2a450", - "sha256:196cd074c3f97c4121601790955f915187736f9cf458d3ee1f1b46aff2b1ade0", - "sha256:1c29b44905af288b3919803aceb6ec7fec77406d8b08aaa2e8b9e63d0fe2f160", - "sha256:2b2da66582f3a69c8ce25ed7921dcd8010d05e59ac8d89d126a299be60421171", - "sha256:5043bcd71fcc458dfb8a0fc5509bbc979da0131b9d08e3d5f50fb0bbb36f169a", - "sha256:58bfd40eb478f54ff7a5710dd61c8097e169bc36cc68333d00a9bcd8def53b38", - "sha256:79a506cacf2be3a74ead5467aee97b81fca00c9c4c8b3ba16dbab488cd99ba10", - "sha256:94b170b4fa0168cd6be4becf37cb5b127bd12a795123984385b8cd4aca9857e5", - "sha256:97a76604d9b0e79f59baeca16593c711fddb44936e40310f78bfef79ee9a835f", - "sha256:98e8e0d8d69ff4d3fa63e6c61e8cfe2d03c29b16b58dbef1f9baa175bbed7860", - "sha256:ac86f407873b952679f5f9e6c0612687e51547af0e14ddea1eedfcb22466babd", - "sha256:ae8adff4172692ce56233db04b7ce5792186f179c415c37d539c25de7298d25d", - "sha256:bd3fa4fe2e38533d5336e1272fc4e765cabbbde144309ccee8675509d5cd7b05", - "sha256:d0d2094e8f4d760500394d77b383a1b06d3663e8892cdf5df3c592f55f3bff66", - "sha256:d54b3b828d618a19779a84c3ad952e96e2c2311b16384e973e671aa5be1f6187", - "sha256:d6ca8dabe696c2785d0c8c9b0d8a9b6e5fdbe4f922bde70d57fa1a2848134f95", - "sha256:d8cc87bed09de55477dba9da370c1679bd534df9baa171dd01accbb09687dac3", - "sha256:f0f18804df7370571fb65db9b98bf1378172bd4e962482b857e612d1fec0f53e", - "sha256:f1d88ef79e0a7fa631bb2c3dda1ea46b32b1fe614e10fedd611d3d5398447f2f", - "sha256:f9c3fc2adf67762c9fe1849c859942d23f8d3e0bee7b5ed3d4a9c3eeb50a2f07", - "sha256:fc431493df245f3c627c0c05c2bd134535e7929dbe2e602b80e42bf52ff760bc", - "sha256:fe8b9683eb26d2c4d5db32cd29b38fdcf8381324ab48313b5b69088e0e355379" + "sha256:012097b5b0d00a11070e8f2e261128c44157a8689f7dedcf35576e525893f4fe", + "sha256:0d3fe3dd0506a28493d82dc3cf254be8cd0d26f4008a417385cbf1ae95b54004", + "sha256:0def91f8af6ec4bb94c370e38c575855bf1d0be8a8fbfba42ef9c073faf2cf19", + "sha256:1a180429394f81c7933634ae49b37b472d343cccb5bb0c4a575ac8bbc433722f", + "sha256:1d5d3c68e443c90b38fdf8ef40e60e2538a27548b39b12b73132456847f4b631", + "sha256:20e1266411120a4f16fad8efa8e0454d21d00b8c7cee5b5ccad7565d95eb42dd", + "sha256:247d3ffdd7775bdf191f848be8d49100495114c82c2bd134e8d5d075fb386a1c", + "sha256:35a9527c977b924042170a0887de727cd84ff179e478481404c5dc66b4170009", + "sha256:38eb6548bb91c421261b4805dc44def9ca1a6eef6444ce35ad1669c0f1a3fc5d", + "sha256:3d7abcdd85aea3e6cdddb59af2350c7ab1ed764397f8eec97a038ad244d2d105", + "sha256:41a56b70e8139884eccb2f733c2f7378af06c82304959e174f8e7370af112e09", + "sha256:4a90725800caeaa160732d6b31f3f843ebd45d6b5f3eec9e8cc287e30f2805bf", + "sha256:6b82655dd8efeea69dbf85d00fca40013d7f503212bc5259056244961268b66e", + "sha256:6c6c9261d21e617c6dc5eacba35cb68ec36bb72adcff0dee63f8fbc899362588", + "sha256:77d339465dff3eb33c701430bcb9c325b60354698340229e1dff97745e6b3efa", + "sha256:791f409064d0a69dd20579345d852c59822c6aa087f23b07b1b4e28ff5880fcb", + "sha256:9a3a9f3a61480cc086117b426a8bd86869c213fc4072e606f01c4e4b66eb92bf", + "sha256:c1516db588987450b85595586605742879e50dcce923e8973f79529651545b57", + "sha256:c40571fe966393b212689aa17e32ed905924120737194b5d5c1b20b9ed0fb171", + "sha256:d412c1697c3853c6fc3cb9751b4915859c7afe6a277c2bf00acf287d56c4e625", + "sha256:d5154b1a25ec796b1aee12ac1b22f414f94752c5f94832f14d8d6c9ac40bcca6", + "sha256:d736b75c3f2cb96843a5c7f8d8ccc414768d34b0a75f466c05f3a739b406f10b", + "sha256:e8f6049c4878cb16960fbbfb22105e49d13d752d4d8371b55110941fb3b17800", + "sha256:f76aebc3358ade9eacf9bc2bb8ae589863a4f911611694103af05346637df1b7", + "sha256:fd67b306320dcadea700a8f79b9e671e607f8696e98ec255915c0c6d6b818503" ], "index": "pypi", - "version": "==1.23.0" + "version": "==1.25.1" }, "pycodestyle": { "hashes": [ - "sha256:720f8b39dde8b293825e7ff02c475f3077124006db4f440dcbc9a20b76548a20", - "sha256:eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f" + "sha256:347187bdb476329d98f695c213d7295a846d1152ff4fe9bacb8a9590b8ee7053", + "sha256:8a4eaf0d0495c7395bdab3589ac2db602797d76207242c17d470186815706610" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==2.8.0" + "markers": "python_version >= '3.6'", + "version": "==2.10.0" }, "pyflakes": { "hashes": [ - "sha256:05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c", - "sha256:3bb3a3f256f4b7968c9c788781e4ff07dce46bdf12339dcda61053375426ee2e" + "sha256:ec55bf7fe21fff7f1ad2f7da62363d749e2a470500eab1b555334b67aa1ef8cf", + "sha256:ec8b276a6b60bd80defed25add7e439881c19e64850afd9b346283d4165fd0fd" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==2.4.0" + "markers": "python_version >= '3.6'", + "version": "==3.0.1" } }, "develop": {} diff --git a/__tests__/data/pipenv-requirements.txt b/__tests__/data/pipenv-requirements.txt index ddf9425cf..24569a659 100644 --- a/__tests__/data/pipenv-requirements.txt +++ b/__tests__/data/pipenv-requirements.txt @@ -1,2 +1,2 @@ numpy==1.22.3 -pandas==1.4.2 \ No newline at end of file +flake8==6.0.0 \ No newline at end of file From 7e071b917f7f7426e4600444201267034297e4b2 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 13 Jul 2023 11:58:02 +0200 Subject: [PATCH 2/9] change order --- .github/workflows/e2e-cache.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 115fe8012..8a341e5b6 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -55,9 +55,9 @@ jobs: mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . if ("${{ matrix.python-version }}" -Match "pypy") { - pipenv install --keep-outdated --python pypy + pipenv install --python pypy --keep-outdated } else { - pipenv install --keep-outdated --python ${{ matrix.python-version }} + pipenv install --python ${{ matrix.python-version }} --keep-outdated } python-poetry-dependencies-caching: From 65104d4d256c67e2720dece2ee958f20b2f63986 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 13 Jul 2023 12:11:26 +0200 Subject: [PATCH 3/9] test with downgraded pip version --- .github/workflows/e2e-cache.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 8a341e5b6..f02673465 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -47,6 +47,7 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'pipenv' + - run: python -m pip install pip==22.3.1 - name: Install pipenv run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python - name: Install dependencies @@ -117,6 +118,7 @@ jobs: python-version: ${{ matrix.python-version }} cache: 'pipenv' cache-dependency-path: '**/pipenv-requirements.txt' + - run: python -m pip install pip==22.3.1 - name: Install pipenv run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python - name: Install dependencies From 58b3ecabf8b6c06e904f5a6d97016a174a66aa27 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 13 Jul 2023 12:17:46 +0200 Subject: [PATCH 4/9] change python version --- .github/workflows/e2e-cache.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index f02673465..44244198e 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -39,7 +39,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.9', 'pypy-3.9-v7.x'] + python-version: ['3.10', 'pypy-3.9-v7.x'] steps: - uses: actions/checkout@v3 - name: Setup Python @@ -47,7 +47,7 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'pipenv' - - run: python -m pip install pip==22.3.1 + # - run: python -m pip install pip==22.3.1 - name: Install pipenv run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python - name: Install dependencies @@ -118,7 +118,7 @@ jobs: python-version: ${{ matrix.python-version }} cache: 'pipenv' cache-dependency-path: '**/pipenv-requirements.txt' - - run: python -m pip install pip==22.3.1 + # - run: python -m pip install pip==22.3.1 - name: Install pipenv run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python - name: Install dependencies From 355ab83d006dc68253850990a5abef695633b046 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 13 Jul 2023 12:25:38 +0200 Subject: [PATCH 5/9] comment --keep-outdated --- .github/workflows/e2e-cache.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 44244198e..e4a87f251 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -39,7 +39,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.10', 'pypy-3.9-v7.x'] + python-version: ['3.9', 'pypy-3.9-v7.x'] steps: - uses: actions/checkout@v3 - name: Setup Python @@ -47,7 +47,6 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'pipenv' - # - run: python -m pip install pip==22.3.1 - name: Install pipenv run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python - name: Install dependencies @@ -56,9 +55,9 @@ jobs: mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . if ("${{ matrix.python-version }}" -Match "pypy") { - pipenv install --python pypy --keep-outdated + pipenv install --python pypy # --keep-outdated } else { - pipenv install --python ${{ matrix.python-version }} --keep-outdated + pipenv install --python ${{ matrix.python-version }} # --keep-outdated } python-poetry-dependencies-caching: @@ -118,7 +117,6 @@ jobs: python-version: ${{ matrix.python-version }} cache: 'pipenv' cache-dependency-path: '**/pipenv-requirements.txt' - # - run: python -m pip install pip==22.3.1 - name: Install pipenv run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python - name: Install dependencies @@ -127,7 +125,7 @@ jobs: mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . if ("${{ matrix.python-version }}" -Match "pypy") { - pipenv install --keep-outdated --python pypy + pipenv install --python pypy # --keep-outdated } else { - pipenv install --keep-outdated --python ${{ matrix.python-version }} + pipenv install --python ${{ matrix.python-version }} # --keep-outdated } From 3b3618ad68756920684598883d810a9851c63258 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 13 Jul 2023 12:38:02 +0200 Subject: [PATCH 6/9] change e2e pipenv tests --- .github/workflows/e2e-cache.yml | 18 ++++++++++++++++-- __tests__/test-pipenv.py | 7 +++++++ 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 __tests__/test-pipenv.py diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index e4a87f251..2c22cb9db 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -43,22 +43,29 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup Python + id: cache-pipenv uses: ./ with: python-version: ${{ matrix.python-version }} cache: 'pipenv' - name: Install pipenv run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python - - name: Install dependencies + - name: Prepare environment shell: pwsh run: | mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . + mv ./__tests__/test-pipenv . + - name: Install dependencies + shell: pwsh + if: steps.cache-pipenv.outputs.cache-hit != 'true' + run: | if ("${{ matrix.python-version }}" -Match "pypy") { pipenv install --python pypy # --keep-outdated } else { pipenv install --python ${{ matrix.python-version }} # --keep-outdated } + - run: python test-pipenv.py python-poetry-dependencies-caching: name: Test poetry (Python ${{ matrix.python-version}}, ${{ matrix.os }}) @@ -112,6 +119,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup Python + id: cache-pipenv uses: ./ with: python-version: ${{ matrix.python-version }} @@ -119,13 +127,19 @@ jobs: cache-dependency-path: '**/pipenv-requirements.txt' - name: Install pipenv run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python - - name: Install dependencies + - name: Prepare environment shell: pwsh run: | mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . + mv ./__tests__/test-pipenv . + - name: Install dependencies + shell: pwsh + if: steps.cache-pipenv.outputs.cache-hit != 'true' + run: | if ("${{ matrix.python-version }}" -Match "pypy") { pipenv install --python pypy # --keep-outdated } else { pipenv install --python ${{ matrix.python-version }} # --keep-outdated } + - run: python test-pipenv.py diff --git a/__tests__/test-pipenv.py b/__tests__/test-pipenv.py new file mode 100644 index 000000000..e58207869 --- /dev/null +++ b/__tests__/test-pipenv.py @@ -0,0 +1,7 @@ +import numpy as np + +a = np.array([2, 3, 4]) +print(type(a)) + +b = np.array([1.2, 3.5, 5.1]) +print(type(b)) \ No newline at end of file From 90236fe6a38f2bcd459a31900851ef83f3a8af32 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 13 Jul 2023 12:43:09 +0200 Subject: [PATCH 7/9] fix file name --- .github/workflows/e2e-cache.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 2c22cb9db..4de4abf88 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -55,7 +55,7 @@ jobs: run: | mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . - mv ./__tests__/test-pipenv . + mv ./__tests__/test-pipenv.py . - name: Install dependencies shell: pwsh if: steps.cache-pipenv.outputs.cache-hit != 'true' @@ -132,7 +132,7 @@ jobs: run: | mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . - mv ./__tests__/test-pipenv . + mv ./__tests__/test-pipenv.py . - name: Install dependencies shell: pwsh if: steps.cache-pipenv.outputs.cache-hit != 'true' From be445e540afa6f8c4293b6810cd957de7cd10a32 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 13 Jul 2023 12:53:02 +0200 Subject: [PATCH 8/9] minor changes --- .github/workflows/e2e-cache.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 4de4abf88..a81e721ba 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -65,7 +65,7 @@ jobs: } else { pipenv install --python ${{ matrix.python-version }} # --keep-outdated } - - run: python test-pipenv.py + - run: pipenv run python test-pipenv.py python-poetry-dependencies-caching: name: Test poetry (Python ${{ matrix.python-version}}, ${{ matrix.os }}) @@ -142,4 +142,4 @@ jobs: } else { pipenv install --python ${{ matrix.python-version }} # --keep-outdated } - - run: python test-pipenv.py + - run: pipenv run python test-pipenv.py From 67c5fe21a7a5dc57c910d5cea5a834951bfb96ff Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 13 Jul 2023 13:38:34 +0200 Subject: [PATCH 9/9] add name for run script --- .github/workflows/e2e-cache.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index a81e721ba..876b60926 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -65,7 +65,8 @@ jobs: } else { pipenv install --python ${{ matrix.python-version }} # --keep-outdated } - - run: pipenv run python test-pipenv.py + - name: Run Python Script + run: pipenv run python test-pipenv.py python-poetry-dependencies-caching: name: Test poetry (Python ${{ matrix.python-version}}, ${{ matrix.os }}) @@ -142,4 +143,5 @@ jobs: } else { pipenv install --python ${{ matrix.python-version }} # --keep-outdated } - - run: pipenv run python test-pipenv.py + - name: Run Python Script + run: pipenv run python test-pipenv.py pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy