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

chore(conda): remove main channel #1110

Merged
merged 2 commits into from
Jan 19, 2025
Merged

chore(conda): remove main channel #1110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5eeb2e4
chore(conda): remove main channel
vringar Jan 16, 2025
0715ce3
fix(conda): pin python to 3.12
vringar Jan 16, 2025
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
11 changes: 6 additions & 5 deletions docs/Release-Checklist.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ We aim to release a new version of OpenWPM with each new Firefox release (~1 rel
1. Go to: <https://hg.mozilla.org/releases/mozilla-release/tags>.
2. Find the commit hash for the Firefox release version you'd like to upgrade to.
3. Update the `TAG` variable in [`scripts/install-firefox.sh`](../scripts/install-firefox.sh#L12) to that hash and the comment to the new tag name.
2. Run `./scripts/update.sh`
3. Increment the version number in [VERSION](../VERSION)
4. Add a summary of changes since the last version to [CHANGELOG](../CHANGELOG.md)
5. Squash and merge the release PR to master.
6. Publish a new release from <https://github.com/openwpm/OpenWPM/releases>:
2. Check if we can unpin our python version (this requires Linux to test) See <https://github.com/openwpm/OpenWPM/issues/1111>
3. Run `./scripts/update.sh`
4. Increment the version number in [VERSION](../VERSION)
5. Add a summary of changes since the last version to [CHANGELOG](../CHANGELOG.md)
6. Squash and merge the release PR to master.
7. Publish a new release from <https://github.com/openwpm/OpenWPM/releases>:
1. Click "Draft a new release".
2. Enter the "Tag version" and "Release title" as `vX.X.X`.
3. In the description:
Expand Down
1 change: 0 additions & 1 deletion environment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
channels:
- conda-forge
- main
dependencies:
- beautifulsoup4=4.12.3
- black=24.10.0
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions scripts/environment-unpinned.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: openwpm
channels:
- conda-forge
- main
dependencies:
- beautifulsoup4
- click
Expand All @@ -19,7 +18,8 @@ dependencies:
- plyvel
- psutil
- pyarrow
- python
# See https://github.com/openwpm/OpenWPM/issues/1111
- python=3.12
- pyvirtualdisplay
- redis-py
- s3fs
Expand All @@ -29,7 +29,7 @@ dependencies:
- tblib
- wget
- pip:
- jsonschema
- domain-utils
- dataclasses-json
- domain-utils
- jsonschema
- tranco
2 changes: 1 addition & 1 deletion scripts/repin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ esac


# Export the environment including manually specify channels
conda env export --no-builds --override-channels -c conda-forge -c main -f ../environment.yaml
conda env export --no-builds --override-channels -c conda-forge -f ../environment.yaml

# Prune environment file to only things we want to pin
python prune-environment.py
Expand Down
Loading