Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python 3.9 update #4554

Merged
merged 35 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
9719e3b
Updated packages to python 3.10 compatability
dma1dma1 Oct 6, 2023
1fa8f0e
Minor changes
dma1dma1 Oct 10, 2023
6bb305a
Update python version to 3.9
dma1dma1 Oct 17, 2023
1cc17b2
Add M1 runner
dma1dma1 Oct 18, 2023
4cf07ab
M1 runner
dma1dma1 Oct 25, 2023
6611948
Update test.yml
epicfaace Oct 25, 2023
0b2d31a
Fixed M1 compatability
dma1dma1 Nov 1, 2023
ca41bd5
roll back linters
dma1dma1 Nov 1, 2023
9fd30fc
Merge remote-tracking branch 'origin/master' into Mac_compatability
dma1dma1 Nov 1, 2023
845c64d
Remove apple silicon test
dma1dma1 Nov 1, 2023
f9b3c0d
Modified pre-commit
dma1dma1 Nov 7, 2023
7d637b3
Removed all linters from pre-commit
dma1dma1 Nov 7, 2023
2ada807
Revert dockerfile changes
dma1dma1 Nov 8, 2023
670c816
Revert "Revert dockerfile changes"
dma1dma1 Nov 8, 2023
07ceb48
update tostring to tobytes
dma1dma1 Nov 15, 2023
a712b96
update index_gzip test
dma1dma1 Nov 15, 2023
dc68535
Revert "update index_gzip test"
dma1dma1 Nov 15, 2023
1534683
Reverted apache beam update
dma1dma1 Nov 29, 2023
51c326a
Revert azure core
dma1dma1 Nov 29, 2023
f5d9dcb
Test fix
dma1dma1 Nov 29, 2023
16aa4cf
Update pre-commit.sh
epicfaace Nov 30, 2023
90f213f
Revert "Update pre-commit.sh"
dma1dma1 Dec 6, 2023
caeb128
Merge branch 'master' into Mac_compatability
dma1dma1 Dec 6, 2023
39e3f9a
Merge branch 'master' into Mac_compatability
dma1dma1 Apr 30, 2024
9bcd18c
Added pip upgrade
dma1dma1 Apr 30, 2024
a40a551
Upgraded requirements
dma1dma1 Apr 30, 2024
1bf8ebb
3.9.18
dma1dma1 May 2, 2024
85dc93a
Changing pip
dma1dma1 May 6, 2024
1fbc250
Remove cache on workflow
dma1dma1 May 6, 2024
0f0b55c
Upgrade pip
dma1dma1 May 6, 2024
9e1db5c
Changed beam version
dma1dma1 May 6, 2024
b6cc245
Revert beam change
dma1dma1 May 6, 2024
5c7ffaa
Wheel change test
dma1dma1 May 6, 2024
509260f
Reorder requirements
dma1dma1 May 6, 2024
24b07ae
Change macos runner
dma1dma1 May 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_worker_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- uses: actions/cache@v3
with:
path: ~/.cache/pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/postcommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- uses: actions/cache@v3
with:
path: ~/.cache/pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- uses: actions/cache@v3
with:
path: ~/.cache/pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- run: pip install -e .
- name: Run tests
run: python tests/stress/stress_test.py --instance https://worksheets-dev.codalab.org --heavy
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 14.x
- name: Set up Python 3.7
- name: Set up Python 3.9
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- run: npm ci
working-directory: ./frontend
- run: npm run check-ci
Expand All @@ -36,7 +36,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: [3.9]
os: [ubuntu-20.04, macos-latest]
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- uses: actions/cache@v3
with:
path: ~/.cache/pip
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- uses: actions/cache@v3
with:
path: ~/.cache/pip
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- uses: actions/cache@v3
with:
path: ~/.cache/pip
Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- uses: actions/cache@v3
with:
path: ~/.cache/pip
Expand Down Expand Up @@ -303,7 +303,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- uses: actions/cache@v3
with:
path: ~/.cache/pip
Expand Down Expand Up @@ -352,7 +352,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- uses: actions/cache@v3
with:
path: ~/.cache/pip
Expand Down Expand Up @@ -401,7 +401,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- uses: actions/cache@v3
with:
path: ~/.cache/pip
Expand Down Expand Up @@ -455,7 +455,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- uses: actions/cache@v3
with:
path: ~/.cache/pip
Expand Down Expand Up @@ -521,7 +521,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- uses: actions/cache@v3
with:
path: ~/.cache/pip
Expand Down Expand Up @@ -571,7 +571,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- uses: actions/cache@v3
with:
path: ~/.cache/pip
Expand Down
34 changes: 17 additions & 17 deletions docker_config/dockerfiles/Dockerfile.server
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,27 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends software-properties-common && \
apt-get update && \
apt-get install -y --no-install-recommends \
build-essential \
curl \
git \
libfuse-dev \
libjpeg-dev \
libmysqlclient-dev \
libssl-dev \
mysql-client \
zip \
unzip \
rsync && \
rm -rf /var/lib/apt/lists/*;
build-essential \
curl \
git \
libfuse-dev \
libjpeg-dev \
libmysqlclient-dev \
libssl-dev \
mysql-client \
zip \
unzip \
rsync && \
rm -rf /var/lib/apt/lists/*;

### Without this Python thinks we're ASCII and unicode chars fail
ENV LANG C.UTF-8

# Miniconda 4.5.11 installs Python 3.7 by default.
RUN curl -o ~/miniconda.sh -O https://repo.anaconda.com/miniconda/Miniconda3-4.5.11-Linux-x86_64.sh && \
chmod +x ~/miniconda.sh && \
~/miniconda.sh -b -p /opt/conda && \
rm ~/miniconda.sh
# Python 3.9 Version of miniconda 23.5.2
epicfaace marked this conversation as resolved.
Show resolved Hide resolved
RUN curl -o ~/miniconda.sh -O https://repo.anaconda.com/miniconda/Miniconda3-py39_23.5.2-0-Linux-x86_64.sh && \
chmod +x ~/miniconda.sh && \
~/miniconda.sh -b -p /opt/conda && \
rm ~/miniconda.sh
ENV PATH /opt/conda/bin:$PATH
RUN conda --version

Expand Down
40 changes: 20 additions & 20 deletions docker_config/dockerfiles/Dockerfile.worker
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends software-properties-common curl && \
apt-get update && \
apt-get install -y --no-install-recommends \
amazon-ecr-credential-helper \
build-essential \
libssl-dev \
uuid-dev \
libgpgme11-dev \
squashfs-tools \
libseccomp-dev \
pkg-config \
zip \
git \
wget \
unzip && \
rm -rf /var/lib/apt/lists/*;
amazon-ecr-credential-helper \
build-essential \
libssl-dev \
uuid-dev \
libgpgme11-dev \
squashfs-tools \
libseccomp-dev \
pkg-config \
zip \
git \
wget \
unzip && \
rm -rf /var/lib/apt/lists/*;

# Miniconda 4.5.11 installs Python 3.7 by default.
RUN curl -o ~/miniconda.sh -O https://repo.anaconda.com/miniconda/Miniconda3-4.5.11-Linux-x86_64.sh && \
chmod +x ~/miniconda.sh && \
~/miniconda.sh -b -p /opt/conda && \
rm ~/miniconda.sh
# Python 3.9 Version of miniconda 23.5.2
RUN curl -o ~/miniconda.sh -O https://repo.anaconda.com/miniconda/Miniconda3-py39_23.5.2-0-Linux-x86_64.sh && \
chmod +x ~/miniconda.sh && \
~/miniconda.sh -b -p /opt/conda && \
rm ~/miniconda.sh
ENV PATH /opt/conda/bin:$PATH
RUN conda --version

Expand All @@ -38,8 +38,8 @@ RUN mkdir ${WORKDIR}/scripts
# Install dependencies
COPY requirements.txt requirements.txt
RUN python3 -m pip install --user --upgrade pip==20.3.4; \
python3 -m pip install setuptools --upgrade; \
python3 -m pip install --no-cache-dir -r requirements.txt;
python3 -m pip install setuptools --upgrade; \
python3 -m pip install --no-cache-dir -r requirements.txt;

# Install code
COPY setup.py setup.py
Expand Down
9 changes: 4 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
apache-beam[azure]==2.38.0
apache-beam[azure]==2.48.0

# GCP requirements for apache-beam. Note: when upgrading
# apache-beam, make sure these requirements are also upgraded
# accordingly according to Beam's GCP requirements
# (https://github.com/apache/beam/blob/master/sdks/python/setup.py).
cachetools>=3.1.0,<5
cachetools>=3.1.0,<6
google-apitools>=0.5.31,<0.5.32
google-auth>=1.18.0,<3

# Remaining requirements
bottle==0.12.20
dataclasses==0.7;python_version<'3.7'
docker==4.3.0
marshmallow-jsonapi==0.15.1
marshmallow==2.15.1
setuptools>=40.0.0
argcomplete==1.12.3
indexed_gzip==1.7.0
ratarmountcore==0.1.3
PyYAML==5.4
PyYAML==6.0.1
psutil==5.7.2
six==1.15.0
SQLAlchemy==1.3.19
Expand All @@ -31,7 +30,7 @@ diffimg==0.2.3
selenium==3.141.0
requests==2.25.0
azure-storage-blob==12.4.0
azure-core==1.8.0
azure-core==1.29.5
sentry-sdk==1.14.0
requests-oauthlib==1.1.0
oauthlib==2.1.0
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ def get_requirements(*requirements_file_paths):
packages=find_packages(exclude=["tests*"]),
classifiers=[
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.9",
"License :: OSI Approved :: Apache Software License",
],
py_modules=['codalab_service'],
python_requires='~=3.6',
python_requires='~=3.9',
cmdclass={'install': Install},
include_package_data=True,
install_requires=get_requirements('requirements.txt'),
Expand Down
Loading