Skip to content

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

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

Merged
merged 2 commits into from
Feb 17, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30ef7e4
Revert "Attempting to fix version conflict in CI (#1520)"
parmeet Feb 17, 2022
df63ba5
fix linter
parmeet Feb 17, 2022
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
22 changes: 10 additions & 12 deletions .circleci/unittest/linux/scripts/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
channels:
- defaults
- conda-forge
dependencies:
- 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
24 changes: 12 additions & 12 deletions .circleci/unittest/windows/scripts/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
channels:
- defaults
- conda-forge
dependencies:
- 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
5 changes: 2 additions & 3 deletions packaging/pkg_helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"
Expand Down
12 changes: 2 additions & 10 deletions packaging/torchtext/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{% set build_variant = environ.get('CONDA_BUILD_VARIANT', 'cpu') %}
package:
name: torchtext
version: "{{ environ.get('BUILD_VERSION') }}"
Expand All @@ -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:
Expand All @@ -49,6 +40,7 @@ test:

requires:
- pytest
- cpuonly

about:
home: https://github.com/pytorch/text
Expand Down