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

Py39 #395

Merged
merged 24 commits into from
Oct 7, 2020
Merged

Py39 #395

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e65c773
update to 3.9
ocefpaf Oct 6, 2020
8d6d11a
MNT: Re-rendered with conda-build 3.20.3, conda-smithy 3.7.10, and co…
ocefpaf Oct 6, 2020
8da0ada
re-add tzdata
ocefpaf Oct 6, 2020
8a49f9d
Update recipe/meta.yaml
ocefpaf Oct 6, 2020
cc8e873
restore patch
ocefpaf Oct 6, 2020
13e1e36
revert patch
ocefpaf Oct 6, 2020
a683dc1
tzdata path
ocefpaf Oct 6, 2020
754248f
asd
isuruf Oct 7, 2020
cd61f4e
update sysconfig data for linux-x86
isuruf Oct 7, 2020
06493b2
fix sysconfigdata
isuruf Oct 7, 2020
16e811d
Fix conda_cos6
isuruf Oct 7, 2020
3f5209f
Fix typo
isuruf Oct 7, 2020
b149e6b
tzdata => python-tzdata
mingwandroid Oct 7, 2020
b2cb64a
Skip stripping on osx arm64
mingwandroid Oct 7, 2020
cde13cf
Force eol for recipe/tests/prefix-replacement/build-and-test.sh
mingwandroid Oct 7, 2020
75c28fb
fix another typo
isuruf Oct 7, 2020
db61f52
get rid of hand edited sysconfigdata
isuruf Oct 7, 2020
d2b586b
Use non python tzdata
isuruf Oct 7, 2020
52e9d6a
Fix SGI_ABI
isuruf Oct 7, 2020
f988bc8
fix typo
isuruf Oct 7, 2020
baa1862
Fix TZPATH on windows
isuruf Oct 7, 2020
bd99141
Revert "Skip stripping on osx arm64"
isuruf Oct 7, 2020
2faf5e0
replace - with _
isuruf Oct 7, 2020
362e1bc
need CPPFLAGS with -I. -isystem is not enough
isuruf Oct 7, 2020
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
1 change: 1 addition & 0 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ source:
- patches/0029-Xcode-12-Beta-4-declares-_dyld_shared_cache_contains.patch
- patches/0030-gh21564.patch
- patches/0031-gh21228.patch
- patches/0032-Fix-TZPATH-on-windows.patch

# TODO :: Depend on our own packages for these:
- url: https://github.com/python/cpython-source-deps/archive/xz-5.2.2.zip # [win]
Expand Down
25 changes: 25 additions & 0 deletions recipe/patches/0032-Fix-TZPATH-on-windows.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 1218ca492f4781ffc680e4a450ca1933ddcb29f4 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Wed, 7 Oct 2020 10:08:30 -0500
Subject: [PATCH] Fix TZPATH on windows

---
Lib/sysconfig.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index bf04ac541e..11e81d4f44 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -546,7 +546,7 @@ def get_config_vars(*args):

if os.name == 'nt':
_init_non_posix(_CONFIG_VARS)
- _CONFIG_VARS['TZPATH'] = ''
+ _CONFIG_VARS['TZPATH'] = os.path.join(_PREFIX, "share", "zoneinfo")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

if os.name == 'posix':
_init_posix(_CONFIG_VARS)
# For backward compatibility, see issue19555
--
2.28.0