Skip to content

Commit 6a248e5

Browse files
ricardoV94twiecki
authored andcommitted
Get rid of python-version specific conda dev environments
1 parent de4a08c commit 6a248e5

11 files changed

+13
-136
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ repos:
6969
- id: pip-from-conda
7070
additional_dependencies: [pyyaml]
7171
entry: python scripts/generate_pip_deps_from_conda.py
72-
files: ^conda-envs/environment-dev-py.+.yml$
72+
files: ^conda-envs/environment-dev.yml$
7373
language: python
7474
name: Generate pip dependency from conda
7575
- id: no-relative-imports

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ python:
99
path: .
1010

1111
conda:
12-
environment: "conda-envs/environment-dev-py38.yml"
12+
environment: "conda-envs/environment-dev.yml"
1313

1414
build:
1515
os: "ubuntu-20.04"

conda-envs/environment-dev-py38.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

conda-envs/environment-dev-py39.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

conda-envs/environment-dev-py37.yml renamed to conda-envs/environment-dev.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# "dev" conda envs are to be used by devs in setting their local environments
2-
name: pymc-dev-py37
2+
name: pymc-dev
33
channels:
44
- conda-forge
55
- defaults
@@ -16,7 +16,6 @@ dependencies:
1616
- numpy>=1.15.0
1717
- pandas>=0.24.0
1818
- pip
19-
- python=3.7
2019
- python-graphviz
2120
- scipy>=1.4.1
2221
- typing-extensions>=3.7.4

conda-envs/windows-environment-dev-py38.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

conda-envs/windows-environment-dev-py39.yml renamed to conda-envs/windows-environment-dev.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# "dev" conda envs are to be used by devs in setting their local environments
2-
name: pymc-dev-py39
2+
name: pymc-dev
33
channels:
44
- conda-forge
55
- defaults
@@ -16,7 +16,6 @@ dependencies:
1616
- numpy>=1.15.0
1717
- pandas>=0.24.0
1818
- pip
19-
- python=3.9
2019
- python-graphviz
2120
- scipy>=1.4.1
2221
- typing-extensions>=3.7.4

docs/source/contributing/pr_tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@ The preferred workflow for contributing to PyMC is to fork the [GitHub repositor
3434
:::{tab-item} Linux/MacOS
3535

3636
```bash
37-
conda env create -f conda-envs/environment-dev-py39.yml # or py3x
37+
conda env create -f conda-envs/environment-dev.yml
3838
```
3939
:::
4040
:::{tab-item} Windows
4141
```bash
42-
conda env create -f .\conda-envs\windows-environment-dev-py39.yml
42+
conda env create -f .\conda-envs\windows-environment-dev.yml
4343
```
4444
:::
4545
::::
4646

4747
```bash
48-
conda activate pymc-dev-py39
48+
conda activate pymc-dev
4949
pip install -e .
5050
```
5151

docs/source/contributing/python_style.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ __Pre-commit repeatedly complains about the same formatting changes__
5757

5858
Check the unstaged changes (see previous point).
5959

60-
__Whitespace changes in the `environment-dev-*.yml` files__
60+
__Whitespace changes in the `environment-dev.yml` files__
6161

6262
On Windows, there are some bugs in pre-commit hooks that can lead to changes in some environment YAML files.
6363
Until this is fixed upstream, you should __ignore these changes__.

scripts/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
88
# Switch to jovyan to avoid container runs as root
99
USER $NB_UID
1010

11-
COPY /conda-envs/environment-dev-py39.yml .
12-
RUN mamba env create -f environment-dev-py39.yml && \
13-
/bin/bash -c ". activate pymc-dev-py39 && \
11+
COPY /conda-envs/environment-dev.yml .
12+
RUN mamba env create -f environment-dev.yml && \
13+
/bin/bash -c ". activate pymc-dev && \
1414
mamba install -c conda-forge -y pymc" && \
1515
conda clean --all -f -y
1616

@@ -22,7 +22,7 @@ WORKDIR /home/jovyan/work
2222

2323
# For running from bash
2424
SHELL ["/bin/bash","-c"]
25-
RUN echo "conda activate pymc-dev-py39" >> ~/.bashrc && \
25+
RUN echo "conda activate pymc-dev" >> ~/.bashrc && \
2626
source ~/.bashrc
2727

2828
# For running from jupyter notebook

0 commit comments

Comments
 (0)