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.

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

[FIX] condainstall.bat: Add conda.bat and activate.bat scripts again #3389

Merged
merged 1 commit into from
Nov 13, 2018

Conversation

ales-erjavec
Copy link
Contributor

Issue

conda 4.5 no longer installs activate.bat and conda.bat in the created environment.

Fixes gh-3375

Description of changes

Add conda.bat and activate.bat scripts again.

Includes
  • Code changes
  • Tests
  • Documentation

@ajdapretnar
Copy link
Contributor

Thank you so much for working on this!

@codecov
Copy link

codecov bot commented Nov 12, 2018

Codecov Report

Merging #3389 into master will decrease coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #3389      +/-   ##
==========================================
- Coverage   82.28%   82.27%   -0.01%     
==========================================
  Files         358      358              
  Lines       63798    63798              
==========================================
- Hits        52493    52491       -2     
- Misses      11305    11307       +2

@lanzagar lanzagar added this to the 3.18 milestone Nov 12, 2018
@ajdapretnar
Copy link
Contributor

What is a good way to tests this? Any unofficial installers with this patch available?

@ales-erjavec
Copy link
Contributor Author

ales-erjavec commented Nov 12, 2018

Orange3-3.17.0-Miniconda-x86_64.exe

Installer for 3.17.0 recreated by running (with makensis on $PATH):

