Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6af8280
DEPS: update setuptools min version
fangchenli Jun 29, 2021
7bc5a42
update doc
fangchenli Jun 29, 2021
9ac6943
add setuptools to environment.yml
fangchenli Jun 29, 2021
8a12e21
remove setuptools from environment.yml
fangchenli Jun 30, 2021
66af51b
Merge remote-tracking branch 'upstream/master' into fix-setuptools-mi…
fangchenli Jun 30, 2021
49958c8
Merge remote-tracking branch 'upstream/master' into fix-setuptools-mi…
fangchenli Jul 1, 2021
0b812a0
fix doc
fangchenli Jul 1, 2021
73d59fe
Update doc/source/development/contributing_environment.rst
fangchenli Jul 1, 2021
eff688c
Merge remote-tracking branch 'upstream/master' into fix-setuptools-mi…
fangchenli Jul 2, 2021
d2351cd
Merge remote-tracking branch 'origin/fix-setuptools-min-version' into…
fangchenli Jul 2, 2021
bfdeab3
Merge remote-tracking branch 'upstream/master' into fix-setuptools-mi…
fangchenli Jul 2, 2021
fc3919f
Merge remote-tracking branch 'upstream/master' into fix-setuptools-mi…
fangchenli Jul 6, 2021
a390612
Merge remote-tracking branch 'upstream/master' into fix-setuptools-mi…
fangchenli Jul 7, 2021
67ab670
Merge remote-tracking branch 'upstream/master' into fix-setuptools-mi…
fangchenli Jul 8, 2021
efb2fc7
add instruction for upgrading setuptools
fangchenli Jul 8, 2021
4d578be
remove code-block
fangchenli Jul 8, 2021
dee8fc0
Merge remote-tracking branch 'upstream/master' into fix-setuptools-mi…
fangchenli Jul 26, 2021
bd661a5
Merge remote-tracking branch 'upstream/master' into fix-setuptools-mi…
fangchenli Jul 26, 2021
36eb657
Merge remote-tracking branch 'upstream/master' into fix-setuptools-mi…
fangchenli Jul 26, 2021
1d6c1e4
add setuptools to requirements.txt
fangchenli Jul 26, 2021
2aba478
add toml to pre-commit dependency list
fangchenli Jul 26, 2021
37d2c4f
Merge remote-tracking branch 'upstream/master' into fix-setuptools-mi…
fangchenli Jul 26, 2021
fe7b039
Merge remote-tracking branch 'upstream/master' into fix-setuptools-mi…
fangchenli Aug 2, 2021
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into fix-setuptools-mi…
…n-version
  • Loading branch information
fangchenli committed Jul 1, 2021
commit 49958c8c889be457fce58abb0c0a81077c200fa5

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.