Skip to content

Commit

Permalink
Combinatorica as submodule (#1226)
Browse files Browse the repository at this point in the history
Remove Combinatorica from this repository but include it as a git
submodule from Mathics3-Combinatorical.

As a by-product, version 2.0.0 of Combinatorica is also now available.
An additional CI job is set up to run the Combinatorica tests that we
have (currently for v0.9). These will be expanded soon.
 And possibly we may include v2.0.0 tests as well. 

To be determined if we want the one CI just to run tests for other
packages as well.
  • Loading branch information
rocky authored Dec 17, 2024
1 parent fb986ef commit e2ceab3
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 7,525 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/packages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Mathics3 Packages (ubuntu)

on:
push:
branches: [ master ]
pull_request:
branches: '**'

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.11']
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install OS dependencies
run: |
sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev tesseract-ocr remake
- name: Install Mathics3 with full dependencies
run: |
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]
cd src/mathics-scanner/
pip install -e .
python -m mathics_scanner.generate.build_tables
cd ../..
- name: Run Mathics3 Combinatorica tests
run: |
git submodule init
git submodule update
remake -x develop
cd mathics/packages/Combinatorica-repo
pip install -e .[dev]
remake -x check
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "mathics/packages/Combinatorica-repo"]
path = mathics/packages/Combinatorica-repo
url = https://github.com/Mathics3/Mathics3-Combinatorica.git
1 change: 1 addition & 0 deletions mathics/packages/Combinatorica-repo
Submodule Combinatorica-repo added at 680999
3,369 changes: 0 additions & 3,369 deletions mathics/packages/DiscreteMath/CombinatoricaV0.6.m

This file was deleted.

1 change: 1 addition & 0 deletions mathics/packages/DiscreteMath/CombinatoricaV0.6.m
3,515 changes: 0 additions & 3,515 deletions mathics/packages/DiscreteMath/CombinatoricaV0.9.m

This file was deleted.

1 change: 1 addition & 0 deletions mathics/packages/DiscreteMath/CombinatoricaV0.9.m
1 change: 1 addition & 0 deletions mathics/packages/DiscreteMath/CombinatoricaV2.0.0.m
8 changes: 8 additions & 0 deletions mathics/packages/DiscreteMath/Kernel/init.m
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
(* -*- wolfram -*- *)
(* DiscreteMath`CombinatoricaV0.9 goes with:
Implementing Discrete Mathematics: Combinatorics and Graph Theory
Expand All @@ -12,6 +13,13 @@
Get[ "DiscreteMath`CombinatoricaV0.6" ]
Get[ "DiscreteMath`CombinatoricaV0.9" ]

(* The revised edition of the book is:
*Computational Discrete Mathematics: Combinatorics and Graph Theory in
Mathematica*, by Sriram V. Pemmaraju and Steven S. Skiena, Cambridge
University Press, 2003.
*)
Get[ "DiscreteMath`CombinatoricaV2.0.0" ]

(* The below is from https://library.wolfram.com/infocenter/MathSource/6825/
An alpha test version is at:
http://www.nic.funet.fi/index/Science/math/mathematica/Logic/RSolve.m
Expand Down
Loading

0 comments on commit e2ceab3

Please sign in to comment.