From da019813a57c27242f5cdbe5b9cfbf3b3803dde5 Mon Sep 17 00:00:00 2001
From: Hood Chatham <hood@mit.edu>
Date: Wed, 16 Jun 2021 14:57:56 -0700
Subject: [PATCH] Package updates from Python 3.9 branch (#1639)

---
 packages/Jinja2/meta.yaml                     |  6 +--
 packages/MarkupSafe/meta.yaml                 |  6 +--
 packages/numpy/meta.yaml                      |  1 +
 packages/setuptools/meta.yaml                 |  7 ++--
 .../setuptools/patches/remove-ctypes.patch    | 41 ++++++-------------
 5 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/packages/Jinja2/meta.yaml b/packages/Jinja2/meta.yaml
index 85602e216..403ed5dc3 100644
--- a/packages/Jinja2/meta.yaml
+++ b/packages/Jinja2/meta.yaml
@@ -1,12 +1,12 @@
 package:
   name: Jinja2
-  version: 2.11.3
+  version: 3.0.1
 requirements:
   run:
   - MarkupSafe
 source:
-  sha256: a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
-  url: https://files.pythonhosted.org/packages/4f/e7/65300e6b32e69768ded990494809106f87da1d436418d5f1367ed3966fd7/Jinja2-2.11.3.tar.gz
+  sha256: 703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4
+  url: https://files.pythonhosted.org/packages/39/11/8076571afd97303dfeb6e466f27187ca4970918d4b36d5326725514d3ed3/Jinja2-3.0.1.tar.gz
 test:
   imports:
   - jinja2
diff --git a/packages/MarkupSafe/meta.yaml b/packages/MarkupSafe/meta.yaml
index cf5a0342a..2b0125145 100644
--- a/packages/MarkupSafe/meta.yaml
+++ b/packages/MarkupSafe/meta.yaml
@@ -1,9 +1,9 @@
 package:
   name: MarkupSafe
-  version: 1.1.1
+  version: 2.0.1
 source:
-  sha256: 29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b
-  url: https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094/MarkupSafe-1.1.1.tar.gz
+  sha256: 594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a
+  url: https://files.pythonhosted.org/packages/bf/10/ff66fea6d1788c458663a84d88787bae15d45daa16f6b3ef33322a51fc7e/MarkupSafe-2.0.1.tar.gz
 test:
   imports:
   - markupsafe
diff --git a/packages/numpy/meta.yaml b/packages/numpy/meta.yaml
index 0558010fa..146b307a6 100644
--- a/packages/numpy/meta.yaml
+++ b/packages/numpy/meta.yaml
@@ -29,6 +29,7 @@ build:
     # copy the correct numpy config into the build artifacts. Otherwise scipy will try to build with the config
     # from the build computer and bad things will happen
     cp config/* $PKGDIR/../.artifacts/lib/python/numpy-1.17.5-py3.8-linux-x86_64.egg/numpy/core/include/numpy
+    cp -r $PKGDIR/../.artifacts/lib/python/numpy-1.17.5-py3.8-linux-x86_64.egg/numpy $PKGDIR/../.artifacts/lib/python/numpy
 
 test:
   imports:
diff --git a/packages/setuptools/meta.yaml b/packages/setuptools/meta.yaml
index abba665cd..3d4e2ca33 100644
--- a/packages/setuptools/meta.yaml
+++ b/packages/setuptools/meta.yaml
@@ -1,10 +1,10 @@
 package:
   name: setuptools
-  version: 40.0.0
+  version: 57.0.0
 
 source:
-  url: https://pypi.io/packages/source/s/setuptools/setuptools-40.0.0.zip
-  sha256: 012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f
+  url: https://files.pythonhosted.org/packages/88/fc/d17731c0cc67a5a8e385e4f47c3b0b186720e198b70f076ccb4676804a8f/setuptools-57.0.0.tar.gz
+  sha256: 401cbf33a7bf817d08014d51560fc003b895c4cdc1a5b521ad2969e928a07535
 
   patches:
     - patches/remove-ctypes.patch
@@ -17,5 +17,4 @@ requirements:
 test:
   imports:
     - setuptools
-    - easy_install
     - pkg_resources
diff --git a/packages/setuptools/patches/remove-ctypes.patch b/packages/setuptools/patches/remove-ctypes.patch
index f009a7d91..5e9f736f7 100644
--- a/packages/setuptools/patches/remove-ctypes.patch
+++ b/packages/setuptools/patches/remove-ctypes.patch
@@ -1,24 +1,14 @@
-diff --git a/setuptools/glibc.py b/setuptools/glibc.py
-index a134591c..c31fc78a 100644
---- a/setuptools/glibc.py
-+++ b/setuptools/glibc.py
-@@ -2,13 +2,13 @@
- # https://github.com/pypa/pip/blob/8f4f15a5a95d7d5b511ceaee9ed261176c181970/src/pip/_internal/utils/glibc.py
- from __future__ import absolute_import
- 
--import ctypes
- import re
- import warnings
- 
- 
- def glibc_version_string():
-     "Returns glibc version string, or None if not using glibc."
-+    import ctypes
- 
-     # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen
-     # manpage says, "If filename is NULL, then the returned handle is for the
+From 7e50329062af2b51d0e551c6c80fc5b457263639 Mon Sep 17 00:00:00 2001
+From: Hood <hood@mit.edu>
+Date: Tue, 15 Jun 2021 09:06:01 -0700
+Subject: [PATCH] Remove ctypes import
+
+---
+ setuptools/windows_support.py | 1 -
+ 1 file changed, 1 deletion(-)
+
 diff --git a/setuptools/windows_support.py b/setuptools/windows_support.py
-index cb977cff..1ca64fbb 100644
+index cb977cf..0324739 100644
 --- a/setuptools/windows_support.py
 +++ b/setuptools/windows_support.py
 @@ -1,5 +1,4 @@
@@ -27,11 +17,6 @@ index cb977cff..1ca64fbb 100644
  
  
  def windows_only(func):
-@@ -17,6 +16,7 @@ def hide_file(path):
- 
-     `path` must be text.
-     """
-+    import ctypes
-     __import__('ctypes.wintypes')
-     SetFileAttributes = ctypes.windll.kernel32.SetFileAttributesW
-     SetFileAttributes.argtypes = ctypes.wintypes.LPWSTR, ctypes.wintypes.DWORD
+-- 
+2.17.1
+