diff --git a/.github/workflows/tiledb-cloud-py.yaml b/.github/workflows/tiledb-cloud-py.yaml index bd18cd9e4..fa6be9b72 100644 --- a/.github/workflows/tiledb-cloud-py.yaml +++ b/.github/workflows/tiledb-cloud-py.yaml @@ -44,12 +44,10 @@ jobs: dependencies: - pinned - fresh - include: - - os: ubuntu-20.04 - path: ~/.cache/pip - - os: macos-12 - path: ~/Library/Caches/pip - + env: + # Temporarily use an older point release of Python 3.7 on Mac OS due to + # https://github.com/actions/setup-python/issues/682 + real-python-version: ${{ (matrix.os == 'macos-12' && matrix.python-version == '3.7') && '3.7.16' || matrix.python-version }} steps: - name: Checkout uses: actions/checkout@v3 @@ -57,34 +55,9 @@ jobs: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python-version }} - - - name: Cache pinned dependencies - if: ${{ matrix.dependencies == 'pinned' }} - uses: actions/cache@v3 - with: - path: ${{ matrix.path }} - key: ${{ runner.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles(format('./requirements-py{0}.txt', matrix.python-version)) }} - restore-keys: | - ${{ runner.os }}-py${{ matrix.python-version }}-pip- - - # This step ensures that every month we have a new Pip cache, so that - # we don't have one cache sitting for months growing ever-staler. - - name: Get month for cache key - id: month - if: ${{ matrix.dependencies == 'fresh' }} - run: | - date +'cache-month=%Y-%m' >> "$GITHUB_ENV" - - - name: Cache fresh install dependencies - if: ${{ matrix.dependencies == 'fresh' }} - uses: actions/cache@v3 - with: - path: ${{ matrix.path }} - key: ${{ runner.os }}-py${{ matrix.python-version }}-pip-fresh-${{ env.cache-month }} - restore-keys: | - ${{ runner.os }}-py${{ matrix.python-version }}-pip-fresh- - ${{ runner.os }}-py${{ matrix.python-version }}-pip- + python-version: ${{ env.real-python-version }} + cache: pip + cache-dependency-path: requirements-${{ matrix.python-version }}.txt - name: Install prerequisites run: | diff --git a/requirements-py3.7.txt b/requirements-py3.7.txt index 75192bde2..11e22a7b4 100644 --- a/requirements-py3.7.txt +++ b/requirements-py3.7.txt @@ -1,16 +1,17 @@ attrs==23.1.0 certifi==2023.5.7 cloudpickle==2.2.1 -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 numpy==1.21.6 packaging==23.1 pandas==1.3.5 -pyarrow==12.0.0 +pyarrow==12.0.1 python-dateutil==2.8.2 pytz==2023.3 six==1.16.0 -tiledb==0.21.3 -typing_extensions==4.5.0 -urllib3==2.0.2 +tblib==1.7.0 +tiledb==0.21.6 +typing_extensions==4.7.0 +urllib3==2.0.3 xarray==0.20.2 zipp==3.15.0 diff --git a/requirements-py3.9.txt b/requirements-py3.9.txt index dfea09cd8..1c2172c7b 100644 --- a/requirements-py3.9.txt +++ b/requirements-py3.9.txt @@ -1,13 +1,15 @@ attrs==23.1.0 certifi==2023.5.7 cloudpickle==2.2.1 -numpy==1.24.3 +numpy==1.25.0 packaging==23.1 pandas==1.5.3 -pyarrow==12.0.0 +pyarrow==12.0.1 python-dateutil==2.8.2 pytz==2023.3 six==1.16.0 -tiledb==0.21.3 -urllib3==2.0.2 -xarray==2023.4.2 +tblib==1.7.0 +tiledb==0.21.6 +typing_extensions==4.7.0 +urllib3==2.0.3 +xarray==2023.6.0