Skip to content

Commit

Permalink
bump pipenv and setuptools versions (#649)
Browse files Browse the repository at this point in the history
  • Loading branch information
tannermpeterson authored Jul 22, 2024
1 parent 74ab30e commit 3c4981d
Show file tree
Hide file tree
Showing 4 changed files with 485 additions and 433 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/build-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ jobs:
echo ${{steps.product-name.outputs.prop}}
- name: Install pipenv # no known reason for this specific version of pipenv, just pinning it for good practice
run: pip install pipenv==2020.11.15
run: pip install pipenv==2024.0.1

- name: Setup Pipenv
env:
Expand All @@ -197,11 +197,9 @@ jobs:
- name: Install Python Dependencies
env:
PIPENV_CACHE_DIR: ./.pipenv_cache
# Eli (10/28/20): The --sequential flag was found to be necessary on windows due to issues where scipy wouldn't recognize that it had been installed. Also, when this was part of a set of multiple run commands using the pipe, when it errored it didn't cause the whole step to fail, so separating it out into its own step
run: |
cd controller/
pipenv install -v --dev --deploy --sequential
pipenv run pip install setuptools==69.5.1
pipenv install -v --dev --deploy
- name: Download zlib Library
env:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/dev-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ jobs:
echo ${{steps.product-name.outputs.prop}}
- name: Install pipenv # no known reason for this specific version of pipenv, just pinning it for good practice
run: pip install pipenv==2020.11.15
run: pip install pipenv==2024.0.1

- name: Setup Pipenv
env:
Expand All @@ -151,11 +151,9 @@ jobs:
- name: Install Python Dependencies
env:
PIPENV_CACHE_DIR: ./.pipenv_cache
# Eli (10/28/20): The --sequential flag was found to be necessary on windows due to issues where scipy wouldn't recognize that it had been installed. Also, when this was part of a set of multiple run commands using the pipe, when it errored it didn't cause the whole step to fail, so separating it out into its own step
run: |
cd controller/
pipenv install -v --dev --deploy --sequential
pipenv run pip install setuptools==69.5.1
pipenv install -v --dev --deploy
- name: Download zlib Library
env:
Expand Down
5 changes: 3 additions & 2 deletions controller/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@ url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]
boto3 = "==1.17.32"
boto3 = "==1.34.145"
click = "==8.0.3" # Tanner (4/11/22): pinned for black
cython = "==0.29.33"
freezegun = "==1.0.0"
pefile = "==2022.5.30" # Eli (3/1/21): this must be explicitly specified when using a Linux dev environment so that it will be included in a Windows build environment
pre-commit = "==2.11.1"
pyinstaller = "==5.7.0"
pyinstaller = "==6.9.0"
pytest = "==7.2.1"
pytest-cov = "==4.0.0"
pytest-mock = "==3.10.0"
pytest-profiling = "==1.7.0"
pytest-randomly = "==3.12.0"
pytest-timeout = "==1.4.2"
pywin32-ctypes = "==0.2.0" # Eli (3/1/21): this must be explicitly specified when using a Linux dev environment so that it will be included in a Windows build environment
setuptools = ">=70.0.0"
types-requests = "2.31.0.1"
websocket-client = "==1.1.0" # this is used by socketio in tests

Expand Down
Loading

0 comments on commit 3c4981d

Please sign in to comment.