From ec99e888d1d99a7fe9aed31531414379c2b62cab Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Wed, 7 Aug 2019 12:09:46 +0200
Subject: [PATCH] [importlib-metadata] Move to defaults channel version

Fixes #76
---
 conda/importlib-metadata/meta.yaml | 42 ------------------------------
 conda/pre-commit/meta.yaml         |  5 ++--
 conda/zipp/meta.yaml               | 36 -------------------------
 python.txt                         |  2 --
 4 files changed, 2 insertions(+), 83 deletions(-)
 delete mode 100644 conda/importlib-metadata/meta.yaml
 delete mode 100644 conda/zipp/meta.yaml

diff --git a/conda/importlib-metadata/meta.yaml b/conda/importlib-metadata/meta.yaml
deleted file mode 100644
index d9a1fdca..00000000
--- a/conda/importlib-metadata/meta.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-{% set name = "importlib_metadata" %}
-{% set version = "0.8" %}
-{% set file_ext = "tar.gz" %}
-{% set hash_type = "sha256" %}
-{% set hash_value = "b50191ead8c70adfa12495fba19ce6d75f2e0275c14c5a7beb653d6799b512bd" %}
-
-package:
-  name: '{{ name|lower }}'
-  version: '{{ version }}'
-
-source:
-  fn: '{{ name }}-{{ version }}.{{ file_ext }}'
-  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.{{ file_ext }}
-  '{{ hash_type }}': '{{ hash_value }}'
-
-build:
-  number: 0
-  entry_points:
-    - nodeenv = nodeenv:main
-  script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv"
-
-requirements:
-  host:
-    - pip
-    - python
-  run:
-    - python
-    - zipp
-
-test:
-  imports:
-    - importlib_metadata
-
-about:
-  home: https://gitlab.com/python-devs/importlib_metadata
-  license: Apache Software
-  license_family: APACHE
-  summary: A library to access the metadata for a Python package
-  doc_url: https://importlib-metadata.readthedocs.io
-
-extra:
-  recipe-maintainers: sgaist
diff --git a/conda/pre-commit/meta.yaml b/conda/pre-commit/meta.yaml
index ff4b792b..91f98d74 100644
--- a/conda/pre-commit/meta.yaml
+++ b/conda/pre-commit/meta.yaml
@@ -14,7 +14,7 @@ source:
   '{{ hash_type }}': '{{ hash_value }}'
 
 build:
-  number: 0
+  number: 1
   entry_points:
     - pre-commit = pre_commit.main:main
     - pre-commit-validate-config = pre_commit.clientlib:validate_config_main
@@ -31,14 +31,13 @@ requirements:
     - cached-property
     - cfgv >=1.0.0
     - identify >=1.0.0
-    - importlib_metadata
+    - importlib_metadata >=0.17
     - nodeenv >=0.11.1
     - pyyaml
     - six
     - toml
     - virtualenv
     - importlib_resources  # [py<37]
-    - zipp
 
 test:
   imports:
diff --git a/conda/zipp/meta.yaml b/conda/zipp/meta.yaml
deleted file mode 100644
index 9ad7215b..00000000
--- a/conda/zipp/meta.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-{% set name = "zipp" %}
-{% set version = "0.3.3" %}
-{% set file_ext = "tar.gz" %}
-{% set hash_type = "sha256" %}
-{% set hash_value = "55ca87266c38af6658b84db8cfb7343cdb0bf275f93c7afaea0d8e7a209c7478" %}
-
-package:
-  name: '{{ name|lower }}'
-  version: '{{ version }}'
-
-source:
-  fn: '{{ name }}-{{ version }}.{{ file_ext }}'
-  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.{{ file_ext }}
-  '{{ hash_type }}': '{{ hash_value }}'
-
-build:
-  number: 0
-  script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv"
-
-requirements:
-  host:
-    - pip
-    - python
-    - setuptools
-    - setuptools_scm
-  run:
-    - python
-
-about:
-  home: https://github.com/jaraco/zipp
-  license: MIT
-  license_family: MIT
-  summary: A pathlib-compatible Zipfile object wrapper.
-
-extra:
-  recipe-maintainers: sgaist
diff --git a/python.txt b/python.txt
index 98683713..c77c2b52 100644
--- a/python.txt
+++ b/python.txt
@@ -23,8 +23,6 @@ conda/black
 conda/aspy.yaml
 conda/cfgv
 conda/identify
-conda/zipp
-conda/importlib-metadata
 conda/importlib-resources
 conda/nodeenv
 conda/pre-commit
-- 
GitLab