Skip to content

Commit

Permalink
Merge pull request #97 from saraedum/103
Browse files Browse the repository at this point in the history
Upgrade to 10.3
  • Loading branch information
saraedum authored May 26, 2024
2 parents 4635ef9 + e64c58f commit c6cb66f
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 46 deletions.
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -6,3 +10,6 @@ channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
zip_keys:
- - c_stdlib_version
- cdt_name
25 changes: 23 additions & 2 deletions .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 3 additions & 9 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .scripts/run_docker_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
build_platform: {osx_arm64: osx_64}
conda_forge_output_validation: true
provider: {linux_aarch64: default}
build_with_mambabuild: true
github:
branch_name: main
tooling_branch_name: main
Expand Down
60 changes: 30 additions & 30 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "sage" %}
{% set version = "10.2" %}
{% set version = "10.3" %}

package:
name: {{ name }}
Expand All @@ -14,24 +14,25 @@ requirements:
# We require all dependencies with at least that version that upstream uses
# in their SPKGs. For packages that (seem to) use semantic versioning and
# are at least 1.0.0, we limit the version to the next major release.
- alabaster >=0.7.12
- alabaster >=0.7.16
- arb
- babel >=2.12.1,<3
- babel >=2.14.0,<3
- bdw-gc >=8.0.4,<9
- blas-devel
- bleach >=5.0.1,<6
- bleach >=6.1.0,<7
- brial
- cddlib >=1!0.94m
- certifi
- cliquer
- cvxopt >=1.3.0,<2
- conway-polynomials >=0.8
- cvxopt >=1.3.2,<2
- cycler >=0.11.0
- cypari2
- cysignals
- cython >=3,<4
- decorator >=5.1.1,<6
- docutils >=0.17.1
- ecl >=21.2.1,<21.2.2.a0
- docutils >=0.20.1
- ecl >=23.9.9,<24
- eclib
- ecm
- entrypoints >=0.4
Expand All @@ -51,13 +52,13 @@ requirements:
- gsl
- iml
- ipykernel >=6.6.0,<7
- ipython >=8.6.0,<9
- ipywidgets >=8.0.2,<9
- ipython >=8.18.1,<9
- ipywidgets >=8.1.1,<9
- jinja2
- jmol >=14.29.52,<15
- jsonschema >=4.17.1,<5
- jupyter_client >=7.4.4,<8
- jupyter_core
- jsonschema >=4.17.3,<5
- jupyter_client >=8.3.1,<9
- jupyter_core >=5.3.2,<6
- lcalc
- libbraiding
- libflint
Expand All @@ -76,28 +77,28 @@ requirements:
- mpfi
- mpfr
- mpmath >=1.3.0,<2
- nauty >=2.8.6,<3
- nbclient >=0.7.0,<0.8
- nbconvert >=7.2.3,<8
- nbformat >=5.7.0,<6
- nauty >=2.8.8,<3
- nbclient >=0.8.0,<0.9
- nbconvert >=7.9.2,<8
- nbformat >=5.9.2,<6
- ncurses >=6.3,<7
- networkx >=3.1,<4
- notebook >=6.4.10,<7
- networkx >=3.2.1,<4
- notebook >=7.1.1,<8
- ntl
- numpy
- palp >=2.11,<3
- pari >=2.15.4,<3
- pexpect >=4.8.0,<5
- pkg-config
- pkgconfig
- pexpect >=4.9.0,<5
- pickleshare >=0.7.5,<1.0
- pillow >=10.1.0,<11
- pkg-config
- pkgconfig
- planarity
- ppl
- pplpy
- primecountpy >=0.1.0,<0.2.0
- ptyprocess >=0.7.0,<1
- pygments >=2.13.0,<3
- pygments >=2.17.2,<3
- pyparsing >=3.1.1,<4
- python >=3.9
- python-dateutil >=2.8.2,<3
Expand All @@ -110,27 +111,26 @@ requirements:
- rw
- sagelib {{ version }}
- sagemath-db-combinatorial-designs >=20140630
- sagemath-db-conway-polynomials >=0.5
- sagemath-db-elliptic-curves >=0.8.1
- sagemath-db-graphs >=20210214
- sagemath-db-polytopes >=20170220
- sagetex >=3.6.1,<4
- scipy >=1.11.3,<2
- scipy >=1.11.4,<2
- simplegeneric >=0.8.1,<1
- singular >=4.3.2p8,<4.4
- six >=1.16.0,<2
- sphinx >=5.2.3,<6
- sphinx >=7.2.6,<8
- sqlite >=3.36,<4
- symmetrica
- sympow >=2.023.6,<3
- sympy >=1.12,<2
- tachyon 0.99.*
- terminado >=0.17.0
- terminado >=0.17.1
- three.js 122
- tornado >=6.2,<7
- traitlets >=5.9.0,<6
- wcwidth >=0.2.5,<2
- widgetsnbextension >=4.0.8,<5
- tornado >=6.4,<7
- traitlets >=5.14.0,<6
- wcwidth >=0.2.12,<2
- widgetsnbextension >=4.0.9,<5
- zeromq >=4.3.5,<5
- zlib
- zn_poly
Expand Down
2 changes: 0 additions & 2 deletions recipe/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ export SAGE_ROOT=$PWD
ls $SAGE_ROOT
ls $SAGE_LOCAL
echo $SAGE_ROOT > "$SAGE_LOCAL/lib/sage-current-location.txt"
sed -i.bak "s@SAGE_ROOT=\"$PREFIX\"@SAGE_ROOT=\"$SAGE_ROOT\"@g" $PREFIX/bin/sage-env-config

export SAGE_NUM_THREADS_PARALLEL=$CPU_COUNT
export SAGE_NUM_THREADS=$CPU_COUNT

set +e
Expand Down

0 comments on commit c6cb66f

Please sign in to comment.