Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Bitmessage/PyBitmessage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.6.0
Choose a base ref
...
head repository: Bitmessage/PyBitmessage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 541 changed files with 54,110 additions and 22,466 deletions.
102 changes: 102 additions & 0 deletions .buildbot/android/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
# A container for buildbot

FROM ubuntu:focal AS android

ENV DEBIAN_FRONTEND=noninteractive
ENV ANDROID_HOME="/opt/android"

RUN apt-get update -qq > /dev/null \
&& apt-get -y install -qq --no-install-recommends locales \
&& locale-gen en_US.UTF-8
ENV LANG="en_US.UTF-8" \
LANGUAGE="en_US.UTF-8" \
LC_ALL="en_US.UTF-8"

# install system/build dependencies
RUN apt-get -y update -qq \
&& apt-get -y install -qq --no-install-recommends \
curl autoconf automake build-essential cmake git nano libtool \
libltdl-dev libffi-dev libssl-dev \
patch pkg-config python-is-python3 python3-dev python3-pip unzip zip

RUN apt-get -y install -qq --no-install-recommends openjdk-17-jdk \
&& apt-get -y autoremove

RUN pip install pip install buildozer cython virtualenv


ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk"
ENV ANDROID_NDK_VERSION="25b"
ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}"

# get the latest version from https://developer.android.com/ndk/downloads/index.html
ENV ANDROID_NDK_ARCHIVE="android-ndk-r${ANDROID_NDK_VERSION}-linux.zip"
ENV ANDROID_NDK_DL_URL="https://dl.google.com/android/repository/${ANDROID_NDK_ARCHIVE}"
# download and install Android NDK
RUN curl "${ANDROID_NDK_DL_URL}" --output "${ANDROID_NDK_ARCHIVE}" \
&& mkdir -p "${ANDROID_NDK_HOME_V}" \
&& unzip -q "${ANDROID_NDK_ARCHIVE}" -d "${ANDROID_HOME}" \
&& ln -sfn "${ANDROID_NDK_HOME_V}" "${ANDROID_NDK_HOME}" \
&& rm -rf "${ANDROID_NDK_ARCHIVE}"

ENV ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"

# get the latest version from https://developer.android.com/studio/index.html
ENV ANDROID_SDK_TOOLS_VERSION="11076708"
ENV ANDROID_SDK_BUILD_TOOLS_VERSION="34.0.0"
ENV ANDROID_SDK_CMDLINE_TOOLS_VERSION="12.0"
ENV ANDROID_SDK_TOOLS_ARCHIVE="commandlinetools-linux-${ANDROID_SDK_TOOLS_VERSION}_latest.zip"
ENV ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
ENV ANDROID_CMDLINE_TOOLS_DIR="${ANDROID_SDK_HOME}/cmdline-tools/${ANDROID_SDK_CMDLINE_TOOLS_VERSION}"
ENV ANDROID_SDK_MANAGER="${ANDROID_CMDLINE_TOOLS_DIR}/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME}"

# download and install Android SDK
RUN curl "${ANDROID_SDK_TOOLS_DL_URL}" --output "${ANDROID_SDK_TOOLS_ARCHIVE}" \
&& mkdir -p "${ANDROID_SDK_HOME}/cmdline-tools" \
&& unzip -q "${ANDROID_SDK_TOOLS_ARCHIVE}" \
-d "${ANDROID_SDK_HOME}/cmdline-tools" \
&& mv "${ANDROID_SDK_HOME}/cmdline-tools/cmdline-tools" \
${ANDROID_CMDLINE_TOOLS_DIR} \
&& ln -sfn ${ANDROID_CMDLINE_TOOLS_DIR} "${ANDROID_SDK_HOME}/tools" \
&& rm -rf "${ANDROID_SDK_TOOLS_ARCHIVE}"

# update Android SDK, install Android API, Build Tools...
RUN mkdir -p "${ANDROID_SDK_HOME}/.android/" \
&& echo '### User Sources for Android SDK Manager' \
> "${ANDROID_SDK_HOME}/.android/repositories.cfg"

# accept Android licenses (JDK necessary!)
RUN yes | ${ANDROID_SDK_MANAGER} --licenses > /dev/null

# download platforms, API, build tools
RUN ${ANDROID_SDK_MANAGER} "platforms;android-30" > /dev/null \
&& ${ANDROID_SDK_MANAGER} "platforms;android-28" > /dev/null \
&& ${ANDROID_SDK_MANAGER} "platform-tools" > /dev/null \
&& ${ANDROID_SDK_MANAGER} "build-tools;${ANDROID_SDK_BUILD_TOOLS_VERSION}" \
> /dev/null \
&& ${ANDROID_SDK_MANAGER} "extras;android;m2repository" > /dev/null \
&& chmod +x "${ANDROID_CMDLINE_TOOLS_DIR}/bin/avdmanager"

