Skip to content

Commit c3f566d

Browse files
authored
Merge pull request #100 from AllenInstitute/dont-use-multi-version
editable and multi-version do not work well together in pip
2 parents b7e13ce + 2b2ec9c commit c3f566d

File tree

6 files changed

+5
-14
lines changed

6 files changed

+5
-14
lines changed

DEVELOPMENT.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ Pinned requirements for running any/all services and base crossbar application i
2424

2525
conda env create -f environment-base.yml
2626
conda activate datacube
27-
conda env export > environment.yml
27+
conda env export | grep -v -f <(pip list --editable --format=freeze) > environment.yml
28+
29+
.. note:: Stripping of editable packages is necessary due to https://github.com/pypa/pip/issues/5031. This has to be done manually since ``conda env export`` lacks an ``--exclude-editable`` option like ``pip freeze``.
2830

2931
And used in production like:
3032

@@ -39,8 +41,6 @@ pip/setuptools
3941

4042
Individual sets of requirements can be managed by *requirements.txt* or *setup.py* as long as they can be added to ``environment-base.yml`` as included requirements (``-r``) or editable package installs (``-e``).
4143

42-
.. note:: ``conda env export`` lacks a ``--exclude-editable`` option like ``pip freeze``. To keep unpublished packages from appearing in the pinned requirements, a workaround is to supply the ``--multi-version`` option to *setup.py develop*. This is done by way of *setup.cfg* files, since pip does not honor ``--install-option`` options on editable (``-e``) requirements in *requirements.txt* files, nor by extension does conda do so within the ``pip`` section of *environment.yml* files.
43-
4444

4545
test dependencies
4646
^^^^^^^^^^^^^^^^^

environment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ dependencies:
5656
- olefile=0.45.1=py36_0
5757
- openssl=1.0.2o=h20670df_0
5858
- packaging=17.1=py36_0
59-
- pandas=0.23.2=py36h04863e7_0
59+
- pandas=0.23.3=py36h04863e7_0
6060
- partd=0.3.8=py36_0
6161
- patsy=0.5.0=py36_0
6262
- pcre=8.42=h439df22_0
@@ -105,7 +105,7 @@ dependencies:
105105
- chardet==3.0.4
106106
- constantly==15.1.0
107107
- crossbar==18.4.1
108-
- cryptography==2.2.2
108+
- cryptography==2.3
109109
- enum34==1.1.6
110110
- fasteners==0.14.1
111111
- h2==3.0.1

legacy_conn_routes/setup.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ universal = 1
55
[flake8]
66
exclude = docs
77

8-
[develop]
9-
multi-version = 1

services/locator/setup.cfg

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

services/pandas/setup.cfg

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

setup.cfg

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

0 commit comments

Comments
 (0)