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.

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

Changes for 3.1.3 release #1126

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions .github/nglview-gha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,3 @@ dependencies:
- mdtraj
- ambertools # have both pytraj and parmed
- pip
- pip:
- simpletraj


2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
python-version: [3.9, 3.11, 3.12]
python-version: ["3.10", "3.11", "3.12"]

steps:
- name: Checkout nglview repository
Expand Down
21 changes: 17 additions & 4 deletions devtools/release.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
#!/usr/bin/env python

"""
Steps:
- cd nglview/static
- git rm -rf ./*

- cd nglview/staticlab
- git rm -rf ./*

- cd js
- npm install
- cd ../nglview
- git add static staticlab
"""

import subprocess
import sys
from pathlib import Path
import time

HERE = Path(__file__).parents[1].resolve().absolute()
sys.path.insert(0, str(HERE))
Expand All @@ -18,13 +33,11 @@
print("front_end_version", front_end_version)

if front_end_version != latest_tag:
print(f"Version mismatch between front_end_version {front_end_version} and latest_tag {latest_tag}")
sys.exit(1)
print(f"WARNING: Version mismatch between front_end_version {front_end_version} and latest_tag {latest_tag}")
time.sleep(5)

print("\nMake sure to publish npm package")
output = subprocess.check_output(["npm", "search", "nglview-js-widgets"]).decode()
print(output)

subprocess.check_call('cd nglview/labextension && git clean -fdx .', shell=True)
subprocess.check_call('cd js && npm install && npm run copy:labextension', shell=True)
subprocess.check_call('python setup.py sdist', shell=True)
12 changes: 0 additions & 12 deletions devtools/update_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,6 @@

version = sys.argv[1]
HERE = Path(__file__).parents[1].resolve().absolute()
sys.path.insert(0, str(HERE))

import versioneer
dirty_version = versioneer.get_version()
clean_version = dirty_version.split('+')[0]

print(f"Current nglview version = {dirty_version}")
print(f"Front end version = {version}")

if parse_version(clean_version) != parse_version(version):
print("WARNING: Current nglview version should be equal to front end version")

pkg_file = HERE / "js/package.json"

content = []
Expand Down
2 changes: 1 addition & 1 deletion js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nglview-js-widgets",
"version": "3.1.0",
"version": "3.1.4",
"description": "nglview-js-widgets",
"keywords": [
"ipython",
Expand Down
2 changes: 1 addition & 1 deletion nglview/_frontend.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__frontend_version__ = '3.1.0'
__frontend_version__ = '3.1.4'
Loading
Loading