Skip to content

Commit

Permalink
Merge branch 'master' into 1d_OutputForm
Browse files Browse the repository at this point in the history
  • Loading branch information
mmatera authored Dec 8, 2024
2 parents 8e7d362 + 00f55a6 commit 8ae1e98
Show file tree
Hide file tree
Showing 91 changed files with 2,361 additions and 1,037 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ If this is too long, then try narrowing the problem to something short.

## Your Environment

<!-- _This information can be helpful..
<!-- _This information can be helpful...
**All: Mathics version, Installed Python Python packages.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/consistency-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
sudo apt update -qq && sudo apt install llvm-dev remake
python -m pip install --upgrade pip
# We can comment out after next Mathics-Scanner release
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
git clone https://github.com/Mathics3/mathics-scanner.git
cd mathics-scanner/
pip install -e .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
os: [macOS]
python-version: ['3.9', '3.10']
python-version: ['3.10', '3.11']
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
sudo apt update -qq && sudo apt install llvm-dev remake
python -m pip install --upgrade pip
# We can comment out after next Mathics-Scanner release
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
git clone https://github.com/Mathics3/mathics-scanner.git
cd mathics-scanner/
pip install -e .
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ubuntu-cython.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,12 @@ jobs:
sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev tesseract-ocr
python -m pip install --upgrade pip
# We can comment out after next Mathics-Scanner release
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
git clone https://github.com/Mathics3/mathics-scanner.git
cd mathics-scanner/
pip install -e .
cd ..
# python -m pip install Mathics-Scanner[full]
- name: Install Mathics with full dependencies
run: |
make develop-full-cython
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
git clone https://github.com/Mathics3/mathics-scanner.git
cd mathics-scanner/
pip install -e .
python -m mathics_scanner.generate.build_tables
cd ..
# python -m pip install Mathics-Scanner[full]
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ jobs:
- name: Install Mathics3 with Python dependencies
run: |
# We can comment out after next Mathics-Scanner release
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
git clone https://github.com/Mathics3/mathics-scanner.git
cd mathics-scanner
pip install -e .
python -m mathics_scanner.generate.build_tables
cd ..
# python -m pip install Mathics-Scanner[full]
Expand Down
30 changes: 15 additions & 15 deletions COPYING.txt
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
This file is about the copyright on Mathics and all included components.
This file is about the copyright on Mathics3 and all included components.

* ORIGINAL MATHICS CODE:

All original Mathics code is distributed under the terms of the
All original Mathics code is distributed under the terms of the
GNU General Public License, version 3.

This code is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.

The full text of the GPL is available below in this file. Details of
the licenses of the components of Mathics are included below as well.

* LICENSES OF INCLUDED DATA:

Mathics includes data from Wikipedia that is published under the Creative
Commons Attribution-Sharealike 3.0 Unported License and the GNU Free
Documentation License contributed by the respective authors that are listed
Mathics includes data from Wikipedia that is published under the Creative
Commons Attribution-Sharealike 3.0 Unported License and the GNU Free
Documentation License contributed by the respective authors that are listed
on the websites specified in "data/elements.txt".


* LICENSES OF INCLUDED SOFTWARE:

SOFTWARE LICENSE
----------------------------------------------
scripaculous MIT
Expand All @@ -31,14 +31,14 @@ MathJax Apache 2.0
Three.js MIT
pymimemagic BSD 3-Clause
SciPy BSD 3-Clause

CONTACT INFO:
Jan Poeschko; [email protected];
Jan Poeschko; [email protected];
https://mathics.org/

=========================================================================


GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Expand Down Expand Up @@ -713,7 +713,7 @@ may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

================================================================================

scriptaculous:
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,9 @@ latexdoc texdoc doc:
(cd mathics/doc/latex && $(MAKE) doc)

#: Build JSON ASCII to unicode opcode table and operator table
mathics/data/op-tables.json mathics/data/operators.json:
mathics/data/operator-tables.json mathics/data/op-tables.json mathics/data/operators.json:
$(BASH) ./admin-tools/make-op-tables.sh


#: Remove ChangeLog
rmChangeLog:
$(RM) ChangeLog || true
Expand Down
Loading

0 comments on commit 8ae1e98

Please sign in to comment.