Skip to content

Commit c004994

Browse files
committed
Get ready for release 2.2.0
1 parent cb43def commit c004994

File tree

8 files changed

+87
-8
lines changed

8 files changed

+87
-8
lines changed

NEWS.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2.2.0
2+
-----
3+
4+
Tracks Mathics 2.2.0 core release and related packages.
5+
6+
1.0.0
7+
-----
8+
9+
First public release.
10+
11+
Pulls in
12+
13+
* Mathics3,
14+
* mathicsscript, and
15+
* mathics-django.
16+
17+
And pymathics modules:
18+
19+
* pymathics-natlang,
20+
* pymathics-graph,

__pkginfo__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ def read(*rnames):
2727
IS_PYPY = "__pypy__" in sys.builtin_module_names
2828

2929
install_requires = [
30-
"Mathics3 >= 2.1.0",
31-
"mathicsscript >= 2.0.1",
32-
"Mathics-Django >= 2.1.0",
30+
"Mathics3 >= 2.2.0",
31+
"mathicsscript >= 2.1.2",
32+
"Mathics-Django >= 2.2.0",
3333
"pymathics-natlang",
3434
"pymathics-graph",
3535
]
3636

3737
py_modules = None
38-
short_desc = "A Collection Mathics components to provide the ful Mathics experience"
38+
short_desc = "A Collection Mathics components to provide the full Mathics experience"
3939
url = "http://github.com/Mathics3/mathics-omnibus"
4040

4141
classifiers = [

admin-tools/pyenv-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
55
echo "This script should be *sourced* rather than run directly through bash"
66
exit 1
77
fi
8-
export PYVERSIONS='3.6.12 3.7.9 3.8.7 3.9.1'
8+
export PYVERSIONS='3.6.13 3.7.10 3.8.10 3.9.5'

docker-compose-dev.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: '2'
2+
3+
services:
4+
mathics:
5+
build: ./docker
6+
image: mathicsorg/mathics:latest
7+
8+
volumes:
9+
- ./app/data:/usr/src/app/data
10+
11+
ports:
12+
- "8000:8000"

docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ RUN pip install --no-cache-dir -r requirements.txt
1818
COPY requirements-mathicsscript.txt ./
1919
RUN pip install --no-cache-dir -r requirements-mathicsscript.txt
2020

21-
RUN pip install git+git://github.com/mathics/Mathics.git#egg=Mathics3
22-
RUN pip install git+git://github.com/Mathics3/mathics-django.git#egg=Mathics-Django
21+
RUN pip install Mathics3
22+
RUN pip install Mathics-Django
2323
RUN pip install pymathics-natlang
2424
RUN pip install pymathics-graph
2525
RUN pip install mathicsscript

docker/Dockerfile-dev+debug

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
FROM python:3.8-buster
2+
3+
ENV MATHICS_HOME=/usr/src/app
4+
ENV ENTRYPOINT_COMMAND="docker run -it {MATHICS_IMAGE}"
5+
6+
WORKDIR $MATHICS_HOME
7+
8+
COPY entrypoint.sh /
9+
RUN chmod +x /entrypoint.sh
10+
11+
COPY requirements.txt ./
12+
RUN apt-get update
13+
RUN apt-get install -qq apt-utils
14+
# we need libsqlite3-dev now if ubuntu doesn't come with that, we'll need
15+
# to build our own Python
16+
RUN apt-get install -qq liblapack-dev llvm-dev gfortran maria sqlite3
17+
RUN pip install --no-cache-dir -r requirements.txt
18+
COPY requirements-mathicsscript.txt ./
19+
RUN pip install --no-cache-dir -r requirements-mathicsscript.txt
20+
21+
RUN pip install git+git://github.com/mathics/Mathics.git#egg=Mathics3
22+
RUN python -m pip install -e git://github.com/Mathics3/mathics-django#egg=Mathics-Django
23+
RUN pip install pymathics-natlang
24+
RUN pip install pymathics-graph
25+
RUN python -m pip install -e git://github.com/Mathics3/mathicsscript#egg=mathicsscript
26+
RUN cd src/mathicsscript; make
27+
28+
RUN python -m nltk.downloader wordnet omw
29+
RUN python -m spacy download en
30+
31+
# debug stuff
32+
RUN apt-get install -qq emacs
33+
RUN pip install trepan3k
34+
35+
EXPOSE 8000
36+
37+
RUN groupadd mathics && \
38+
useradd -d $MATHICS_HOME -g mathics -m -s /bin/bash mathics && \
39+
mkdir -p $MATHICS_HOME/data && \
40+
chown -R mathics:mathics $MATHICS_HOME
41+
42+
USER mathics
43+
COPY django-db/mathics.sqlite /usr/src/app/.local/var/mathics/mathics.sqlite
44+
45+
ENTRYPOINT ["/entrypoint.sh"]
46+
47+
CMD ["--help"]

docker/django-db/mathics.sqlite

0 Bytes
Binary file not shown.

mathics_omnibus/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# This file is suitable for sourcing inside POSIX shell as
55
# well as importing into Python. That's why there is no
66
# space around "=" below.
7-
__version__="1.0.0" # noqa
7+
__version__="2.2.0" # noqa

0 commit comments

Comments
 (0)