# download ANT
ENV APACHE_ANT_VERSION="1.9.4"
ENV APACHE_ANT_ARCHIVE="apache-ant-${APACHE_ANT_VERSION}-bin.tar.gz"
ENV APACHE_ANT_DL_URL="https://archive.apache.org/dist/ant/binaries/${APACHE_ANT_ARCHIVE}"
ENV APACHE_ANT_HOME="${ANDROID_HOME}/apache-ant"
ENV APACHE_ANT_HOME_V="${APACHE_ANT_HOME}-${APACHE_ANT_VERSION}"

RUN curl "${APACHE_ANT_DL_URL}" --output "${APACHE_ANT_ARCHIVE}" \
&& tar -xf "${APACHE_ANT_ARCHIVE}" -C "${ANDROID_HOME}" \
&& ln -sfn "${APACHE_ANT_HOME_V}" "${APACHE_ANT_HOME}" \
&& rm -rf "${APACHE_ANT_ARCHIVE}"


RUN useradd -m -U builder && mkdir /android

WORKDIR /android

RUN chown -R builder.builder /android "${ANDROID_SDK_HOME}" \
&& chmod -R go+w "${ANDROID_SDK_HOME}"

USER builder

ADD . .
9 changes: 9 additions & 0 deletions .buildbot/android/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash
export LC_ALL=en_US.UTF-8
export LANG=en_US.UTF-8
pushd packages/android
buildozer android debug || exit $?
popd

