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

try turning off ignore_duplicate_files #51

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

try turning off ignore_duplicate_files #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c585bb
try turning off ignore_duplicate_files
bollwyvl Sep 30, 2019
71485a5
back to conda-forge forward
bollwyvl Sep 30, 2019
c724e2b
put back skip, but inside comment, for ci (and future)
bollwyvl Sep 30, 2019
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
4 changes: 2 additions & 2 deletions anaconda-project.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ commands:
env_spec: robotlab-dev

channels:
- https://conda.anaconda.org/anaconda
- https://conda.anaconda.org/conda-forge
- https://conda.anaconda.org/anaconda

env_specs:
_robots_from_jupyter:
description: the main build/test environment
channels:
- https://conda.anaconda.org/anaconda
- https://conda.anaconda.org/conda-forge
- https://conda.anaconda.org/anaconda
packages:
- conda >=4.7.12,<4.8
- conda-build >=3.18.9,<3.19
Expand Down
2 changes: 1 addition & 1 deletion ci/env-combine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: robotlab-combine

channels:
- https://conda.anaconda.org/anaconda
- https://conda.anaconda.org/conda-forge
- https://conda.anaconda.org/anaconda

dependencies:
- robotframework
2 changes: 1 addition & 1 deletion ci/env-lab.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: robotlab-lab

channels:
- https://conda.anaconda.org/anaconda
- https://conda.anaconda.org/conda-forge
- https://conda.anaconda.org/anaconda

dependencies:
- black
Expand Down
2 changes: 1 addition & 1 deletion ci/env-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: robotlab-main

channels:
- https://conda.anaconda.org/anaconda
- https://conda.anaconda.org/conda-forge
- https://conda.anaconda.org/anaconda

dependencies:
- conda >=4.7.12,<4.8
Expand Down
5 changes: 3 additions & 2 deletions constructor/construct.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ version: {{ version }}
company: Robots from Jupyter
post_install: post_install.bat [win]
post_install: post_install.sh [unix]
ignore_duplicate_files: True
# hopefully we can keep this on, but sometimes...
# ignore_duplicate_files: True
license_file: ../LICENSE

channels_remap:
Expand All @@ -12,8 +13,8 @@ channels_remap:

channels:
- {{ build_channel }}
- https://conda.anaconda.org/anaconda
- https://conda.anaconda.org/conda-forge
- https://conda.anaconda.org/anaconda

specs:
- python >={{ py_min }},<{{ py_max }}
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: _robots_from_jupyter

channels:
- https://conda.anaconda.org/anaconda
- https://conda.anaconda.org/conda-forge
- https://conda.anaconda.org/anaconda

dependencies:
- conda >=4.7.12,<4.8
Expand Down
4 changes: 2 additions & 2 deletions scripts/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
"--cache-dir",
CONDA_CACHE,
"-c",
"https://conda.anaconda.org/anaconda",
"-c",
"https://conda.anaconda.org/conda-forge",
"-c",
"https://conda.anaconda.org/anaconda",
"--python",
PY_MIN,
]
Expand Down