./scripts/windows/build-conda-installer.sh --platform win_amd64 --env-spec /dev/stdin --online no <<EOF
# This file may be used to create an environment using:
# $ conda create --name <env> --file <this file>
# platform: win-64
@EXPLICIT
https://repo.anaconda.com/pkgs/free/win-64/blas-1.0-mkl.tar.bz2#e8aa6b7daaf0925245c148aaeaa0722e
https://repo.anaconda.com/pkgs/main/win-64/ca-certificates-2018.03.07-0.tar.bz2#df2f346c2e8351372e6935ae6654da75
https://repo.anaconda.com/pkgs/main/win-64/icc_rt-2017.0.4-h97af966_0.tar.bz2#944301e089acd37660e124d78f0b3a34
https://repo.anaconda.com/pkgs/main/win-64/intel-openmp-2019.0-118.tar.bz2#5262b8fea42c4219952b3fe589b7a1ee
https://repo.anaconda.com/pkgs/main/win-64/vs2015_runtime-14.15.26706-h3a45250_0.tar.bz2#6a9e60c0d113a7d1e9f72c38e4f6c05d
https://conda.anaconda.org/conda-forge/win-64/jpeg-9b-vc14_1.tar.bz2#1069788c01683ef4054d1085509f662a
https://repo.anaconda.com/pkgs/main/win-64/mkl-2019.0-118.tar.bz2#90ec1f3a6ebafff38eec2d318ef8cf52
https://conda.anaconda.org/conda-forge/win-64/openssl-1.0.2o-vc14_0.tar.bz2#6b0014b7d85346011278e88f33877eab
https://conda.anaconda.org/conda-forge/win-64/tk-8.5.19-vc14_0.tar.bz2#22961e7e97bcc627c429ebe366220a99
https://repo.anaconda.com/pkgs/main/win-64/vc-14.1-h0510ff6_4.tar.bz2#00bfe39f46f67409a376939cd2ab5039
https://conda.anaconda.org/conda-forge/win-64/zlib-1.2.11-vc14_0.tar.bz2#6633fda3af7ef750def72e3ec5f5014d
https://repo.anaconda.com/pkgs/main/win-64/icu-58.2-ha66f8fd_1.tar.bz2#8b9a078b693623d58afd56f4f2a162c3
https://repo.anaconda.com/pkgs/main/win-64/libpng-1.6.35-h2a8f88b_0.tar.bz2#ea6da2af7667dff0f686cac6210b1633
https://repo.anaconda.com/pkgs/main/win-64/python-3.6.7-h33f27b4_0.tar.bz2#659de2a2d5062a19cd8c2d07c971a677
https://repo.anaconda.com/pkgs/main/win-64/sqlite-3.25.2-hfa6e2cd_0.tar.bz2#d1521d9daeef76ee65285e3593dfcf9a
https://repo.anaconda.com/pkgs/main/win-64/asn1crypto-0.24.0-py36_0.tar.bz2#a0a7514683fc72a9b8ca218c76a0f854
https://repo.anaconda.com/pkgs/main/win-64/certifi-2018.10.15-py36_0.tar.bz2#f14301be8eea227ee3672059ca41b4a3
https://repo.anaconda.com/pkgs/main/win-64/chardet-3.0.4-py36_1.tar.bz2#ed144f5416f8caf429e5421d37f2ae52
https://repo.anaconda.com/pkgs/main/win-64/cryptography-vectors-2.3.1-py36_0.tar.bz2#f50d7d5dba8f89d86ecbdc7aeb11a35f
https://repo.anaconda.com/pkgs/main/win-64/decorator-4.3.0-py36_0.tar.bz2#8b778fbdf44210fbce2147c04306e92d
https://repo.anaconda.com/pkgs/main/win-64/docutils-0.14-py36h6012d8f_0.tar.bz2#9d43960c1822126eae5f541ecf0edc65
https://repo.anaconda.com/pkgs/main/win-64/future-0.16.0-py36_2.tar.bz2#889c4c19d9125e24ce0d4b4767f48b94
https://repo.anaconda.com/pkgs/main/win-64/idna-2.7-py36_0.tar.bz2#a296fd058971b640666f84e45eb7f0ff
https://repo.anaconda.com/pkgs/main/win-64/joblib-0.12.5-py36_0.tar.bz2#def7c72683f49f0619f2308ca0860420
https://repo.anaconda.com/pkgs/main/win-64/pycparser-2.19-py36_0.tar.bz2#916a2d9a1840e412a60ed5c3b96a7002
https://repo.anaconda.com/pkgs/main/win-64/pyparsing-2.2.2-py36_0.tar.bz2#6d877727cb9d68a8e4252eec4a7034c1
https://repo.anaconda.com/pkgs/main/win-64/pytz-2018.5-py36_0.tar.bz2#6d5522505f8f938d64f0ae42cdfab0c1
https://repo.anaconda.com/pkgs/main/win-64/pywin32-223-py36hfa6e2cd_1.tar.bz2#2b054becb70649e0b2207410e2513cbc
https://repo.anaconda.com/pkgs/main/win-64/qt-5.6.2-vc14h6f8c307_12.tar.bz2#4a23c549d9f4c991db1afc23d3307183
https://repo.anaconda.com/pkgs/main/win-64/sip-4.18.1-py36h6538335_2.tar.bz2#65bea0ba643843c8a5fd46ea00895b21
https://repo.anaconda.com/pkgs/main/win-64/six-1.11.0-py36_1.tar.bz2#fffd836c273b706d8ab399fd8eda6f77
https://repo.anaconda.com/pkgs/main/win-64/win_inet_pton-1.0.1-py36_1.tar.bz2#0ecd051cc71116433db6a9be284b8f5c
https://repo.anaconda.com/pkgs/main/win-64/wincertstore-0.2-py36h7fe50ca_0.tar.bz2#6c0c44d1a1e2d83e508dbce508c6f009
https://repo.anaconda.com/pkgs/main/win-64/xlrd-1.1.0-py36_1.tar.bz2#051e1dc76faeca752eb336b810395310
https://repo.anaconda.com/pkgs/main/win-64/cffi-1.11.5-py36h74b6da3_1.tar.bz2#78c6778fcc260f4337f4b8e17ae3ae37
https://repo.anaconda.com/pkgs/main/win-64/commonmark-0.8.1-py36_0.tar.bz2#2a2642b0d16285156f5a1458a5adf38b
https://repo.anaconda.com/pkgs/main/win-64/cycler-0.10.0-py36h009560c_0.tar.bz2#5d045387250c9b55097d3be01af54b11
https://conda.anaconda.org/conda-forge/win-64/keyring-9.0-py36_0.tar.bz2#439855ad00016a37f8c02660fe230a2c
https://repo.anaconda.com/pkgs/main/win-64/pyqt-5.6.0-py36ha878b3d_6.tar.bz2#548cfaa08ef4fb05b0788594879de098
https://repo.anaconda.com/pkgs/main/win-64/pysocks-1.6.8-py36_0.tar.bz2#1d4d4d775522356933daeb0a9fa85ebc
https://repo.anaconda.com/pkgs/main/win-64/python-dateutil-2.7.3-py36_0.tar.bz2#693caf136a0f3d3075a4884a2089b57e
https://repo.anaconda.com/pkgs/main/win-64/setuptools-40.4.3-py36_0.tar.bz2#8c4c40817a41dc56b8859831e7caae82
https://repo.anaconda.com/pkgs/main/win-64/anyqt-0.0.10-py36_0.tar.bz2#b53ee337a0ef6e6a1a90f4e880465844
https://repo.anaconda.com/pkgs/main/win-64/cryptography-2.3-py36h74b6da3_0.tar.bz2#f6d3dca3c6c8c02661d067fbced37d18
https://repo.anaconda.com/pkgs/main/win-64/keyrings.alt-3.1-py36_0.tar.bz2#58f5f5d04a86d2acc5cdc40c0337f5e9
https://repo.anaconda.com/pkgs/main/win-64/networkx-2.2-py36_1.tar.bz2#712dff0d6d7800f238772e4b885a85d3
https://repo.anaconda.com/pkgs/main/win-64/wheel-0.32.2-py36_0.tar.bz2#59e03a204be167c832c73bf0758574d4
https://repo.anaconda.com/pkgs/main/win-64/pip-10.0.1-py36_0.tar.bz2#61db32787a812aabffe126d4e1b5d293
https://repo.anaconda.com/pkgs/main/win-64/pyopenssl-18.0.0-py36_0.tar.bz2#bd7e3baa410bf847f3894803cd7cd771
https://repo.anaconda.com/pkgs/main/win-64/python-louvain-0.11-py36h28b3542_0.tar.bz2#dca77f5aa0a8c24a0f70c77f72ec3d3b
https://repo.anaconda.com/pkgs/main/win-64/urllib3-1.23-py36_0.tar.bz2#d9f7876d3498538e1f140ea77081d46e
https://repo.anaconda.com/pkgs/main/win-64/requests-2.19.1-py36_0.tar.bz2#80b9dabd66fce9413b320472442cefc6
https://repo.anaconda.com/pkgs/main/win-64/serverfiles-0.2.1-py36_0.tar.bz2#f803e499dcade5e35272ff0938b20c30
https://repo.anaconda.com/pkgs/main/win-64/bottleneck-1.2.1-py36h452e1ab_1.tar.bz2#fee379513d73fb059196658b1f5b3446
https://repo.anaconda.com/pkgs/free/win-64/matplotlib-2.0.2-np113py36_0.tar.bz2#67b34810501169a5aec479072be8ab59
https://repo.anaconda.com/pkgs/main/win-64/mkl_fft-1.0.6-py36hdbbee80_0.tar.bz2#9228b016ce78bdbbd105bbb7c72d455b
https://repo.anaconda.com/pkgs/main/win-64/mkl_random-1.0.1-py36h77b88f5_1.tar.bz2#a620e0e1acb966de2071824225183022
https://repo.anaconda.com/pkgs/main/win-64/numpy-1.13.3-py36h5c71026_4.tar.bz2#f6a33495394c8eb0d861e0c06ba1ab7c
https://repo.anaconda.com/pkgs/main/win-64/pyqtgraph-0.10.0-py36h28b3542_3.tar.bz2#295ad6c168c7fe008c30a37fbbb66bf5
https://repo.anaconda.com/pkgs/main/win-64/scipy-0.19.1-py36h7565378_3.tar.bz2#37868665323882b5733c8a5e7d50b0b8
https://repo.anaconda.com/pkgs/main/win-64/scikit-learn-0.19.2-py36heebcf9a_0.tar.bz2#38d8e31ad1d37db46b965c767e1e86f2
https://conda.anaconda.org/conda-forge/win-64/orange3-3.17.0-py36h830ac7b_0.tar.bz2
EOF

@lanzagar lanzagar merged commit d97871e into biolab:master Nov 13, 2018
@ales-erjavec ales-erjavec deleted the fixes/condainstall.bat branch May 20, 2019 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants