Skip to content

Commit

Permalink
Back to 3.12
Browse files Browse the repository at this point in the history
  • Loading branch information
prabhu committed Nov 16, 2024
1 parent 28bea57 commit 3eadf69
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 139 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.13'
python-version: '3.12'
- name: Use Node.js
uses: actions/setup-node@v4
with:
Expand All @@ -68,13 +68,13 @@ jobs:
sbt stage createDistribution
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SCALAPY_PYTHON_LIBRARY: "python3.13"
SCALAPY_PYTHON_LIBRARY: "python3.12"
- name: Export python requirements
run: |
python3.13 -m pip install --upgrade pip
python3.13 -m pip install poetry
python3.13 -m poetry export -f requirements.txt --with=science --without-hashes --output target/chen-science-requirements.txt
python3.13 -m poetry export -f requirements.txt --with=database --without-hashes --output target/chen-database-requirements.txt
python3.12 -m pip install --upgrade pip
python3.12 -m pip install poetry
python3.12 -m poetry export -f requirements.txt --with=science --without-hashes --output target/chen-science-requirements.txt
python3.12 -m poetry export -f requirements.txt --with=database --without-hashes --output target/chen-database-requirements.txt
- name: Upload chen to ghcr
run: |
cd target
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.13'
python-version: '3.12'
- name: Use Node.js
uses: actions/setup-node@v4
with:
Expand All @@ -54,11 +54,11 @@ jobs:
run: |
bash ./platform/frontends/php2atom/install.sh
npm install -g @appthreat/atom
python3.13 -m pip install --upgrade pip
python3.13 -m pip install poetry
python3.13 -m poetry config virtualenvs.create false
python3.13 -m poetry install --no-cache
python3.13 -m poetry run flake8 chenpy --count --select=E9,F63,F7,F82 --show-source --statistics
python3.12 -m pip install --upgrade pip
python3.12 -m pip install poetry
python3.12 -m poetry config virtualenvs.create false
python3.12 -m poetry install --no-cache
python3.12 -m poetry run flake8 chenpy --count --select=E9,F63,F7,F82 --show-source --statistics
- uses: actions/cache@v4
with:
path: |
Expand All @@ -69,7 +69,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8 -Djna.library.path=${{ env.Python3_ROOT_DIR }}"
SCALAPY_PYTHON_LIBRARY: "python3.13"
SCALAPY_PYTHON_LIBRARY: "python3.12"
if: runner.os != 'Windows'
- name: Compile and run tests
run: sbt scalafmtCheck +test
Expand All @@ -84,4 +84,4 @@ jobs:
cdxgen -t sbt -o bom.json . -p --no-recurse
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SCALAPY_PYTHON_LIBRARY: "python3.13"
SCALAPY_PYTHON_LIBRARY: "python3.12"
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.13'
python-version: '3.12'
- name: Use Node.js
uses: actions/setup-node@v4
with:
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8 -Djna.library.path=${{ env.Python3_ROOT_DIR }}"
SCALAPY_PYTHON_LIBRARY: "python3.13"
SCALAPY_PYTHON_LIBRARY: "python3.12"
if: runner.os != 'Windows'
- name: Compile and run tests
run: |
Expand All @@ -82,5 +82,5 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8 -Djna.library.path=${{ env.Python3_ROOT_DIR }}"
SCALAPY_PYTHON_LIBRARY: "python313"
SCALAPY_PYTHON_LIBRARY: "python312"
if: runner.os == 'Windows'
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.13'
python-version: '3.12'
- name: Use Node.js
uses: actions/setup-node@v4
with:
Expand All @@ -57,14 +57,14 @@ jobs:
sbt createDistribution
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SCALAPY_PYTHON_LIBRARY: "python3.13"
SCALAPY_PYTHON_LIBRARY: "python3.12"
- name: sbt publish
run: |
sbt publish
if: startsWith(github.ref, 'refs/tags/')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SCALAPY_PYTHON_LIBRARY: "python3.13"
SCALAPY_PYTHON_LIBRARY: "python3.12"
- name: Install and test
run: |
npm install -g @appthreat/atom
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
cdxgen -t sbt -o bom.json . --no-recurse
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SCALAPY_PYTHON_LIBRARY: "python3.13"
SCALAPY_PYTHON_LIBRARY: "python3.12"
- name: Create Release
if: startsWith(github.ref, 'refs/tags/')
uses: softprops/action-gh-release@v1
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Once the download finishes, the command will display the download location along
[21:53:36] INFO To run chennai console, add the following environment variables to your .zshrc or .bashrc:
export JAVA_OPTS="-Xmx16G"
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8 -Djna.library.path=<lib dir>"
export SCALAPY_PYTHON_LIBRARY=python3.13
export SCALAPY_PYTHON_LIBRARY=python3.12
export CHEN_HOME=/home/user/.local/share/chen
export PATH=$PATH:/home/user/.local/share/chen/platform:/home/user/.local/share/chen/platform/bin:
```
Expand Down
2 changes: 1 addition & 1 deletion chenpy/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def install_py_modules(pack="database"):
"About to install the science pack using conda. A new environment called 'chenpy-local' will be created."
)
with Progress(transient=True) as progress:
conda_install_script = """conda create --name chenpy-local python=3.13 -y
conda_install_script = """conda create --name chenpy-local python=3.12 -y
conda install -n chenpy-local -y
conda install -n chenpy-local -c conda-forge networkx -y
conda install -n chenpy-local -c pytorch pytorch torchtext cpuonly -y
Expand Down
5 changes: 2 additions & 3 deletions ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ENV JAVA_VERSION=$JAVA_VERSION \
PYTHONIOENCODING="utf-8" \
JAVA_OPTS="-XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:+ParallelRefProcEnabled -XX:+UseStringDeduplication -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=20 -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1" \
CHEN_DATAFLOW_TRACKED_WIDTH=128 \
SCALAPY_PYTHON_LIBRARY=python3.13 \
SCALAPY_PYTHON_LIBRARY=python3.12 \
ANDROID_HOME=/opt/android-sdk-linux \
CHEN_INSTALL_DIR=/opt/workspace \
PHP_PARSER_BIN=/opt/vendor/bin/php-parse \
Expand Down Expand Up @@ -64,10 +64,9 @@ RUN set -e; \
&& rm -rf /opt/miniconda3/miniconda.sh \
&& ln -s /opt/miniconda3/etc/profile.d/conda.sh /etc/profile.d/conda.sh \
&& echo ". /opt/miniconda3/etc/profile.d/conda.sh" >> ~/.bashrc \
&& conda install python=3.12 -y \
&& conda update -n base -c defaults conda -y \
&& conda config --add channels conda-forge \
&& conda install -n base conda-libmamba-solver -y \
&& conda config --set solver libmamba \
&& conda init bash \
&& bash -c /opt/conda-install.sh \
&& curl -LO https://repo.almalinux.org/almalinux/9/CRB/${ARCH_NAME}/os/Packages/graphviz-devel-2.44.0-26.el9.${ARCH_NAME}.rpm \
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ services:
target: /opt/chenpy
- action: sync
path: ./chenpy
target: /opt/miniconda3/lib/python3.13/site-packages/chenpy
target: /opt/miniconda3/lib/python3.12/site-packages/chenpy
volumes:
- ./notebooks:/opt/notebooks
- /tmp:/tmp
Expand Down
35 changes: 0 additions & 35 deletions testDistro.sh

This file was deleted.

77 changes: 0 additions & 77 deletions updateDependencies.sh

This file was deleted.

0 comments on commit 3eadf69

Please sign in to comment.