Skip to content

Commit 469fd86

Browse files
committed
Updated packaging and file locations to reflect Briefcase v0.3 requirements.
1 parent c2f6551 commit 469fd86

File tree

4 files changed

+19
-18
lines changed

4 files changed

+19
-18
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Contributing
22

3-
PyBee <3's contributions!
3+
BeeWare <3's contributions!
44

5-
Please be aware, PyBee operates under a Code of Conduct.
5+
Please be aware, BeeWare operates under a Code of Conduct.
66

7-
See [CONTRIBUTING to PyBee](pybee.org/contributing) for details.
7+
See [CONTRIBUTING to BeeWare](https://beeware.org/contributing) for details.
88

Makefile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -341,17 +341,18 @@ clean-$1:
341341

342342
dist/Python-$(PYTHON_VER)-$1-support.b$(BUILD_NUMBER).tar.gz: $$(BZIP2_FRAMEWORK-$1) $$(XZ_FRAMEWORK-$1) $$(OPENSSL_FRAMEWORK-$1) $$(PYTHON_FRAMEWORK-$1)
343343
mkdir -p dist
344-
echo "Python version: $(PYTHON_VERSION) " > build/$1/VERSIONS
345-
echo "Build: $(BUILD_NUMBER)" >> build/$1/VERSIONS
346-
echo "---------------------" >> build/$1/VERSIONS
347-
echo "BZip2: $(BZIP2_VERSION)" >> build/$1/VERSIONS
348-
echo "OpenSSL: $(OPENSSL_VERSION)" >> build/$1/VERSIONS
349-
echo "XZ: $(XZ_VERSION)" >> build/$1/VERSIONS
344+
echo "Python version: $(PYTHON_VERSION) " > build/$1/Support/VERSIONS
345+
echo "Build: $(BUILD_NUMBER)" >> build/$1/Support/VERSIONS
346+
echo "---------------------" >> build/$1/Support/VERSIONS
347+
echo "BZip2: $(BZIP2_VERSION)" >> build/$1/Support/VERSIONS
348+
echo "OpenSSL: $(OPENSSL_VERSION)" >> build/$1/Support/VERSIONS
349+
echo "XZ: $(XZ_VERSION)" >> build/$1/Support/VERSIONS
350350
ifeq ($1,macOS)
351351
cp -r build/$1/Python-$(PYTHON_VERSION)-macosx.x86_64/dist build/$1/python
352-
tar zcvf $$@ -C build/$1 VERSIONS python
352+
mv build/$1/Support/VERSIONS build/$1/python/VERSIONS
353+
tar zcvf $$@ -C build/$1/python `ls -A build/$1/python`
353354
else
354-
tar zcvf $$@ -C build/$1 VERSIONS Support
355+
tar zcvf $$@ -C build/$1/Support `ls -A build/$1/Support`
355356
endif
356357

357358
# Build OpenSSL

README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ For details on how to add these binary packages to your project, see the
7272
package-specific documentation linked above.
7373

7474

75-
.. _for macOS: https://s3-us-west-2.amazonaws.com/pybee-briefcase-support/Python-Apple-support/3.7/macOS/Python-3.7-macOS-support.b1.tar.gz
76-
.. _for iOS: https://s3-us-west-2.amazonaws.com/pybee-briefcase-support/Python-Apple-support/3.7/iOS/Python-3.7-iOS-support.b1.tar.gz
77-
.. _for tvOS: https://s3-us-west-2.amazonaws.com/pybee-briefcase-support/Python-Apple-support/3.7/tvOS/Python-3.7-tvOS-support.b1.tar.gz
78-
.. _for watchOS: https://s3-us-west-2.amazonaws.com/pybee-briefcase-support/Python-Apple-support/3.7/watchOS/Python-3.7-watchOS-support.b1.tar.gz
75+
.. _for macOS: https://briefcase-support.s3-us-west-2.amazonaws.com/python/3.7/macOS/Python-3.7-macOS-support.b1.tar.gz
76+
.. _for iOS: https://briefcase-support.s3-us-west-2.amazonaws.com/python/3.7/iOS/Python-3.7-iOS-support.b1.tar.gz
77+
.. _for tvOS: https://briefcase-support.s3-us-west-2.amazonaws.com/python/3.7/tvOS/Python-3.7-tvOS-support.b1.tar.gz
78+
.. _for watchOS: https://briefcase-support.s3-us-west-2.amazonaws.com/python/3.7/watchOS/Python-3.7-watchOS-support.b1.tar.gz

tools/upload.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
import sys
33
import threading
44

5-
65
from botocore.exceptions import ClientError
76
import boto3
87

98
from argparse import ArgumentParser
109

10+
1111
class Progress:
1212
def __init__(self, index, count, filename):
1313
self.index = index
@@ -45,8 +45,8 @@ def upload(build, directory, s3_client):
4545
with open(full_filename, 'rb') as data:
4646
s3_client.upload_fileobj(
4747
data,
48-
'pybee-briefcase-support',
49-
'Python-Apple-support/%s/%s/%s' % (
48+
'briefcase-support',
49+
'python/%s/%s/%s' % (
5050
version,
5151
platform,
5252
filename

0 commit comments

Comments
 (0)