Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

python-six: add 3.7 and 3.9 #6383

Merged
merged 1 commit into from
Jan 10, 2021
Merged

python-six: add 3.7 and 3.9 #6383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion components/python/six/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ include ../../../make-rules/shared-macros.mk

COMPONENT_NAME= six
COMPONENT_VERSION= 1.15.0
COMPONENT_REVISION= 1
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259
COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_PROJECT_URL= http://pypi.python.org/pypi/six/

PYTHON_VERSIONS= 2.7 3.5
PYTHON_VERSIONS= 2.7 3.5 3.7 3.9

include $(WS_MAKE_RULES)/common.mk

Expand All @@ -47,3 +48,5 @@ COMPONENT_TEST_CMD = py.test-$(PYTHON_VERSION)
# Auto-generated dependencies
REQUIRED_PACKAGES += runtime/python-27
REQUIRED_PACKAGES += runtime/python-35
REQUIRED_PACKAGES += runtime/python-37
REQUIRED_PACKAGES += runtime/python-39
23 changes: 23 additions & 0 deletions components/python/six/manifests/generic-manifest.p5m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.

# Copyright 2020 <contributor>
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/six.py
file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info
7 changes: 7 additions & 0 deletions components/python/six/manifests/sample-manifest.p5m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,10 @@ file path=usr/lib/python3.5/vendor-packages/six-$(COMPONENT_VERSION)-py3.5.egg-i
file path=usr/lib/python3.5/vendor-packages/six-$(COMPONENT_VERSION)-py3.5.egg-info/dependency_links.txt
file path=usr/lib/python3.5/vendor-packages/six-$(COMPONENT_VERSION)-py3.5.egg-info/top_level.txt
file path=usr/lib/python3.5/vendor-packages/six.py
file path=usr/lib/python3.7/vendor-packages/six-$(COMPONENT_VERSION)-py3.7.egg-info/PKG-INFO
file path=usr/lib/python3.7/vendor-packages/six-$(COMPONENT_VERSION)-py3.7.egg-info/SOURCES.txt
file path=usr/lib/python3.7/vendor-packages/six-$(COMPONENT_VERSION)-py3.7.egg-info/dependency_links.txt
file path=usr/lib/python3.7/vendor-packages/six-$(COMPONENT_VERSION)-py3.7.egg-info/top_level.txt
file path=usr/lib/python3.7/vendor-packages/six.py
file path=usr/lib/python3.9/vendor-packages/six-$(COMPONENT_VERSION)-py3.9.egg-info
file path=usr/lib/python3.9/vendor-packages/six.py
6 changes: 5 additions & 1 deletion components/python/six/pkg5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@
"dependencies": [
"SUNWcs",
"runtime/python-27",
"runtime/python-35"
"runtime/python-35",
"runtime/python-37",
"runtime/python-39"
],
"fmris": [
"library/python/six-27",
"library/python/six-35",
"library/python/six-37",
"library/python/six-39",
"library/python/six"
],
"name": "six"
Expand Down
9 changes: 5 additions & 4 deletions components/python/six/six-PYVER.p5m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ set name=info.upstream value="Benjamin Peterson <benjamin@python.org>"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2013/241
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
$(PYTHON_3.9_EXCL)file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
$(PYTHON_3.9_EXCL)file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
$(PYTHON_3.9_EXCL)file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
$(PYTHON_3.9_EXCL)file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
$(PYTHON_3.9_ONLY)file path=usr/lib/python$(PYVER)/vendor-packages/six-$(COMPONENT_VERSION)-py$(PYVER).egg-info
file path=usr/lib/python$(PYVER)/vendor-packages/six.py
license LICENSE license=MIT

Expand Down