New upstream version 4.6.10+dfsg (57f5af75) · Commits · Debian Med / conda

.cla-signers

+6 −0

Original line number	Diff line number	Diff line
		@@ -13,12 +13,14 @@
		# work in conjunction with the .mailmap file at the root of this repository.

		3kwa \| Eugene Van den Bulke <eugene.vandenbulke@gmail.com> \| 2018-06-01
		ab12gu \| Abhay Gupta <ab18gu@gmail.com> \| 2018-03-02
		aburgm \| Armin Burgmeier <aburgmeier@bloomberg.net> \| 2018-07-24
		alanhdu \| Alan Du <alanhdu@gmail.com> \| 2018-06-05
		albertmichaelj \| Michael Albert <albertmichaelj@gmail.com> \| 2019-02-27
		aldanor \| Ivan Smirnov <i.s.smirnov@gmail.com> \| 2018-07-24
		alexbw \| Alex Wiltschko <alex.bw@gmail.com> \| 2018-05-23
		almarklein \| Almar Klein <almar.klein@gmail.com> \| 2018-06-04
		analog-cbarber \| Christopher Barber <christopher.barber@analog.com> \| 2019-03-22
		arkottke \| Albert Kottke <albert.kottke@gmail.com> \| 2018-07-23
		asmeurer \| Aaron Meurer <aaron.meurer@continuum.io> \| Anaconda, Inc.
		aterrel \| Andy R. Terrel <andy.terrel@gmail.com> \| Anaconda, Inc.
		@@ -92,6 +94,7 @@ Juanlu001 \| Juan Luis Cano Rodríguez <juanlu001@gmail.com> \| 2018-06-01
		jusjusjus \| jusjusjus <jschwabedal@gmail.com> \| 2018-06-04
		jwkvam \| Jacques Kvam <jwkvam@gmail.com> \| 2018-06-04
		kalefranz \| Kale Franz <kfranz@continuum.io> \| Anaconda, Inc.
		katietz \| Kai Tietz <ktietz@anaconda.com> \| Anaconda, Inc.
		kdeldycke \| Kevin Deldycke <kevin@deldycke.com> \| 2018-06-05
		kurtwheeler \| Kurt Wheeler <kurt.wheeler91@gmail.com> \| 2018-07-30
		lidavidm \| David Li <li.davidm96@gmail.com> \| Anaconda, Inc.
		@@ -123,6 +126,7 @@ murraryreadccdc \| M.G. Read <read@ccdc.cam.ac.uk> \| 2019-02-05
		mutirri \| irritum <kamil.kwiek@continuum.io> \| Anaconda, Inc.
		mwiebe \| Mark Wiebe <mwiebe@continuum.io> \| Anaconda, Inc.
		nehaljwani \| Nehal J Wani <nehaljw.kkd1@gmail.com> \| 2018-06-01
		nh3 \| Ni Huang <ni.huang@sanger.ac.uk> \| 2019-03-20
		nickeubank \| Nick Eubank <nickeubank@users.noreply.github.com> \| 2018-06-04
		nicoddemus \| Bruno Oliveira <nicoddemus@gmail.com> \| 2018-05-23
		njalerikson \| Odegard, Ken <ken.odegard@gmail.com> \| 2018-06-01
		@@ -151,6 +155,7 @@ shadowwalkersb \| shadow_walker <shadowwalkersb@gmail.com> \| 2018-06-04
		ShannonGreen \| Shannon Green <sgreen@cochlear.com> \| 2018-07-26
		soapy1 \| Sophia Castellarin <scastellarin@continuum.io> \| Anaconda, Inc.
		soxofaan \| Stefaan Lippens <stefaan@netlog.com> \| 2018-06-06
		spamlrot-tic \| Stephen Palmroth <spalmrot@tudor.com> \| 2019-03-26
		srossross \| srossross <srossross@gmail.com> \| Anaconda, Inc.
		stefanseefeld \| Stefan Seefeld <stefan@seefeld.name> \| Anaconda, Inc.
		stuarteberg \| Stuart Berg <bergs@janelia.hhmi.org> \| 2018-06-04
		@@ -170,6 +175,7 @@ vestuto \| Jason Vestuto <jvestuto@continuum.io> \| Anaconda, Inc.
		wojdyr \| Marcin Wojdyr <wojdyr@gmail.com> \| 2018-06-01
		wulmer \| Wolfgang Ulmer <wolfgang.ulmer@de.bosch.com> \| 2018-06-11
		Zaharid \| Zahari <zaharid@gmail.com> \| 2018-07-24
		zdog234 \| Zane Dufour <zane.dufour@gmail.com \| 2019-03-26
		zzag \| Vlad Zagorodniy <vladzzag@gmail.com> \| 2018-07-24

