diff --git a/NEWS.md b/NEWS.md new file mode 100644 index 00000000..2e88acbe --- /dev/null +++ b/NEWS.md @@ -0,0 +1,20 @@ +2.2.0 +----- + +Tracks Mathics 2.2.0 core release and related packages. + +1.0.0 +----- + +First public release. + +Pulls in + +* Mathics3, +* mathicsscript, and +* mathics-django. + +And pymathics modules: + +* pymathics-natlang, +* pymathics-graph, diff --git a/__pkginfo__.py b/__pkginfo__.py index 2ea3a105..1b1867af 100644 --- a/__pkginfo__.py +++ b/__pkginfo__.py @@ -27,15 +27,15 @@ def read(*rnames): IS_PYPY = "__pypy__" in sys.builtin_module_names install_requires = [ - "Mathics3 >= 2.1.0", - "mathicsscript >= 2.0.1", - "Mathics-Django >= 2.1.0", + "Mathics3 >= 2.2.0", + "mathicsscript >= 2.1.2", + "Mathics-Django >= 2.2.0", "pymathics-natlang", "pymathics-graph", ] py_modules = None -short_desc = "A Collection Mathics components to provide the ful Mathics experience" +short_desc = "A Collection Mathics components to provide the full Mathics experience" url = "http://github.com/Mathics3/mathics-omnibus" classifiers = [ diff --git a/admin-tools/pyenv-versions b/admin-tools/pyenv-versions index f32553bc..f9c3c2ee 100644 --- a/admin-tools/pyenv-versions +++ b/admin-tools/pyenv-versions @@ -5,4 +5,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then echo "This script should be *sourced* rather than run directly through bash" exit 1 fi -export PYVERSIONS='3.6.12 3.7.9 3.8.7 3.9.1' +export PYVERSIONS='3.6.13 3.7.10 3.8.10 3.9.5' diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml new file mode 100644 index 00000000..3cb23b56 --- /dev/null +++ b/docker-compose-dev.yml @@ -0,0 +1,12 @@ +version: '2' + +services: + mathics: + build: ./docker + image: mathicsorg/mathics:latest + + volumes: + - ./app/data:/usr/src/app/data + + ports: + - "8000:8000" diff --git a/docker/Dockerfile b/docker/Dockerfile index c1e197b0..bab3e724 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -18,8 +18,8 @@ RUN pip install --no-cache-dir -r requirements.txt COPY requirements-mathicsscript.txt ./ RUN pip install --no-cache-dir -r requirements-mathicsscript.txt -RUN pip install git+git://github.com/mathics/Mathics.git#egg=Mathics3 -RUN pip install git+git://github.com/Mathics3/mathics-django.git#egg=Mathics-Django +RUN pip install Mathics3 +RUN pip install Mathics-Django RUN pip install pymathics-natlang RUN pip install pymathics-graph RUN pip install mathicsscript diff --git a/docker/Dockerfile-dev+debug b/docker/Dockerfile-dev+debug new file mode 100644 index 00000000..07f8d562 --- /dev/null +++ b/docker/Dockerfile-dev+debug @@ -0,0 +1,47 @@ +FROM python:3.8-buster + +ENV MATHICS_HOME=/usr/src/app +ENV ENTRYPOINT_COMMAND="docker run -it {MATHICS_IMAGE}" + +WORKDIR $MATHICS_HOME + +COPY entrypoint.sh / +RUN chmod +x /entrypoint.sh + +COPY requirements.txt ./ +RUN apt-get update +RUN apt-get install -qq apt-utils +# we need libsqlite3-dev now if ubuntu doesn't come with that, we'll need +# to build our own Python +RUN apt-get install -qq liblapack-dev llvm-dev gfortran maria sqlite3 +RUN pip install --no-cache-dir -r requirements.txt +COPY requirements-mathicsscript.txt ./ +RUN pip install --no-cache-dir -r requirements-mathicsscript.txt + +RUN pip install git+git://github.com/mathics/Mathics.git#egg=Mathics3 +RUN python -m pip install -e git://github.com/Mathics3/mathics-django#egg=Mathics-Django +RUN pip install pymathics-natlang +RUN pip install pymathics-graph +RUN python -m pip install -e git://github.com/Mathics3/mathicsscript#egg=mathicsscript +RUN cd src/mathicsscript; make + +RUN python -m nltk.downloader wordnet omw +RUN python -m spacy download en + +# debug stuff +RUN apt-get install -qq emacs +RUN pip install trepan3k + +EXPOSE 8000 + +RUN groupadd mathics && \ + useradd -d $MATHICS_HOME -g mathics -m -s /bin/bash mathics && \ + mkdir -p $MATHICS_HOME/data && \ + chown -R mathics:mathics $MATHICS_HOME + +USER mathics +COPY django-db/mathics.sqlite /usr/src/app/.local/var/mathics/mathics.sqlite + +ENTRYPOINT ["/entrypoint.sh"] + +CMD ["--help"] diff --git a/docker/django-db/mathics.sqlite b/docker/django-db/mathics.sqlite index e1657578..ed7136e1 100644 Binary files a/docker/django-db/mathics.sqlite and b/docker/django-db/mathics.sqlite differ diff --git a/mathics_omnibus/version.py b/mathics_omnibus/version.py index b0f4ce8a..2130fa6d 100644 --- a/mathics_omnibus/version.py +++ b/mathics_omnibus/version.py @@ -4,4 +4,4 @@ # This file is suitable for sourcing inside POSIX shell as # well as importing into Python. That's why there is no # space around "=" below. -__version__="1.0.0" # noqa +__version__="2.2.0" # noqa