Merge branch 't/28745/environment_yaml' into t/30947/src_doc_bootstrap__simplify_by_using_new_options_of__sage__package_list_

Author: Matthias Koeppe

.gitignore

@@ -18,6 +18,11 @@
 # no longer generated, but may still be in user worktrees
 /src/lib/pkgconfig
 
+/environment.yml
+/environment-optional.yml
+/src/environment.yml
+/src/environment-optional.yml
+
 # Various editors
 *~
 

Makefile

@@ -111,6 +111,10 @@ bootstrap-clean:
 	rm -f src/doc/en/installation/*.txt
 	rm -rf src/doc/en/reference/spkg/*.rst
 	rm -f src/doc/en/reference/repl/*.txt
+	rm -f environment.yml
+	rm -f src/environment.yml
+	rm -f environment-optional.yml
+	rm -f src/environment-optional.yml
 
 # Remove absolutely everything which isn't part of the git repo
 maintainer-clean: distclean bootstrap-clean

bootstrap

@@ -190,7 +190,11 @@ save () {
 	build/make/Makefile-auto.in \
 	src/doc/en/installation/*.txt \
 	src/doc/en/reference/spkg/*.rst \
-	src/doc/en/reference/repl/*.txt
+	src/doc/en/reference/repl/*.txt \
+	environment.yml \
+	src/environment.yml \
+	environment-optional.yml \
+	src/environment-optional.yml
 
     # Update version
     echo "$NEWCONFVERSION" >$PKG/package-version.txt

build/pkgs/4ti2/distros/conda.txt

@@ -0,0 +1 @@
+4ti2

build/pkgs/alabaster/distros/conda.txt

@@ -0,0 +1 @@
+alabaster

build/pkgs/alabaster/install-requires.txt

@@ -0,0 +1 @@
+alabaster >=0.7.12

build/pkgs/appnope/install-requires.txt

@@ -0,0 +1 @@
+appnope >=0.1.0

build/pkgs/attrs/distros/conda.txt

@@ -0,0 +1 @@
+attrs

build/pkgs/attrs/install-requires.txt

@@ -0,0 +1 @@
+attrs >=19.3.0

build/pkgs/babel/distros/conda.txt

@@ -0,0 +1 @@
+babel