mkdir -p ../out
cp packages/android/bin/*.apk ../out
6 changes: 6 additions & 0 deletions .buildbot/android/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

unzip -p packages/android/bin/*.apk assets/private.tar \
| tar --list -z > package.list
cat package.list
cat package.list | grep '\.sql$' || exit 1
26 changes: 26 additions & 0 deletions .buildbot/appimage/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM ubuntu:bionic

RUN apt-get update

RUN apt-get install -yq --no-install-suggests --no-install-recommends \
ca-certificates software-properties-common \
build-essential libcap-dev libssl-dev \
python-all-dev python-setuptools wget \
git gtk-update-icon-cache \
binutils-multiarch crossbuild-essential-armhf crossbuild-essential-arm64

RUN dpkg --add-architecture armhf
RUN dpkg --add-architecture arm64

RUN sed -iE "s|deb |deb [arch=amd64] |g" /etc/apt/sources.list \
&& echo "deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports/ bionic main universe" >> /etc/apt/sources.list \
&& echo "deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main universe" >> /etc/apt/sources.list

RUN apt-get update | true

RUN apt-get install -yq libssl-dev:armhf libssl-dev:arm64

RUN wget -qO appimage-builder-x86_64.AppImage \
https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage

ADD . .
49 changes: 49 additions & 0 deletions .buildbot/appimage/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#!/bin/bash

export APPIMAGE_EXTRACT_AND_RUN=1
BUILDER=appimage-builder-x86_64.AppImage
RECIPE=packages/AppImage/AppImageBuilder.yml

export APP_VERSION=$(git describe --tags | cut -d- -f1,3 | tr -d v)

function set_sourceline {
if [ ${ARCH} == amd64 ]; then
export SOURCELINE="deb http://archive.ubuntu.com/ubuntu/ bionic main universe"
else
export SOURCELINE="deb [arch=${ARCH}] http://ports.ubuntu.com/ubuntu-ports/ bionic main universe"
fi
}

[ -f ${BUILDER} ] || wget -qO ${BUILDER} \
https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage \
&& chmod +x ${BUILDER}


export ARCH=amd64
export APPIMAGE_ARCH=x86_64
export RUNTIME=${APPIMAGE_ARCH}
set_sourceline

./${BUILDER} --recipe ${RECIPE} || exit 1

export ARCH=armhf
export APPIMAGE_ARCH=${ARCH}
export RUNTIME=gnueabihf
export CC=arm-linux-gnueabihf-gcc
export CXX=${CC}
set_sourceline

./${BUILDER} --recipe ${RECIPE} || exit 1

export ARCH=arm64
export APPIMAGE_ARCH=aarch64
export RUNTIME=${APPIMAGE_ARCH}
export CC=aarch64-linux-gnu-gcc
export CXX=${CC}
set_sourceline

./${BUILDER} --recipe ${RECIPE}

mkdir -p ../out
sha256sum PyBitmessage*.AppImage > ../out/SHA256SUMS
cp PyBitmessage*.AppImage ../out
6 changes: 6 additions & 0 deletions .buildbot/appimage/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

export APPIMAGE_EXTRACT_AND_RUN=1

chmod +x PyBitmessage-*-x86_64.AppImage
./PyBitmessage-*-x86_64.AppImage -t
18 changes: 18 additions & 0 deletions .buildbot/kivy/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# A container for buildbot
FROM ubuntu:focal AS kivy

ENV DEBIAN_FRONTEND=noninteractive

ENV SKIPCACHE=2022-08-29

RUN apt-get update

RUN apt-get install -yq \
build-essential libcap-dev libssl-dev \
libmtdev-dev libpq-dev \
python3-dev python3-pip python3-virtualenv \
xvfb ffmpeg xclip xsel

RUN ln -sf /usr/bin/python3 /usr/bin/python

RUN pip3 install --upgrade setuptools pip
7 changes: 7 additions & 0 deletions .buildbot/kivy/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/sh

pip3 install -r kivy-requirements.txt

export INSTALL_TESTS=True

pip3 install .
4 changes: 4 additions & 0 deletions .buildbot/kivy/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
export INSTALL_TESTS=True

xvfb-run --server-args="-screen 0, 720x1280x24" python3 tests-kivy.py
7 changes: 7 additions & 0 deletions .buildbot/snap/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM ubuntu:bionic

ENV SKIPCACHE=2022-07-17

RUN apt-get update

RUN apt-get install -yq --no-install-suggests --no-install-recommends snapcraft
9 changes: 9 additions & 0 deletions .buildbot/snap/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

pushd packages && snapcraft || exit 1

popd
mkdir -p ../out
mv packages/pybitmessage*.snap ../out
cd ../out
sha256sum pybitmessage*.snap > SHA256SUMS
22 changes: 22 additions & 0 deletions .buildbot/tox-bionic/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM ubuntu:bionic

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update

RUN apt-get install -yq --no-install-suggests --no-install-recommends \
software-properties-common build-essential libcap-dev libffi-dev \
libssl-dev python-all-dev python-setuptools \
python3-dev python3-pip python3.8 python3.8-dev python3.8-venv \
python-msgpack python-qt4 language-pack-en qt5dxcb-plugin tor xvfb

RUN apt-get install -yq sudo

RUN echo 'builder ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers

RUN python3.8 -m pip install setuptools wheel
RUN python3.8 -m pip install --upgrade pip tox virtualenv

ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
3 changes: 3 additions & 0 deletions .buildbot/tox-bionic/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

sudo service tor start
4 changes: 4 additions & 0 deletions .buildbot/tox-bionic/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh

tox -e lint-basic || exit 1
tox
15 changes: 15 additions & 0 deletions .buildbot/tox-focal/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM ubuntu:focal

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update

RUN apt-get install -yq --no-install-suggests --no-install-recommends \
software-properties-common build-essential libcap-dev libffi-dev \
libssl-dev python-all-dev python-setuptools \
python3-dev python3-pip python3.9 python3.9-dev python3.9-venv \
language-pack-en qt5dxcb-plugin tor xvfb

RUN python3.9 -m pip install --upgrade pip tox virtualenv

ADD . .
1 change: 1 addition & 0 deletions .buildbot/tox-focal/test.sh
12 changes: 12 additions & 0 deletions .buildbot/tox-jammy/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM ubuntu:jammy

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update

RUN apt-get install -yq --no-install-suggests --no-install-recommends \
software-properties-common build-essential libcap-dev libffi-dev \
libssl-dev python-all-dev python-is-python3 python-setuptools \
python3-dev python3-pip language-pack-en qt5dxcb-plugin tor xvfb

RUN pip install tox
4 changes: 4 additions & 0 deletions .buildbot/tox-jammy/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh

tox -e lint-basic # || exit 1
tox -e py310
14 changes: 14 additions & 0 deletions .buildbot/winebuild/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM ubuntu:bionic

ENV DEBIAN_FRONTEND=noninteractive

RUN dpkg --add-architecture i386

RUN apt-get update

RUN apt-get install -yq --no-install-suggests --no-install-recommends \
software-properties-common build-essential libcap-dev libffi-dev \
libssl-dev python-all-dev python-setuptools xvfb \
mingw-w64 wine-stable winetricks wine32 wine64

ADD . .
8 changes: 8 additions & 0 deletions .buildbot/winebuild/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/sh

xvfb-run -a buildscripts/winbuild.sh || exit 1

mkdir -p ../out
mv packages/pyinstaller/dist/Bitmessage*.exe ../out
cd ../out
sha256sum Bitmessage*.exe > SHA256SUMS
41 changes: 41 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
FROM ubuntu:latest

ARG USERNAME=user
ARG USER_UID=1000
ARG USER_GID=$USER_UID

RUN apt-get update
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
curl \
flake8 \
gh \
git \
gnupg2 \
jq \
libcap-dev \
libssl-dev \
pylint \
python-setuptools \
python2.7 \
python2.7-dev \
python3 \
python3-dev \
python3-flake8 \
python3-pip \
python3-pycodestyle \
software-properties-common \
sudo \
zsh

RUN apt-add-repository ppa:deadsnakes/ppa

RUN pip install 'tox<4' 'virtualenv<20.22.0'

RUN groupadd --gid $USER_GID $USERNAME \
&& useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
&& chsh -s /usr/bin/zsh user \
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
&& chmod 0440 /etc/sudoers.d/$USERNAME

USER $USERNAME
WORKDIR /home/$USERNAME
Loading