Skip to content

Commit

Permalink
chore: Update to Cython3
Browse files Browse the repository at this point in the history
  As hoped, this upgrade significantly simplifies the install-requirements.sh
  script. Provides additional progress on numberscope#43.
  Note this must be tested with care (additional details in PR).
  Resolves numberscope#82.
  • Loading branch information
gwhitney committed Oct 23, 2023
1 parent a63d3cf commit 7fb8a56
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 16 deletions.
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ disruptive and wastefully repetitive if performed in each visitor's browser.

## Quick start

(Note there are also much more detailed, step-by-step instructions for
[installing backscope on Ubuntu](doc/install-ubuntu.md), which can perhaps
also be tailored to other Linux distributions or other operating systems.)

1. Install Git if need be and clone this repo from
`github.com/numberscope/backscope`. Switch to the top-level directory
of the clone.
Expand All @@ -28,10 +32,7 @@ disruptive and wastefully repetitive if performed in each visitor's browser.
need to install a package like "libpari-dev" on Ubuntu)
+ The GNU multi-precision arithmetic dev package
+ A C compiler and C build tools.
See also detailed instructions for
[installing backscope on Ubuntu](doc/install-ubuntu.md), which can
perhaps as well be tailored to other Linux distributions or other
operating systems.
See also the detailed Ubuntu instructions linked above.
3. Create a virtual environment, e.g., `python -m venv .venv`.
4. Activate the virtual environment, e.g., `source .venv/bin/activate`.
5. Install Python dependencies: `sh tools/install-requirements.sh`.
Expand Down
6 changes: 3 additions & 3 deletions requirements-freeze.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ certifi==2023.7.22
charset-normalizer==2.1.1
click==8.1.7
cypari2==2.1.3
cysignals==1.11.2
Cython==0.29.36
cysignals==1.11.4
Cython==3.0.4
Flask==3.0.0
Flask-Cors==3.0.10
Flask-Executor==1.0.0
Expand All @@ -21,7 +21,7 @@ jsonify==0.5
Mako==1.2.2
MarkupSafe==2.1.3
numpy==1.23.2
psycopg2-binary==2.9.7
psycopg2-binary==2.9.9
python-dateutil==2.8.2
python-dotenv==0.20.0
python-editor==1.0.4
Expand Down
9 changes: 0 additions & 9 deletions tools/install-requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,6 @@ NOV='No Python virtual environment active, exiting...'
if python -c "$INVENV"; then echo "$HASV"; else echo "$NOV"; exit 1; fi

if ! pip install --upgrade pip; then echo "pip failed"; exit 1; fi
if ! (pip install wheel==0.41.2 && pip install Cython==0.29.36)
then echo "Install failure (wheel or Cython)"; exit 1
fi
if ! (pip install cysignals==1.11.2 && pip install cypari2==2.1.3)
then echo "Install failure (cysignals or cypari2)"; exit 1
fi
if ! (pip install psycopg2-binary==2.9.7)
then echo "Failed to install psycopg2-binary"; exit 1
fi
if ! pip install -r requirements-freeze.txt;
then echo "Failed to install remaining requirements"; exit 1
fi
Expand Down

0 comments on commit 7fb8a56

Please sign in to comment.