Skip to content
Snippets Groups Projects
Commit f8716581 authored by Lloyd Carothers's avatar Lloyd Carothers
Browse files

Packaging and constructor. Issue with conflicting python issues obspy...

Packaging and constructor. Issue with conflicting python issues obspy conda-forge specs must be python <= 3.6, 3.7 not included.
parent e57e209d
No related branches found
No related tags found
No related merge requests found
...@@ -13,10 +13,10 @@ source: ...@@ -13,10 +13,10 @@ source:
requirements: requirements:
build: build:
- 'python >3' - 'python >=3.6,<3.7 '
- setuptools - setuptools
run: run:
- 'python >3' - 'python >=3.6,<3.7 '
- obspy - obspy
- 'pyqt >5.9' - 'pyqt >5.9'
......
...@@ -16,7 +16,7 @@ specs: ...@@ -16,7 +16,7 @@ specs:
- nexus - nexus
- conda - conda
post_install: reinstall_dateutil.sh post_install: reinstall_bad_packages.sh
exclude: exclude:
#- tk #- tk
......
#!/usr/bin/env bash #!/usr/bin/env bash
echo "Fixing some bad packaging in $PREFIX"
echo 'Reinstalling python-dateutil' echo 'Reinstalling python-dateutil'
$PREFIX/bin/conda remove python-dateutil --force -y $PREFIX/bin/conda remove python-dateutil --force -y
$PREFIX/bin/conda install python-dateutil --no-deps --offline -y $PREFIX/bin/conda install python-dateutil --no-deps --offline -y
echo 'Reinstalling pyparsing'
$PREFIX/bin/conda remove pyparsing --force -y
$PREFIX/bin/conda install pyparsing --no-deps --offline -y
echo 'Reinstalling cycler'
$PREFIX/bin/conda remove cycler --force -y
$PREFIX/bin/conda install cycler --no-deps --offline -y
...@@ -56,6 +56,6 @@ setup( ...@@ -56,6 +56,6 @@ setup(
packages=find_packages(include=['nexus']), packages=find_packages(include=['nexus']),
test_suite='tests', test_suite='tests',
url='https://git.passcal.nmt.edu/passoft/nexus', url='https://git.passcal.nmt.edu/passoft/nexus',
version='2018.178.b', version='2018.222.b',
zip_safe=False, zip_safe=False,
) )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment