Revert "Attempting to fix version conflict in CI (#1520)" (#1618)

Author: atalman

.circleci/unittest/linux/scripts/environment.yml

@@ -1,24 +1,22 @@
 channels:
   - defaults
-  - conda-forge
 dependencies:
   - flake8>=3.7.9
   - codecov
   - pip
-  - nltk
-  - requests
-  - pytest
-  - pytest-cov
-  - sacremoses
-  - spacy>=3.0
-  - sphinx
-  - tqdm
-  - certifi
-  - future
-  - expecttest
   - pip:
+    - dataclasses
+    - nltk
+    - requests
     - revtok
+    - pytest
+    - pytest-cov
     - pytest-pythonpath
+    - sacremoses
+    - spacy
+    - sphinx
     - sphinx-rtd-theme
+    - tqdm
+    - expecttest
     - https://github.com/explosion/spacy-models/releases/download/de_core_news_sm-3.0.0/de_core_news_sm-3.0.0.tar.gz#egg=de_core_news_sm==3.0.0
     - https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.0.0/en_core_web_sm-3.0.0.tar.gz#egg=en_core_web_sm==3.0.0

.circleci/unittest/windows/scripts/environment.yml

@@ -1,24 +1,24 @@
 channels:
   - defaults
-  - conda-forge
 dependencies:
   - flake8>=3.7.9
   - codecov
   - pip
-  - nltk
-  - requests
-  - pytest
-  - pytest-cov
-  - sacremoses
-  - spacy>=3.0
-  - sphinx
-  - tqdm
-  - certifi
-  - future
-  - expecttest
   - pip:
+    - dataclasses
+    - nltk
+    - requests
     - revtok
+    - pytest
+    - pytest-cov
     - pytest-pythonpath
+    - sacremoses
+    - spacy
+    - sphinx
     - sphinx-rtd-theme
+    - tqdm
+    - certifi
+    - future
+    - expecttest
     - https://github.com/explosion/spacy-models/releases/download/de_core_news_sm-3.0.0/de_core_news_sm-3.0.0.tar.gz#egg=de_core_news_sm==3.0.0
     - https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.0.0/en_core_web_sm-3.0.0.tar.gz#egg=en_core_web_sm==3.0.0

packaging/pkg_helpers.bash

@@ -197,10 +197,9 @@ setup_conda_pytorch_constraint() {
 
 # Translate CUDA_VERSION into CUDA_CUDATOOLKIT_CONSTRAINT
 setup_conda_cudatoolkit_constraint() {
-  export CONDA_BUILD_VARIANT="cuda"
+  export CONDA_CPUONLY_FEATURE=""
   if [[ "$(uname)" == Darwin ]]; then
     export CONDA_CUDATOOLKIT_CONSTRAINT=""
-    export CONDA_BUILD_VARIANT="cpu"
   else
     case "$CU_VERSION" in
       cu100)
@@ -211,7 +210,7 @@ setup_conda_cudatoolkit_constraint() {
         ;;
       cpu)
         export CONDA_CUDATOOLKIT_CONSTRAINT=""
-        export CONDA_BUILD_VARIANT="cpu"
+        export CONDA_CPUONLY_FEATURE="- cpuonly"
         ;;
       *)
         echo "Unrecognized CU_VERSION=$CU_VERSION"

packaging/torchtext/meta.yaml

@@ -1,4 +1,3 @@
-{% set build_variant = environ.get('CONDA_BUILD_VARIANT', 'cpu') %}
 package:
   name: torchtext
   version: "{{ environ.get('BUILD_VERSION') }}"
@@ -15,23 +14,15 @@ requirements:
   host:
     - python
     - setuptools
+    - cpuonly
     {{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT') }}
 
   run:
     - python
     - requests
     - tqdm
-    - pytorch-mutex 1.0 {{ build_variant }}  # [not osx ]
     {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
 
-  {% if build_variant == 'cpu' %}
-  run_constrained:
-    - cpuonly
-  {% elif not osx %}
-  run_constrained:
-     - cpuonly <0
-  {% endif %}
-
 build:
   string: py{{py}}
   script_env:
@@ -48,6 +39,7 @@ test:
 
   requires:
     - pytest
+    - cpuonly
 
 about:
   home: https://github.com/pytorch/text