Merge pull request #5 from alphasentaurii/release/v0.2.x

Release/v0.2.6
spacetelescope · Nov 29, 2021 · 803b67f · 803b67f
2 parents 80a2794 + c3c2fc2
commit 803b67f
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 318 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,8 +23,8 @@ docs/_build
 
 # Packages/installer info
 *.egg
-spacekit.egg-info
-spacekit.egg-info/*
+*.egg-info/
+*spacekit.egg-info/
 dist
 build
 eggs
@@ -47,6 +47,8 @@ distribute-*.tar.gz
 .settings
 crds_cache
 *k2_lightcurve_cnn.py
+svm-data/
+docker/dev/
 
 # Mac OSX
 .DS_Store

diff --git a/docker/svm/Dockerfile b/docker/svm/Dockerfile
@@ -37,7 +37,7 @@ RUN yum remove -y kernel-devel   &&\
 
 WORKDIR /home/developer
 RUN mkdir /home/developer/scripts
-COPY scripts /home/developer/.
+COPY scripts /home/developer/scripts/.
 RUN chown -R developer:developer /home/developer
 
 COPY requirements.txt /home/developer/.
@@ -47,5 +47,5 @@ RUN pip install numpy~=1.21
 USER developer
 ENV SVM_QUALITY_TESTING=on
 ENV TF_CPP_MIN_LOG_LEVEL=2
-RUN conda init bash && source ~/.bashrc && conda activate && conda install typing-extensions
+RUN conda init bash && pip install typing-extensions
 CMD ["/bin/bash"]
diff --git a/docker/svm/requirements.txt b/docker/svm/requirements.txt
@@ -1,7 +1,2 @@
 spacekit
 drizzlepac
-# tensorflow==2.6.2
-# progressbar==2.5
-# tqdm==4.62.3
-# tables==3.6.1
-# plotly~=5.3.1
diff --git a/docker/svm/run-container.sh b/docker/svm/run-container.sh
@@ -3,6 +3,6 @@ src_data=${1:-"${HOME}/svm-data"} # "$(pwd)"/${svm_data}
 docker run \
 -it \
 -m=10000m \
---name spacekit_svm \
+--name spacekitsvm \
 --mount type=bind,source=${src_data},target=/home/developer/data \
-alphasentaurii/spacekit:svm
+alphasentaurii/spacekit:svm
diff --git a/setup.py b/setup.py
@@ -35,4 +35,4 @@
 
 
 #setup(use_scm_version={'write_to': 'spacekit/_version.py'})
-setup(version='0.2.5')
+setup(version='0.2.6')
diff --git a/spacekit.egg-info/PKG-INFO b/spacekit.egg-info/PKG-INFO
diff --git a/spacekit.egg-info/SOURCES.txt b/spacekit.egg-info/SOURCES.txt
diff --git a/spacekit.egg-info/dependency_links.txt b/spacekit.egg-info/dependency_links.txt
diff --git a/spacekit.egg-info/not-zip-safe b/spacekit.egg-info/not-zip-safe
diff --git a/spacekit.egg-info/requires.txt b/spacekit.egg-info/requires.txt
diff --git a/spacekit.egg-info/top_level.txt b/spacekit.egg-info/top_level.txt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,4 +35,4 @@


		#setup(use_scm_version={'write_to': 'spacekit/_version.py'})
		setup(version='0.2.5')
		setup(version='0.2.6')