Skip to content

Commit

Permalink
Merge branch 'master' into pyup-update-msgpack-1.0.8-to-1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vEpiphyte authored Nov 22, 2024
2 parents bc961ea + 277e828 commit bd36b07
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 65,557 deletions.
8 changes: 8 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,16 @@ jobs:
DIRNAME: python311
<<: *docker_test_steps

# test_311_next:
# machine:
# image: ubuntu-2204:current
# environment:
# DIRNAME: python311_next
# <<: *docker_test_steps

workflows:
version: 2
run_tests:
jobs:
- test_311
# - test_311_next
33,324 changes: 0 additions & 33,324 deletions get-pip-22.0.4.py

This file was deleted.

32,207 changes: 0 additions & 32,207 deletions get-pip-22.3.1.py

This file was deleted.

6 changes: 3 additions & 3 deletions python311/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ RUN set -ex \
&& apt-get clean \
&& apt-get update \
&& apt-get -y upgrade \
&& apt-get install -y locales curl tini nano "python3.11=3.11.2-6+deb12u2" "python3.11-minimal=3.11.2-6+deb12u2" "libpython3.11-stdlib=3.11.2-6+deb12u2" "libpython3.11-minimal=3.11.2-6+deb12u2" python3.11-distutils \
&& apt-get install -y build-essential "python3.11-dev=3.11.2-6+deb12u2" "libpython3.11-dev=3.11.2-6+deb12u2" "libpython3.11=3.11.2-6+deb12u2" \
&& apt-get install -y locales curl tini nano python3.11 python3.11-distutils \
&& apt-get install -y build-essential python3.11-dev \
# Setup python /pip
&& update-alternatives --install /usr/bin/python python /usr/bin/python3.11 1 \
&& update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 1 \
Expand All @@ -44,7 +44,7 @@ RUN set -ex \
&& chown synuser:synuser /home/synuser \
# Cleanup
&& rm -rf requirements \
&& apt-get remove -y --purge curl build-essential python3.11-dev libpython3.11-dev libpython3.11 \
&& apt-get remove -y --purge curl build-essential python3.11-dev \
&& apt-get remove -y --allow-remove-essential --purge e2fsprogs \
&& apt-get autoremove -y --purge \
&& apt-get clean && apt-get purge \
Expand Down
53 changes: 53 additions & 0 deletions python311_next/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
FROM python:3.11.10-slim-bookworm

MAINTAINER vEpiphyte <[email protected]>

ENV DEBIAN_FRONTEND="noninteractive"
ENV PYTHONUNBUFFERED 1

COPY pandoc.deb.sha256 pandoc.deb.sha256
COPY requirements requirements
COPY python311_next/rmlist.txt rmlist.txt
# apt get clean / update / upgrade / install required packages / clean up
# setup locales
# install python packages
# Since we are using --no-deps if a package has a missing dependency here,
# it will fail during testing.
# cleanup
RUN set -ex \
&& apt-get clean \
&& apt-get update \
&& apt-get -y upgrade \
&& apt-get install -y locales tini nano \
&& apt-get install -y curl build-essential \
# Install pandoc
&& curl -L -o pandoc-amd64.deb https://github.com/jgm/pandoc/releases/download/3.1.9/pandoc-3.1.9-1-amd64.deb \
&& sha256sum --check pandoc.deb.sha256 \
&& dpkg -i pandoc-amd64.deb \
# Configure locales
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
&& locale-gen en_US.UTF-8 \
&& dpkg-reconfigure locales \
&& /usr/sbin/update-locale LANG=en_US.UTF-8 \
# Install our packages
&& mv requirements/requirements_311.txt requirements/requirements_specific.txt \
&& pip install -U pip setuptools \
&& pip install --no-cache-dir --no-deps -r requirements/requirements.txt \
# Setup synuser
&& groupadd -g 999 synuser \
&& useradd -r --home-dir=/home/synuser -u 999 -g synuser --shell /bin/bash synuser \
&& mkdir -p /home/synuser \
&& chown synuser:synuser /home/synuser \
# Cleanup
&& rm -rf requirements \
&& apt-get remove -y --purge curl build-essential \
&& apt-get remove -y --allow-remove-essential --purge e2fsprogs \
&& apt-get autoremove -y --purge \
&& apt-get clean && apt-get purge \
&& rm -rf /var/lib/apt/lists/* \
&& rm pandoc.deb.sha256 \
&& rm pandoc-amd64.deb \
&& while read path; do if [ -e $path ]; then echo "Removing ${path}" && rm -rf $path; else echo "! Path not present: ${path}"; exit 1; fi done < rmlist.txt \
&& rm rmlist.txt

ENV LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8" LC_ALL="en_US.UTF-8"
1 change: 1 addition & 0 deletions python311_next/rmlist.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/usr/local/lib/python3.11/site-packages/tornado/test/test.key
25 changes: 14 additions & 11 deletions requirements/requirements_dep.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# reviewing updates.
###################################
# aiohttp -> aiohappyeyeballs
aiohappyeyeballs==2.4.0
aiohappyeyeballs==2.4.3
###################################
# aiohttp -> aiosignal
aiosignal==1.3.1
Expand Down Expand Up @@ -36,13 +36,13 @@ cffi==1.17.1
###################################
# aiohttp -> charset-normalizer
# requests -> charset-normalizer
charset-normalizer==3.3.2
charset-normalizer==3.4.0
###################################
# stix2-validator -> colorama
colorama==0.4.6
###################################
# stix2-validator -> cpe
cpe==1.3.0
cpe==1.3.1
###################################
# pytest
execnet==2.0.2
Expand All @@ -55,7 +55,7 @@ fqdn==1.5.1
###################################
# aiohttp -> frozenlist
# aiosignal -> frozenlist
frozenlist==1.4.1
frozenlist==1.5.0
###################################
# beautifulsoup4 -> html5lib
html5lib==1.1
Expand All @@ -73,26 +73,29 @@ jsonpointer==3.0.0
jsonschema==4.23.0
###################################
# jsonschema -> jsonschema-specifications
jsonschema-specifications==2023.12.1
jsonschema-specifications==2024.10.1
###################################
# scalecodec -> more-itertools
more-itertools==10.5.0
###################################
# aiohttp -> multidict
# yarl -> multidict
multidict==6.0.5
multidict==6.1.0
###################################
# pytest -> pluggy
pluggy==1.3.0
###################################
# yarl -> propcache
propcache==0.2.0
###################################
# cffi -> pycparser
pycparser==2.22
###################################
# pytest
pytest-forked==1.6.0
###################################
# aiotthp-socks -> python-socks
python-socks==2.5.1
python-socks==2.5.3
###################################
# jsonschema -> referencing
referencing==0.35.1
Expand Down Expand Up @@ -130,10 +133,10 @@ stix2-patterns==2.0.0
toml==0.10.2
###################################
# pytest -> tomli
tomli==2.0.1
tomli==2.0.2
###################################
# arrow -> types-python-dateutil
types-python-dateutil==2.8.19.14
types-python-dateutil==2.9.0.20241003
###################################
# uri-template
# stix2-validator -> jsonschema
Expand All @@ -143,7 +146,7 @@ uri-template==1.3.0
url-normalize==1.4.3
###################################
# requests -> urllib3
urllib3==2.2.2
urllib3==2.2.3
###################################
# prompt-toolkit -> wcwidth
wcwidth==0.2.12
Expand All @@ -159,4 +162,4 @@ wrapt==1.15.0
###################################
# vcrpy -> yarl
# aiohttp -> yarl
yarl==1.9.4
yarl==1.15.3
4 changes: 2 additions & 2 deletions requirements/requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Code style checks
pycodestyle==2.12.0
# Test related packages
coverage==7.6.0
coverage==7.6.3
codecov==2.1.13
pytest==7.4.3
pytest-cov==4.1.0
# Support packages for other users
wheel==0.44.0
wheel==0.45.0
20 changes: 10 additions & 10 deletions requirements/requirements_synapse.txt
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
# Required packages for synapse
tornado==6.4.1
aiohttp==3.10.5
aiohttp-socks==0.9.0
tornado==6.4.2
aiohttp==3.10.11
aiohttp-socks==0.9.1
aiosmtplib==3.0.2
pyOpenSSL==24.1.0
cryptography==43.0.1
pyOpenSSL==24.2.1
cryptography==43.0.3
msgpack==1.1.0
xxhash==3.4.1
xxhash==3.5.0
lmdb==1.4.1
regex==2024.7.24
regex==2024.11.6
PyYAML==6.0.2
prompt-toolkit==3.0.47
Pygments==2.17.2
lark==1.1.9
packaging==24.1
packaging==24.2
fastjsonschema==2.19.1
stix2-validator==3.2.0
vcrpy==5.1.0
base58==2.1.1
python-bitcoinlib==0.12.2
typing-extensions==4.9.0
scalecodec==1.2.9
cbor2==5.6.4
cbor2==5.6.5
bech32==1.2.0
aioimaplib==1.1.0
oauthlib==3.2.2
pycryptodome==3.20.0
idna==3.7
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
pytz==2023.3.post1
beautifulsoup4==4.12.3

0 comments on commit bd36b07

Please sign in to comment.