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.

Sign up for GitHub

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

DRAFT: Experimental build on Apple M1-based Macs #4330

Closed
wants to merge 2 commits into from
Closed

DRAFT: Experimental build on Apple M1-based Macs #4330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c825827
Experimental build on Apple M1-based Macs
cclauss Dec 25, 2020
f928618
fixup! dict changed size during iteration
cclauss Dec 25, 2020
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 .python-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
3.8.6
3.9.1
2.7.6
2.7.18
6 changes: 3 additions & 3 deletions docker/Dockerfile.olbase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ RUN curl https://pyenv.run | bash && \
ENV PYENV_ROOT /home/openlibrary/.pyenv
ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH

RUN pyenv update && pyenv install 2.7.6
RUN pyenv update && pyenv install 2.7.18
RUN pyenv update && pyenv install 3.8.6
RUN pyenv update && pyenv install 3.9.1
RUN pyenv global 3.8.6 3.9.1 2.7.6
RUN pyenv global 3.8.6 3.9.1 2.7.18
RUN pyenv rehash

# Update Python 2's pip to match production (Jan 2020)
Expand All @@ -74,7 +74,7 @@ WORKDIR /openlibrary

USER openlibrary
COPY requirements*.txt ./
RUN python2 -m pip install --disable-pip-version-check --default-timeout=100 -r requirements_common.txt
# RUN python2 -m pip install --disable-pip-version-check --default-timeout=100 -r requirements_common.txt
RUN python3.8 -m pip install --default-timeout=100 -r requirements_common.txt
RUN python3.9 -m pip install --default-timeout=100 -r requirements_common.txt

Expand Down
2 changes: 1 addition & 1 deletion openlibrary/core/cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def join_threads(self):

Used only in testing.
"""
for name, thread in self.active_threads.items():
for name, thread in list(self.active_threads.items()):
thread.join()

def encode_args(self, args, kw=None):
Expand Down