Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Config: Added zstd-static package to the conda environment configuration files #2540

Merged
merged 6 commits into from
Feb 18, 2024
Merged

Config: Added zstd-static package to the conda environment configuration files #2540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d703a6f
Added `flex` and `zstd-static=1.5.5` packages.
kmr-srbh Feb 17, 2024
c5731b7
Added `flex` and `zstd-static=1.5.5` packages.
kmr-srbh Feb 17, 2024
433e4af
Incorporated suggestions from #2537
kmr-srbh Feb 17, 2024
bfa0cde
Updated README.md to reflect changes suggested in #2537
kmr-srbh Feb 17, 2024
a68a0b2
Remove `flex`
kmr-srbh Feb 17, 2024
94ea770
Remove `flex`
kmr-srbh Feb 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,10 @@ Follow the steps below to install and run LPython on Linux, Windows or macOS.

- ### Set up your system
- Linux
- Make sure you have `g++` and `cmake` installed. If not, install them using the below command:
- Run the following command to install some global build dependencies:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the first step in linux should be creating the conda environment. The next step can be installing the required global build dependencies.

Similarly, update for docs/src/installation.md.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand your point @Shaikh-Ubaid, but moving this section will logically separate the conda environment creation part for Linux and Windows. As installing the global dependencies takes some time for a new contributor, I let it remain at the top.

The user can perhaps download Miniforge in the meantime. 😄

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, it seems fine for now.


```bash
sudo apt-get install g++ cmake
```

- Run the following command to install the build dependencies:

```bash
sudo apt-get install binutils-dev build-essential zlib1g-dev bison re2c flex
sudo apt-get install build-essential binutils-dev clang zlib1g-dev
```
- Windows
- Download and install [Microsoft Visual Studio Community](https://visualstudio.microsoft.com/downloads/) for free.
Expand Down
10 changes: 2 additions & 8 deletions doc/src/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,10 @@ Follow the steps below to install and run LPython on Linux, Windows or macOS.

- ### Set up your system
- Linux
- Make sure you have `g++` and `cmake` installed. If not, install them using the below command:
- Run the following command to install some global build dependencies:

```bash
sudo apt-get install g++ cmake
```

- Run the following command to install the build dependencies:

```bash
sudo apt-get install binutils-dev build-essential zlib1g-dev bison re2c flex
sudo apt-get install build-essential binutils-dev clang zlib1g-dev
```
- Windows
- Download and install [Microsoft Visual Studio Community](https://visualstudio.microsoft.com/downloads/) for free.
Expand Down
19 changes: 10 additions & 9 deletions environment_unix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ name: lp
channels:
- conda-forge
dependencies:
- bison=3.4
- cmake
- flake8
- llvmdev=11.0.1
- make
- numpy
- git
- pip
- python=3.10.2
- make
- re2c
- setuptools
- toml
- zlib
- git
- cmake
- numpy
- flake8
- setuptools
- bison=3.4
Comment on lines +11 to +15
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it needed to change the order of specifying dependencies here? It seems hard to interpret which packages where removed and which ones were added.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am sorry for the inconvenience. I did this to improve readability.

- python=3.10.2
- llvmdev=11.0.1
- zstd-static=1.5.5
23 changes: 12 additions & 11 deletions environment_win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@ name: lp
channels:
- conda-forge
dependencies:
- python=3.10.2
- numpy
- flake8
- git
- pip
- make
- re2c
- toml
- zlib
- cmake
- ninja
- numpy
- xonsh
- flake8
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am unsure of the changes in conda for windows.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In both the files, only the zstd-static package was added.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, good.

- setuptools
- llvmdev=11.1.0
- python=3.10.2
- m2-bison=3.0.4
- re2c
- xonsh
- ninja
- cmake
- make
- zlib
- git
- llvmdev=11.1.0
- zstd-static=1.5.5
Loading