Skip to content

Commit c3eabe8

Browse files
authored
Deprecate Python 3.7.x (EOL) (#789)
1 parent b69733d commit c3eabe8

File tree

2 files changed

+4
-42
lines changed

2 files changed

+4
-42
lines changed

manifest.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ dependency_deprecation_dates:
1212
name: python
1313
date: 2027-10-24
1414
link: https://www.python.org/dev/peps/pep-0664/
15-
- version_line: 3.7.x
16-
name: python
17-
date: 2023-06-27
18-
link: https://www.python.org/dev/peps/pep-0537/
1915
- version_line: 3.8.x
2016
name: python
2117
date: 2024-10-14
@@ -77,22 +73,6 @@ dependencies:
7773
- cflinuxfs4
7874
source: https://files.pythonhosted.org/packages/69/51/dafe11039d53a44ca1ffa51d4a341d6de7de85ca914a818040e9755b0436/pipenv-2023.6.26.tar.gz
7975
source_sha256: b4cf3894c0a8621da79c4c54edc5fdb5285c8e92a8fd4c7a8d13a9771d39c7e7
80-
- name: python
81-
version: 3.7.17
82-
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.7.17_linux_x64_cflinuxfs3_d287c0c5.tgz
83-
sha256: d287c0c563c6d3b4a3fdbc3cae3175362987ab88e4f58e32e652664987415364
84-
cf_stacks:
85-
- cflinuxfs3
86-
source: https://www.python.org/ftp/python/3.7.17/Python-3.7.17.tgz
87-
source_sha256: fd50161bc2a04f4c22a0971ff0f3856d98b4bf294f89740a9f06b520aae63b49
88-
- name: python
89-
version: 3.7.17
90-
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.7.17_linux_x64_cflinuxfs4_deda826e.tgz
91-
sha256: deda826e804834ad44ef2e8d431e2b995dae372d9aba47973fe0e4ed22ed3701
92-
cf_stacks:
93-
- cflinuxfs4
94-
source: https://www.python.org/ftp/python/3.7.17/Python-3.7.17.tgz
95-
source_sha256: fd50161bc2a04f4c22a0971ff0f3856d98b4bf294f89740a9f06b520aae63b49
9676
- name: python
9777
version: 3.8.17
9878
uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.8.17_linux_x64_cflinuxfs3_9a6aa6b5.tgz

src/python/supply/supply_test.go

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ var _ = Describe("Supply", func() {
9393
BeforeEach(func() {
9494
Expect(os.MkdirAll(depDir, 0755)).To(Succeed())
9595
pythonInstallDir = filepath.Join(depDir, "python")
96-
Expect(os.WriteFile(filepath.Join(depDir, "runtime.txt"), []byte("\n\n\npython-3.4.2\n\n\n"), 0644)).To(Succeed())
96+
Expect(os.WriteFile(filepath.Join(depDir, "runtime.txt"), []byte("\n\n\npython-3.9.2\n\n\n"), 0644)).To(Succeed())
9797

98-
versions = []string{"3.4.2", "3.7.13"}
98+
versions = []string{"3.9.2", "3.10.1"}
9999
originalPath = os.Getenv("PATH")
100100
})
101101

@@ -106,31 +106,13 @@ var _ = Describe("Supply", func() {
106106
Context("runtime.txt sets Python version 3", func() {
107107
It("installs Python version 3", func() {
108108
mockManifest.EXPECT().AllDependencyVersions("python").Return(versions)
109-
mockInstaller.EXPECT().InstallDependency(libbuildpack.Dependency{Name: "python", Version: "3.4.2"}, pythonInstallDir)
109+
mockInstaller.EXPECT().InstallDependency(libbuildpack.Dependency{Name: "python", Version: "3.9.2"}, pythonInstallDir)
110110
mockStager.EXPECT().LinkDirectoryInDepDir(filepath.Join(pythonInstallDir, "bin"), "bin")
111111
mockStager.EXPECT().LinkDirectoryInDepDir(filepath.Join(pythonInstallDir, "lib"), "lib")
112112
Expect(supplier.InstallPython()).To(Succeed())
113113
Expect(os.Getenv("PATH")).To(Equal(fmt.Sprintf("%s:%s", filepath.Join(depDir, "bin"), originalPath)))
114114
Expect(os.Getenv("PYTHONPATH")).To(Equal(depDir))
115-
Expect(os.Getenv("CFLAGS")).To(Equal(fmt.Sprintf("-I%s", filepath.Join(depDir, "python", "include", "python3.4"))))
116-
})
117-
})
118-
119-
//Remove once Python 3.7 is out of support (June 2023)
120-
Context("runtime.txt sets Python version 3.7", func() {
121-
BeforeEach(func() {
122-
Expect(os.RemoveAll(filepath.Join(depDir, "runtime.txt"))).To(Succeed())
123-
Expect(os.WriteFile(filepath.Join(depDir, "runtime.txt"), []byte("\n\n\npython-3.7.13\n\n\n"), 0644)).To(Succeed())
124-
})
125-
It("installs Python version 3.7", func() {
126-
mockManifest.EXPECT().AllDependencyVersions("python").Return(versions)
127-
mockInstaller.EXPECT().InstallDependency(libbuildpack.Dependency{Name: "python", Version: "3.7.13"}, pythonInstallDir)
128-
mockStager.EXPECT().LinkDirectoryInDepDir(filepath.Join(pythonInstallDir, "bin"), "bin")
129-
mockStager.EXPECT().LinkDirectoryInDepDir(filepath.Join(pythonInstallDir, "lib"), "lib")
130-
Expect(supplier.InstallPython()).To(Succeed())
131-
Expect(os.Getenv("PATH")).To(Equal(fmt.Sprintf("%s:%s", filepath.Join(depDir, "bin"), originalPath)))
132-
Expect(os.Getenv("PYTHONPATH")).To(Equal(depDir))
133-
Expect(os.Getenv("CFLAGS")).To(Equal(fmt.Sprintf("-I%s", filepath.Join(depDir, "python", "include", "python3.7m"))))
115+
Expect(os.Getenv("CFLAGS")).To(Equal(fmt.Sprintf("-I%s", filepath.Join(depDir, "python", "include", "python3.9"))))
134116
})
135117
})
136118

0 commit comments

Comments
 (0)