Skip to content

Commit bfb1fc7

Browse files
committed
Update platform tags based on default/supported set for 1.11
See #113
1 parent 3219c30 commit bfb1fc7

File tree

3 files changed

+13
-29
lines changed

3 files changed

+13
-29
lines changed

distribution/building-binaries.rst

+9-25
Original file line numberDiff line numberDiff line change
@@ -194,24 +194,21 @@ By default, Panda3D will build for 64-bit versions of Windows, macOS and Linux.
194194
More specifically, *platform tags* are used to specify the minimum version and
195195
architecture of the operating system supported by a Python package. You can
196196
specify these platforms explicitly to customize the targeted platforms and their
197-
versions. The default set, as of Python 3.7, is as follows:
197+
versions. The default set is as follows:
198198

199199
.. code-block:: python
200200
201-
'platforms': ['manylinux1_x86_64', 'macosx_10_6_x86_64', 'win_amd64'],
202-
203-
On more recent versions of Python, newer defaults are used. See the list below
204-
for details.
201+
'platforms': ['manylinux2010_x86_64', 'macosx_10_9_x86_64', 'win_amd64'],
205202
206203
Sometimes, it is desirable to use third-party packages that do not provide
207-
wheels for a given platform. For example, the latest version of numpy no longer
208-
publishes wheels for ``manylinux1_x86_64`` or ``macosx_10_6_x86_64``. If you
209-
wish to use the latest version of numpy, then you need to therefore set the
210-
platform tags to increase these versions:
204+
wheels for a given platform. For example, a package may no longer publish wheels
205+
for a ``manylinux2010_x86_64``, but only for ``manylinux2014_x86_64``. If you
206+
wish to use this package, then you need to therefore set the platform tags to
207+
increase these versions:
211208

212209
.. code-block:: python
213210
214-
'platforms': ['manylinux2010_x86_64', 'macosx_10_9_x86_64', 'win_amd64'],
211+
'platforms': ['manylinux2014_x86_64', 'macosx_10_9_x86_64', 'win_amd64'],
215212
216213
.. list-table:: List of Platforms
217214
:widths: 20, 80
@@ -220,24 +217,12 @@ platform tags to increase these versions:
220217
- 64-bit Windows systems (including Intel x64 processors).
221218
* - win32
222219
- 32-bit Windows systems, rarely used nowadays.
223-
* - manylinux1_x86_64
224-
- Set this to target the oldest 64-bit Linux distributions. No longer
225-
supported as of Python 3.10, where manylinux2010_x86_64 is silently used
226-
as default.
227-
* - manylinux1_i686
228-
- Set this to target the oldest 32-bit Linux distributions.
229220
* - manylinux2010_x86_64
230221
- Target 64-bit Linux distributions more recent than (more or less) 2010.
231222
* - manylinux2010_i686
232223
- Target 32-bit Linux distributions more recent than (more or less) 2010.
233224
* - macosx_10_9_x86_64
234225
- Target Intel Macs running OS X Mavericks or higher. Recommended.
235-
* - macosx_10_6_x86_64
236-
- Target 64-bit Intel Macs running Mac OS X Snow Leopard or above.
237-
No longer supported as of Python 3.8.
238-
* - macosx_10_6_i386
239-
- Target 32-bit Intel Macs running Mac OS X Snow Leopard or above.
240-
No longer supported as of Python 3.8.
241226

242227
.. note::
243228

@@ -249,9 +234,8 @@ Icons
249234
-----
250235

251236
On Windows and macOS, it is possible to change the icon that is shown in file
252-
browsers or the dock for the compiled executable. This feature requires Panda3D
253-
1.10.4 or later. To use this feature, modify the ``setup.py`` file to something
254-
like the following:
237+
browsers or the dock for the compiled executable. To use this feature, modify
238+
the ``setup.py`` file to something like the following:
255239

256240
.. code-block:: python
257241

distribution/packaging-binaries.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The ``bdist_apps`` command will make use of ``build_apps.build_base`` and
1717
installers
1818
A dictionary of installers/packages to create for each platform (keys are
1919
strings for the platform, values are strings representing installers,
20-
defaults to gztar for manylinux1_x86_64/manylinux1_i386 and zip for
20+
defaults to gztar for manylinux2010_x86_64/manylinux2010_i386 and zip for
2121
everything else)
2222

2323
Installers

distribution/setuptools-examples.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Then, we can build the binaries using ``python setup.py build_apps``.
3939

4040
A ``build`` directory will be created and contain a directory for each platform
4141
that binaries were built for. Since no platforms were specified, the defaults
42-
were used (manylinux1_x86_64, macosx_10_6_x86_64, win_amd64).
42+
were used (manylinux2010_x86_64, macosx_10_9_x86_64, win_amd64).
4343

4444
Note, win32 is missing from the defaults. If a win32 build is desired, then
4545
platforms must be defined in ``setup.py`` and ``win_amd64`` added to the list:
@@ -54,8 +54,8 @@ platforms must be defined in ``setup.py`` and ``win_amd64`` added to the list:
5454
'build_apps': {
5555
'console_apps': {'hello_world': 'main.py'},
5656
'platforms': [
57-
'manylinux1_x86_64',
58-
'macosx_10_6_x86_64',
57+
'manylinux2010_x86_64',
58+
'macosx_10_9_x86_64',
5959
'win_amd64',
6060
'win32',
6161
],

0 commit comments

Comments
 (0)