Skip to content

Commit

Permalink
ci: updating packages to downstream, including Ubuntu20 and py39 (#125)
Browse files Browse the repository at this point in the history
  • Loading branch information
wadimkehl authored Aug 23, 2022
1 parent a2c6c12 commit f424a75
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:

jobs:
build-and-push-image:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
permissions:
contents: read
packages: write
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,33 @@ on:
- 'master'
jobs:
code-coverage:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
env:
ENVIRONMENT: TEST_RUNNER
OS: ubuntu-18.04
PYTHON: '3.7'
OS: ubuntu-20.04
PYTHON: '3.9'
COVERAGE_TOTAL: 49 # Coverage threshold percentage
steps:
- name: Checkout (admin token)
if: ${{github.event_name != 'pull_request'}} # We don't want to use the admin token for PR flows
uses: actions/checkout@master
with:
token: '${{ secrets.GIT_ADMIN_WORKFLOW_TOKEN }}'
fetch-depth: ‘2’ # Original commit + code cov badge commit
fetch-depth: "2" # Original commit + code cov badge commit
- name: Checkout (normal flow)
if: ${{github.event_name == 'pull_request'}}
uses: actions/checkout@master
with:
fetch-depth: ‘2’ # Original commit + code cov badge commit
fetch-depth: "2" # Original commit + code cov badge commit
- name: Setup Python
uses: actions/setup-python@master
with:
python-version: 3.7
python-version: 3.9
- name: Install dependencies
id: coverage-installer
run: |
python -m pip install --upgrade pip
pip install cython==0.29.21 numpy==1.19.4
pip install cython==0.29.21 numpy==1.23.2
sudo apt-get install jq
pip install -r requirements.txt
pip install -r requirements-dev.txt
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/doc-gen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@ on:
- 'master'
jobs:
run:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
env:
OS: ubuntu-18.04
PYTHON: '3.7'
OS: ubuntu-20.04
PYTHON: '3.9'
steps:
- uses: actions/checkout@master
with:
fetch-depth: ‘1’
fetch-depth: "1"
- name: Setup Python
uses: actions/setup-python@master
with:
python-version: 3.7
python-version: 3.9
- name: Setup requirements and run sphinx
run: |
python -m pip install --upgrade pip
pip install cython==0.29.21 numpy==1.19.4
pip install cython==0.29.21 numpy==1.23.2
pip install -r requirements.txt
pip install -r requirements-dev.txt
pip install -r docs/requirements-doc.txt
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pre-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
pre-merge-tests:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
env:
ENVIRONMENT: TEST_RUNNER
steps:
Expand All @@ -21,14 +21,14 @@ jobs:
uses: wagoid/commitlint-github-action@v4
with:
configFile: .commitlintrc.yml
- name: Install Python 3.7
- name: Install Python 3.9
uses: actions/setup-python@v1
with:
python-version: 3.7
python-version: 3.9
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install cython==0.29.21 numpy==1.19.4
pip install cython==0.29.21 numpy==1.23.2
pip install -r requirements.txt
pip install -r requirements-dev.txt
- name: Lint all files with pre-commit
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM nvidia/cuda:11.1.1-devel-ubuntu18.04
FROM nvidia/cuda:11.2.0-devel-ubuntu20.04

ARG python=3.7
ARG python=3.9
ENV PYTORCH_VERSION=1.8.1+cu111
ENV TORCHVISION_VERSION=0.9.1+cu111

Expand Down Expand Up @@ -33,7 +33,6 @@ RUN curl -O https://bootstrap.pypa.io/get-pip.py && \
python3 get-pip.py && \
rm get-pip.py
# The above appears to install pip into /usr/local/, but some tools expect /usr/bin/.
# TODO(tk-woven): `apt install python3-pip` and remove these symlinks when we update the base Ubuntu image.
RUN ln -sf /usr/local/bin/pip /usr/bin/pip
RUN ln -sf /usr/local/bin/pip3 /usr/bin/pip3

Expand All @@ -53,7 +52,7 @@ RUN pip install --no-cache-dir -r /tmp/requirements-dev.txt

# Settings for S3
RUN aws configure set default.s3.max_concurrent_requests 100 && \
aws configure set default.s3.max_queue_size 10000
aws configure set default.s3.max_queue_size 10000

# Copy workspace and setup PYTHONPATH
COPY . ${WORKSPACE}
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ matplotlib>=3.0.3,<4.0
opencv-python>=4.5.3.56
Pillow>=8.3.2
pycocotools>=2.0.0
pyquaternion==0.9.5
pyquaternion>=0.9.5,<=1.0.0
torch>=1.8.1
torchvision>=0.9.1
tqdm>=4.29.1
Expand Down

0 comments on commit f424a75

Please sign in to comment.