[galaxyproject/galaxy] 9791dd: Fix regressions in library API
Branch: refs/heads/release_17.09 Home: https://github.com/galaxyproject/galaxy Commit: 9791dd22d4d9084989cafa3498ae313dd4cd13f0 https://github.com/galaxyproject/galaxy/commit/9791dd22d4d9084989cafa3498ae3... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-10-24 (Tue, 24 Oct 2017) Changed paths: M lib/galaxy/util/path/ntpath.py M lib/galaxy/webapps/galaxy/controllers/library_common.py Log Message: ----------- Fix regressions in library API Introduced in commit 93a8bfc7cb5e9c3395c5057910ec39d68ad787b4 Commit: a4a8f155376119277df2cfebd13376e919873c4f https://github.com/galaxyproject/galaxy/commit/a4a8f155376119277df2cfebd1337... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-24 (Tue, 24 Oct 2017) Changed paths: M lib/galaxy/util/path/ntpath.py M lib/galaxy/webapps/galaxy/controllers/library_common.py Log Message: ----------- Merge pull request #4854 from nsoranzo/release_16.07_fix_test_regressions [16.07] Fix regressions in library API Commit: 899b0d806808d29291bf132a8c9e45df31fc28e1 https://github.com/galaxyproject/galaxy/commit/899b0d806808d29291bf132a8c9e4... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-24 (Tue, 24 Oct 2017) Changed paths: M lib/galaxy/util/path/__init__.py Log Message: ----------- Fix galaxy.util.in_directory() - broken because it takes realpath of just one argument. Easy to see on Mac OS X since /tmp isn't really /tmp for instance: ``` % touch /tmp/moo % python
import galaxy.util galaxy.util.in_directory("/tmp/moo", "/tmp/moo") False
... and this is why the Travis tests are failing under Mac OS X. Broken with 93a8bfc7cb5e9c3395c5057910ec39d68ad787b4.
Commit: 4b5dc399b934542092bfe66c3c4e03acc3980d49
https://github.com/galaxyproject/galaxy/commit/4b5dc399b934542092bfe66c3c4e03acc3980d49
Author: John Chilton <jmchilton@gmail.com>
Date: 2017-10-25 (Wed, 25 Oct 2017)
Changed paths:
M lib/galaxy/util/__init__.py
Log Message:
-----------
Add basic test for in_directory.
Commit: fcb23eb8f878700bfd77384ef679a569c59f7a62
https://github.com/galaxyproject/galaxy/commit/fcb23eb8f878700bfd77384ef679a569c59f7a62
Author: John Chilton <jmchilton@gmail.com>
Date: 2017-10-25 (Wed, 25 Oct 2017)
Changed paths:
M lib/galaxy/util/__init__.py
Log Message:
-----------
Some documentation to clarify discussion on #4856.
Commit: 95f8f48416c5a4d2590120e965cf9714c752ed61
https://github.com/galaxyproject/galaxy/commit/95f8f48416c5a4d2590120e965cf9714c752ed61
Author: John Chilton <jmchilton@gmail.com>
Date: 2017-10-25 (Wed, 25 Oct 2017)
Changed paths:
M lib/galaxy/util/path/__init__.py
Log Message:
-----------
Doc fix thanks to @nsoranzo.
Commit: 7e08ba6f19346668350d358ee4eb01ef722e74e7
https://github.com/galaxyproject/galaxy/commit/7e08ba6f19346668350d358ee4eb01ef722e74e7
Author: John Chilton <jmchilton@gmail.com>
Date: 2017-10-25 (Wed, 25 Oct 2017)
Changed paths:
M lib/galaxy/util/__init__.py
M lib/galaxy/util/path/__init__.py
Log Message:
-----------
Rework in_directory fix to move realpath expansion into galaxy.util.
Commit: e3e28ddc2dac1c4faaa45a9764abc7970129beb3
https://github.com/galaxyproject/galaxy/commit/e3e28ddc2dac1c4faaa45a9764abc7970129beb3
Author: Nicola Soranzo <nsoranzo@tiscali.it>
Date: 2017-10-25 (Wed, 25 Oct 2017)
Changed paths:
M lib/galaxy/util/__init__.py
M lib/galaxy/util/path/__init__.py
Log Message:
-----------
Merge pull request #4856 from jmchilton/release_16.07_fix_in_directory
[16.07] Fix galaxy.util.in_directory()...
Commit: 90289b6116c6a6ba1f6f0b4cbdee059003f916a3
https://github.com/galaxyproject/galaxy/commit/90289b6116c6a6ba1f6f0b4cbdee059003f916a3
Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: 2017-10-25 (Wed, 25 Oct 2017)
Changed paths:
M lib/galaxy/util/__init__.py
M lib/galaxy/util/path/__init__.py
M lib/galaxy/util/path/ntpath.py
M lib/galaxy/webapps/galaxy/controllers/library_common.py
Log Message:
-----------
Merge branch 'release_16.07' into release_16.10
Commit: a7bf1601a1ad34e5896978e1bce9c8081aafbb05
https://github.com/galaxyproject/galaxy/commit/a7bf1601a1ad34e5896978e1bce9c8081aafbb05
Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: 2017-10-25 (Wed, 25 Oct 2017)
Changed paths:
M lib/galaxy/util/__init__.py
M lib/galaxy/util/path/__init__.py
M lib/galaxy/util/path/ntpath.py
M lib/galaxy/webapps/galaxy/controllers/library_common.py
Log Message:
-----------
Merge branch 'release_16.10' into release_17.01
Commit: 20621b7d09443fc80c8326d91bdd204decb80b81
https://github.com/galaxyproject/galaxy/commit/20621b7d09443fc80c8326d91bdd204decb80b81
Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: 2017-10-25 (Wed, 25 Oct 2017)
Changed paths:
M lib/galaxy/util/__init__.py
M lib/galaxy/util/path/__init__.py
M lib/galaxy/util/path/ntpath.py
M lib/galaxy/webapps/galaxy/controllers/library_common.py
Log Message:
-----------
Merge branch 'release_17.01' into release_17.05
Commit: 986031bf190b82317cf687ed7e82ebd6b2646957
https://github.com/galaxyproject/galaxy/commit/986031bf190b82317cf687ed7e82ebd6b2646957
Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: 2017-10-25 (Wed, 25 Oct 2017)
Changed paths:
M lib/galaxy/util/__init__.py
M lib/galaxy/util/path/__init__.py
M lib/galaxy/util/path/ntpath.py
M lib/galaxy/webapps/galaxy/controllers/library_common.py
Log Message:
-----------
Merge branch 'release_17.05' into release_17.09
Conflicts:
lib/galaxy/webapps/galaxy/controllers/library_common.py
Commit: 1baed58e1e7c813e6a87b5a83883c5940a78035d
https://github.com/galaxyproject/galaxy/commit/1baed58e1e7c813e6a87b5a83883c5940a78035d
Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: 2017-10-25 (Wed, 25 Oct 2017)
Changed paths:
M lib/galaxy/webapps/galaxy/api/library_datasets.py
Log Message:
-----------
Backport fix for E201 and E202 errors
>From commit 9b4de72ca68afc2353beff333775422039baae25
Compare: https://github.com/galaxyproject/galaxy/compare/01b244a81043...1baed58e1e7c
participants (1)
-
GitHub