.gitattributes

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		*.sh text eol=lf
		*.psm1 text eol=lf
		dev/start text eol=lf

CHANGELOG.md

+64 −0

Original line number	Diff line number	Diff line
		## 4.6.10 (2019-04-01)

		### Bug fixes

		* Fix python-3 only FileNotFoundError usage in initialize.py (#8470)
		* Fix more JSON encode errors for the _Null data type (#8471)
		* Fix non-posix-compliant == in conda.sh (#8475, #8476)
		* improve detection of pip dependency in environment.yml files to avoid warning message (#8478)
		* fix condabin\conda.bat use of dp0, making PATH additions incorrect (#8480)
		* init_fish_user: don't assume config file exists (#8481)
		* Fix for chcp output ending with . (#8484)

		### Docs improvements

		* Changelogs for 4.6.8, 4.6.9

		### Contributors

		* @duncanmmacleod
		* @nehaljwani
		* @ilango100
		* @jjhelmus
		* @mingwandroid
		* @msarahan
		* @rrigdon


		## 4.6.9 (2019-03-29)

		### Improvements

		* Improve CI for docs commits (#8387, #8401, #8417)
		* Implement `conda init --reverse` to undo rc file and registry changes (#8400)
		* Improve handling of unicode systems (#8342, #8435)
		* Force the "COMSPEC" environment variable to always point to cmd.exe on windows. This was an implicit assumption that was not always true. (#8457, #8461)

		### Bug fixes

		* Add central C:/ProgramData/conda as a search path on Windows (#8272)
		* remove direct use of ruamel_yaml (prefer internal abstraction, yaml_load) (#8392)
		* Fix/improve `conda init` support for fish shell (#8437)
		* Improve solver behavior in the presence of inconsistent environments (such as pip as a conda dependency of python, but also installed via pip itself) (#8444)
		* Handle read-only filesystems for environments.txt (#8451, #8453)
		* Fix conda env commands involving pip-installed dependencies being installed into incorrect locations (#8435)

		### Docs improvements

		* updated cheatsheet (#8402)
		* updated color theme (#8403)

		### Contributors

		* @blackgear
		* @dhirschfeld
		* @jakirkham
		* @jjhelmus
		* @katietz
		* @mingwandroid
		* @msarahan
		* @nehaljwani
		* @rrigdon
		* @soapy1
		* @spamlrot-tic

		## 4.6.8 (2019-03-06)

		### Bug fixes

CONTRIBUTING.md

+15 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,21 @@ To set up an environment to start developing on conda code, we recommend the fol

		py.test tests/test_create.py -k create_install_update_remove_smoketest

		3.1 Test-suite issues

		If you do not have git installed and your test does not install it then
		queries to conda --version will except (yeah, this should get fixed). To
		workaround:

		git describe > conda/.version

		.. Then make this file PEP440 compliant.

		.. (initially an every time you commit).

		The tests-suite is very sensitive to the initial environment. We have make
		some effort to make the tests runnable in popular IDEs, and in PyCharm's
		case, many tests can be run from a clean environment (variable-wise)

		## Development Environment, Windows cmd.exe shell

Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -2,11 +2,13 @@ PYTEST_EXE ?= $(shell which py.test)
		PYTHON_EXE ?= $(shell sed 's/^\#!//' $(PYTEST_EXE) \| head -1 \| sed "s\|$HOME\|~\|")
		PYTHON_MAJOR_VERSION := $(shell $(PYTHON_EXE) -c "import sys; print(sys.version_info[0])")
		TEST_PLATFORM := $(shell $(PYTHON_EXE) -c "import sys; print('win' if sys.platform.startswith('win') else 'unix')")
		SYS_PREFIX := $(shell $(PYTHON_EXE) -c "import sys; print(sys.prefix)")
		PYTHONHASHSEED := $(shell python -c "import random as r; print(r.randint(0,4294967296))")


		PYTEST_VARS := PYTHONHASHSEED=$(PYTHONHASHSEED) PYTHON_MAJOR_VERSION=$(PYTHON_MAJOR_VERSION) TEST_PLATFORM=$(TEST_PLATFORM)
		PYTEST := $(PYTEST_VARS) $(PYTEST_EXE)
		# --basetemp is so that our environments are created via hardlinks, the most common way.
		PYTEST := $(PYTEST_VARS) $(PYTEST_EXE) --basetemp=$(SYS_PREFIX)/../conda.tmp

		ADD_COV := --cov-report xml --cov-report term-missing --cov-append --cov conda

Original line number	Diff line number	Diff line
		@@ -13,12 +13,14 @@
		# work in conjunction with the .mailmap file at the root of this repository.

		3kwa \| Eugene Van den Bulke <eugene.vandenbulke@gmail.com> \| 2018-06-01
		ab12gu \| Abhay Gupta <ab18gu@gmail.com> \| 2018-03-02
		aburgm \| Armin Burgmeier <aburgmeier@bloomberg.net> \| 2018-07-24
		alanhdu \| Alan Du <alanhdu@gmail.com> \| 2018-06-05
		albertmichaelj \| Michael Albert <albertmichaelj@gmail.com> \| 2019-02-27
		aldanor \| Ivan Smirnov <i.s.smirnov@gmail.com> \| 2018-07-24
		alexbw \| Alex Wiltschko <alex.bw@gmail.com> \| 2018-05-23
		almarklein \| Almar Klein <almar.klein@gmail.com> \| 2018-06-04
		analog-cbarber \| Christopher Barber <christopher.barber@analog.com> \| 2019-03-22
		arkottke \| Albert Kottke <albert.kottke@gmail.com> \| 2018-07-23
		asmeurer \| Aaron Meurer <aaron.meurer@continuum.io> \| Anaconda, Inc.
		aterrel \| Andy R. Terrel <andy.terrel@gmail.com> \| Anaconda, Inc.
		@@ -92,6 +94,7 @@ Juanlu001 \| Juan Luis Cano Rodríguez <juanlu001@gmail.com> \| 2018-06-01
		jusjusjus \| jusjusjus <jschwabedal@gmail.com> \| 2018-06-04
		jwkvam \| Jacques Kvam <jwkvam@gmail.com> \| 2018-06-04
		kalefranz \| Kale Franz <kfranz@continuum.io> \| Anaconda, Inc.
		katietz \| Kai Tietz <ktietz@anaconda.com> \| Anaconda, Inc.
		kdeldycke \| Kevin Deldycke <kevin@deldycke.com> \| 2018-06-05
		kurtwheeler \| Kurt Wheeler <kurt.wheeler91@gmail.com> \| 2018-07-30
		lidavidm \| David Li <li.davidm96@gmail.com> \| Anaconda, Inc.
		@@ -123,6 +126,7 @@ murraryreadccdc \| M.G. Read <read@ccdc.cam.ac.uk> \| 2019-02-05
		mutirri \| irritum <kamil.kwiek@continuum.io> \| Anaconda, Inc.
		mwiebe \| Mark Wiebe <mwiebe@continuum.io> \| Anaconda, Inc.
		nehaljwani \| Nehal J Wani <nehaljw.kkd1@gmail.com> \| 2018-06-01
		nh3 \| Ni Huang <ni.huang@sanger.ac.uk> \| 2019-03-20
		nickeubank \| Nick Eubank <nickeubank@users.noreply.github.com> \| 2018-06-04
		nicoddemus \| Bruno Oliveira <nicoddemus@gmail.com> \| 2018-05-23
		njalerikson \| Odegard, Ken <ken.odegard@gmail.com> \| 2018-06-01
		@@ -151,6 +155,7 @@ shadowwalkersb \| shadow_walker <shadowwalkersb@gmail.com> \| 2018-06-04
		ShannonGreen \| Shannon Green <sgreen@cochlear.com> \| 2018-07-26
		soapy1 \| Sophia Castellarin <scastellarin@continuum.io> \| Anaconda, Inc.
		soxofaan \| Stefaan Lippens <stefaan@netlog.com> \| 2018-06-06
		spamlrot-tic \| Stephen Palmroth <spalmrot@tudor.com> \| 2019-03-26
		srossross \| srossross <srossross@gmail.com> \| Anaconda, Inc.
		stefanseefeld \| Stefan Seefeld <stefan@seefeld.name> \| Anaconda, Inc.
		stuarteberg \| Stuart Berg <bergs@janelia.hhmi.org> \| 2018-06-04
		@@ -170,6 +175,7 @@ vestuto \| Jason Vestuto <jvestuto@continuum.io> \| Anaconda, Inc.
		wojdyr \| Marcin Wojdyr <wojdyr@gmail.com> \| 2018-06-01
		wulmer \| Wolfgang Ulmer <wolfgang.ulmer@de.bosch.com> \| 2018-06-11
		Zaharid \| Zahari <zaharid@gmail.com> \| 2018-07-24
		zdog234 \| Zane Dufour <zane.dufour@gmail.com \| 2019-03-26
		zzag \| Vlad Zagorodniy <vladzzag@gmail.com> \| 2018-07-24