Skip to content

Commit

Permalink
Merge pull request #1319 from obfusk/https
Browse files Browse the repository at this point in the history
use HTTPS urls
  • Loading branch information
AndreMiras authored Apr 24, 2021
2 parents 6dcbe7a + 56d0478 commit ead2d9f
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ your application requirements and settings such as title, icon, included modules
etc. Buildozer will use that spec to create a package for Android, iOS, Windows,
OSX and/or Linux.

Buildozer currently supports packaging for Android via the [python-for-android](http://github.com/kivy/python-for-android/)
Buildozer currently supports packaging for Android via the [python-for-android](https://github.com/kivy/python-for-android/)
project, and for iOS via the kivy-ios project. iOS and OSX are still under work.

For Android, buildozer will automatically download and prepare the
Expand All @@ -24,7 +24,7 @@ build dependencies. For more information, see
Note that only Python 3 is supported.

Note that this tool has nothing to do with the eponymous online build service
[buildozer.io](http://buildozer.io).
[buildozer.io](https://buildozer.io).

## Installing Buildozer with target Python 3 (default):

Expand Down Expand Up @@ -176,7 +176,7 @@ For [debugging on Android](https://python-for-android.readthedocs.io/en/stable/t
## Contributing

We love pull requests and discussing novel ideas. Check out our
[contribution guide](http://kivy.org/docs/contribute.html) and
[contribution guide](https://kivy.org/docs/contribute.html) and
feel free to improve buildozer.

The following mailing list and IRC channel are used exclusively for
Expand Down
8 changes: 4 additions & 4 deletions buildozer/targets/android.py
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ def _install_apache_ant(self):

self.buildozer.info('Android ANT is missing, downloading')
archive = 'apache-ant-{0}-bin.tar.gz'.format(APACHE_ANT_VERSION)
url = 'http://archive.apache.org/dist/ant/binaries/'
url = 'https://archive.apache.org/dist/ant/binaries/'
self.buildozer.download(url,
archive,
cwd=ant_dir)
Expand Down Expand Up @@ -427,7 +427,7 @@ def _install_android_ndk(self):
# https://developer.android.com/ndk/downloads/older_releases

if platform in ('win32', 'cygwin'):
# Checking of 32/64 bits at Windows from: http://stackoverflow.com/a/1405971/798575
# Checking of 32/64 bits at Windows from: https://stackoverflow.com/a/1405971/798575
import struct
archive = 'android-ndk-r{0}-windows-{1}.zip'
is_64 = (8 * struct.calcsize("P") == 64)
Expand Down Expand Up @@ -460,7 +460,7 @@ def _install_android_ndk(self):
if _version >= '10e':
url = 'https://dl.google.com/android/repository/'
else:
url = 'http://dl.google.com/android/ndk/'
url = 'https://dl.google.com/android/ndk/'

self.buildozer.download(url,
archive,
Expand Down Expand Up @@ -659,7 +659,7 @@ def _check_aidl(self, v_build_tools):
self.buildozer.error(
'You might have missed to install 32bits libs')
self.buildozer.error(
'Check http://buildozer.readthedocs.org/en/latest/installation.html')
'Check https://buildozer.readthedocs.org/en/latest/installation.html')
self.buildozer.error('')
else:
self.buildozer.error('')
Expand Down
4 changes: 2 additions & 2 deletions buildozer/targets/osx.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ def download_kivy(self, cwd, py_branch=2):
self.buildozer.info('Downloading kivy...')
status_code = check_output(
('curl', '-L', '--write-out', '%{http_code}', '-o', 'Kivy{}.dmg'.format(py_branch),
'http://kivy.org/downloads/{}/Kivy-{}-osx-python{}.dmg'
'https://kivy.org/downloads/{}/Kivy-{}-osx-python{}.dmg'
.format(current_kivy_vers, current_kivy_vers, py_branch)),
cwd=cwd)

if status_code == "404":
self.buildozer.error(
"Unable to download the Kivy App. Check osx.kivy_version in your buildozer.spec, and verify "
"Kivy servers are accessible. http://kivy.org/downloads/")
"Kivy servers are accessible. https://kivy.org/downloads/")
check_call(("rm", "Kivy{}.dmg".format(py_branch)), cwd=cwd)
sys.exit(1)

Expand Down
2 changes: 1 addition & 1 deletion buildozer/tools/packer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ torrent:
mktorrent \
-a ${TORRENT_ANNOUNCE} \
-o output-kivy-buildozer-vm/kivy-buildozer-vm.torrent \
-w http://txzone.net/files/torrents/${PACKAGE_FILENAME} \
-w https://txzone.net/files/torrents/${PACKAGE_FILENAME} \
-v output-kivy-buildozer-vm/${PACKAGE_FILENAME}

upload:
Expand Down
2 changes: 1 addition & 1 deletion buildozer/tools/packer/scripts/additional-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# an error when using the android sdk:
# "Can't read cryptographic policy directory: unlimited"

wget http://bootstrap.pypa.io/get-pip.py
wget https://bootstrap.pypa.io/get-pip.py
python get-pip.py
rm get-pip.py

Expand Down
2 changes: 1 addition & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ BUILDDIR = build

# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from https://www.sphinx-doc.org/)
endif

# Internal variables.
Expand Down
2 changes: 1 addition & 1 deletion docs/make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ if errorlevel 9009 (
echo.may add the Sphinx directory to PATH.
echo.
echo.If you don't have Sphinx installed, grab it from
echo.http://sphinx-doc.org/
echo.https://www.sphinx-doc.org/
exit /b 1
)

Expand Down
6 changes: 3 additions & 3 deletions docs/source/contribute.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ limitation.

To test your own recipe via Buildozer, you need to:

#. Fork `Python for Android <http://github.com/kivy/python-for-android>`_, and
#. Fork `Python for Android <https://github.com/kivy/python-for-android>`_, and
clone your own version (this will allow easy contribution later)::

git clone http://github.com/YOURNAME/python-for-android
git clone https://github.com/YOURNAME/python-for-android

#. Change your `buildozer.spec` to reference your version::

Expand All @@ -44,6 +44,6 @@ include it in the python-for-android project, by issuing a Pull Request:

git push origin master

#. Go to `http://github.com/YOURNAME/python-for-android`, and you should see
#. Go to `https://github.com/YOURNAME/python-for-android`, and you should see
your new branch and a button "Pull Request" on it. Use it, write a
description about what you did, and Send!
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def find_version(*file_paths):
long_description_content_type='text/markdown',
author='Mathieu Virbel',
author_email='mat@kivy.org',
url='http://github.com/kivy/buildozer',
url='https://github.com/kivy/buildozer',
license='MIT',
packages=[
'buildozer', 'buildozer.targets', 'buildozer.libs', 'buildozer.scripts'
Expand Down
2 changes: 1 addition & 1 deletion tests/test_buildozer.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def test_android_ant_path(self):
assert m_file_extract.call_args_list == [mock.call(mock.ANY, cwd='/my/ant/path')]
assert ant_path == my_ant_path
assert download.call_args_list == [
mock.call("http://archive.apache.org/dist/ant/binaries/", mock.ANY, cwd=my_ant_path)]
mock.call("https://archive.apache.org/dist/ant/binaries/", mock.ANY, cwd=my_ant_path)]
# Mock ant already installed
with mock.patch.object(Buildozer, 'file_exists', return_value=True):
ant_path = target._install_apache_ant()
Expand Down

0 comments on commit ead2d9f

Please sign in to comment.