Skip to content

Commit

Permalink
Get ready for release 2.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rocky committed May 15, 2021
1 parent cb43def commit c004994
Show file tree
Hide file tree
Showing 8 changed files with 87 additions and 8 deletions.
20 changes: 20 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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,
8 changes: 4 additions & 4 deletions __pkginfo__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion admin-tools/pyenv-versions
Original file line number Diff line number Diff line change
Expand Up @@ -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'
12 changes: 12 additions & 0 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: '2'

services:
mathics:
build: ./docker
image: mathicsorg/mathics:latest

volumes:
- ./app/data:/usr/src/app/data

ports:
- "8000:8000"
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
47 changes: 47 additions & 0 deletions docker/Dockerfile-dev+debug
Original file line number Diff line number Diff line change
@@ -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"]
Binary file modified docker/django-db/mathics.sqlite
Binary file not shown.
2 changes: 1 addition & 1 deletion mathics_omnibus/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit c004994

Please sign in to comment.