Skip to content

Commit

Permalink
fixup recipes and setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
kalefranz committed Apr 18, 2018
1 parent b4ee18a commit 4db2e2d
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 3 deletions.
2 changes: 0 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ include MANIFEST.in
include README.rst
include setup.cfg
include setup.py
recursive-exclude tests *
recursive-include conda/shell *
1 change: 1 addition & 0 deletions conda.recipe/bld.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
echo %PKG_VERSION% > conda\.version
python setup.py install --single-version-externally-managed --record record.txt
if %errorlevel% neq 0 exit /b %errorlevel%

Expand Down
12 changes: 12 additions & 0 deletions conda.recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
echo $PKG_VERSION > conda/.version
python setup.py install --single-version-externally-managed --record record.txt
rm -rf "$SP_DIR/conda/shell/*.exe"
conda init --install

# TODO: these are only meant to be temporary
rm -f "$PREFIX/bin/activate"
echo "#!/bin/sh" > "$PREFIX/bin/activate"
echo "_CONDA_ROOT=\"$PREFIX\"" >> "$PREFIX/bin/activate"
cat "$SP_DIR/conda/shell/bin/activate" >> "$PREFIX/bin/activate"

rm -f "$PREFIX/bin/deactivate"
echo "#!/bin/sh" > "$PREFIX/bin/deactivate"
echo "_CONDA_ROOT=\"$PREFIX\"" >> "$PREFIX/bin/deactivate"
cat "$SP_DIR/conda/shell/bin/deactivate" >> "$PREFIX/bin/deactivate"
13 changes: 12 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@
install_requires.append('menuinst')


def package_files(*root_directories):
return [
os.path.join('..', path, filename)
for directory in root_directories
for (path, directories, filenames) in os.walk(directory)
for filename in filenames
]


setup(
name=conda.__name__,
version=conda.__version__,
Expand Down Expand Up @@ -76,7 +85,9 @@
"utils",
".tox"
)),
include_package_data=True,
package_data={
'': package_files('conda/shell') + ['LICENSE'],
},
cmdclass={
'build_py': conda._vendor.auxlib.packaging.BuildPyCommand,
'sdist': conda._vendor.auxlib.packaging.SDistCommand,
Expand Down

0 comments on commit 4db2e2d

Please sign in to comment.