From f577f155fb0c6e57b3ff82447ac25dcb3ca0080f Mon Sep 17 00:00:00 2001 From: Troy Hinckley Date: Wed, 4 Mar 2020 11:01:11 -0800 Subject: [PATCH 01/18] Fix Jedi not handling tilde in file paths Closes #383 --- pythonic.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythonic.el b/pythonic.el index ce796b7..ff77bc6 100644 --- a/pythonic.el +++ b/pythonic.el @@ -132,7 +132,7 @@ Take FILENAME from the perspective of the localhost and translate it to the FILENAME Python process can read. Python can be running locally or remotely. FILENAME can have local or tramp format. Result will have local format." - (let ((alias (pythonic-aliased-path filename))) + (let ((alias (pythonic-aliased-path (expand-file-name filename)))) (if (tramp-tramp-file-p alias) (tramp-file-name-localname (tramp-dissect-file-name alias)) alias))) From 7d67c7acab01143ac27e87d74b481d176448ed2d Mon Sep 17 00:00:00 2001 From: John Collins Date: Thu, 30 Jul 2020 22:18:39 -0700 Subject: [PATCH 02/18] Support sshx as SSH remote method name --- pythonic.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythonic.el b/pythonic.el index ff77bc6..b470bb7 100644 --- a/pythonic.el +++ b/pythonic.el @@ -56,7 +56,7 @@ (defun pythonic-remote-ssh-p () "Determine ssh remote virtual environment." (and (pythonic-remote-p) - (s-equals-p (pythonic-remote-method) "ssh"))) + (member (pythonic-remote-method) '("ssh" "sshx")))) (defun pythonic-remote-vagrant-p () "Determine vagrant remote virtual environment." From e0e5cc882f2f1316268ec461a34d4be8abc313b7 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Fri, 22 Jan 2021 13:47:53 +0100 Subject: [PATCH 03/18] Release version 0.2 --- pythonic.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pythonic.el b/pythonic.el index b470bb7..1bfd1d9 100644 --- a/pythonic.el +++ b/pythonic.el @@ -1,10 +1,10 @@ ;;; pythonic.el --- Utility functions for writing pythonic emacs package. -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2019 by Artem Malyshev +;; Copyright (C) 2015-2021 by Artem Malyshev ;; Author: Artem Malyshev ;; URL: https://github.com/proofit404/pythonic -;; Version: 0.1.1 +;; Version: 0.2 ;; Package-Requires: ((emacs "25.1") (s "1.9") (f "0.17.2")) ;; This program is free software; you can redistribute it and/or modify From fe75bc17baae314bf8f5e0b12aad3fccfc6c5397 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Date: Wed, 24 Mar 2021 14:09:07 +0800 Subject: [PATCH 04/18] Fix badge link --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 4a804eb..7fa4c9b 100644 --- a/README.markdown +++ b/README.markdown @@ -1,4 +1,4 @@ -# Pythonic [![MELPA](http://www.melpa.org/packages/pythonic-badge.svg)](http://www.melpa.org/#/pythonic) [![MELPA Stable](https://stable.melpa.org/packages/pythonic-badge.svg)](https://stable.melpa.org/#/pythonic) +# Pythonic [![MELPA](https://melpa.org/packages/pythonic-badge.svg)](https://melpa.org/#/pythonic) [![MELPA Stable](https://stable.melpa.org/packages/pythonic-badge.svg)](https://stable.melpa.org/#/pythonic) Utility functions for writing pythonic emacs package. From c18a5bd8cb2ba59014b6b29b5bf1903bd2476a07 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Sat, 23 Jul 2022 19:41:49 +0200 Subject: [PATCH 05/18] Deactivate virualenv when python-activate is calles with nil Fix #19 --- pythonic.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pythonic.el b/pythonic.el index 1bfd1d9..9a7f5cb 100644 --- a/pythonic.el +++ b/pythonic.el @@ -295,7 +295,8 @@ process flag." (defun pythonic-activate (virtualenv) "Activate python VIRTUALENV." (interactive "DEnv: ") - (setq python-shell-virtualenv-root (pythonic-python-readable-file-name virtualenv))) + (setq python-shell-virtualenv-root + (and virtualenv (pythonic-python-readable-file-name virtualenv)))) ;;;###autoload (defun pythonic-deactivate () From ad2ad0ce92e4d5e6ef698e4fb77ac89153eef301 Mon Sep 17 00:00:00 2001 From: JenChieh Date: Mon, 21 Aug 2023 10:12:42 -0700 Subject: [PATCH 06/18] test: Add CI --- .github/dependabot.yml | 6 +++++ .github/workflows/test.yml | 52 ++++++++++++++++++++++++++++++++++++++ .gitignore | 3 +++ Eask | 19 ++++++++++++++ Makefile | 33 ++++++++++++++++++++++++ pythonic.el | 2 +- 6 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/test.yml create mode 100644 Eask create mode 100644 Makefile diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..253bcb7 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: / + schedule: + interval: daily diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..bbc9581 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,52 @@ +name: CI + +on: + push: + branches: + - master + pull_request: + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + test: + runs-on: ${{ matrix.os }} + continue-on-error: ${{ matrix.experimental }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + emacs-version: + - 26.3 + - 27.2 + - 28.2 + - 29.1 + experimental: [false] + include: + - os: ubuntu-latest + emacs-version: snapshot + experimental: true + - os: macos-latest + emacs-version: snapshot + experimental: true + - os: windows-latest + emacs-version: snapshot + experimental: true + + steps: + - uses: actions/checkout@v3 + + - uses: jcs090218/setup-emacs@master + with: + version: ${{ matrix.emacs-version }} + + - uses: emacs-eask/setup-eask@master + with: + version: 'snapshot' + + - name: Run tests + run: + make ci diff --git a/.gitignore b/.gitignore index 0ef71f7..ac0a176 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ *~ .cask/ +.eask/ +/dist +*.elc .vagrant/ diff --git a/Eask b/Eask new file mode 100644 index 0000000..b9019ea --- /dev/null +++ b/Eask @@ -0,0 +1,19 @@ +(package "pythonic" + "0.2" + "Utility functions for writing pythonic emacs package") + +(website-url "https://github.com/proofit404/pythonic") +(keywords "convenience" "pythonic") + +(package-file "pythonic.el") + +(script "test" "echo \"Error: no test specified\" && exit 1") + +(source 'gnu) +(source 'melpa) + +(depends-on "emacs" "25.1") +(depends-on "s") +(depends-on "f") + +(setq network-security-level 'low) ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e92a368 --- /dev/null +++ b/Makefile @@ -0,0 +1,33 @@ +EMACS ?= emacs +EASK ?= eask + +.PHONY: clean checkdoc lint package install compile test + +ci: clean package install compile + +package: + @echo "Packaging..." + $(EASK) package + +install: + @echo "Installing..." + $(EASK) install + +compile: + @echo "Compiling..." + $(EASK) compile + +test: + @echo "Testing..." + $(EASK) test ert ./test/*.el + +checkdoc: + @echo "Run checkdoc..." + $(EASK) lint checkdoc + +lint: + @echo "Run package-lint..." + $(EASK) lint package + +clean: + $(EASK) clean all diff --git a/pythonic.el b/pythonic.el index 9a7f5cb..a24850b 100644 --- a/pythonic.el +++ b/pythonic.el @@ -1,4 +1,4 @@ -;;; pythonic.el --- Utility functions for writing pythonic emacs package. -*- lexical-binding: t; -*- +;;; pythonic.el --- Utility functions for writing pythonic emacs package -*- lexical-binding: t; -*- ;; Copyright (C) 2015-2021 by Artem Malyshev From 8968a2da42484dba25b104b358680f7f7ee0ceac Mon Sep 17 00:00:00 2001 From: JenChieh Date: Mon, 21 Aug 2023 10:22:56 -0700 Subject: [PATCH 07/18] fix: Add keywords --- pythonic.el | 1 + 1 file changed, 1 insertion(+) diff --git a/pythonic.el b/pythonic.el index a24850b..83611aa 100644 --- a/pythonic.el +++ b/pythonic.el @@ -6,6 +6,7 @@ ;; URL: https://github.com/proofit404/pythonic ;; Version: 0.2 ;; Package-Requires: ((emacs "25.1") (s "1.9") (f "0.17.2")) +;; Keywords: convenience pythonic ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by From 10634d3c156fc1c091230e1c0c5410cb0eda298a Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Mon, 21 Aug 2023 10:25:27 -0700 Subject: [PATCH 08/18] Add CI badge --- README.markdown | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 7fa4c9b..40c13b8 100644 --- a/README.markdown +++ b/README.markdown @@ -1,4 +1,9 @@ -# Pythonic [![MELPA](https://melpa.org/packages/pythonic-badge.svg)](https://melpa.org/#/pythonic) [![MELPA Stable](https://stable.melpa.org/packages/pythonic-badge.svg)](https://stable.melpa.org/#/pythonic) +[![MELPA](https://melpa.org/packages/pythonic-badge.svg)](https://melpa.org/#/pythonic) +[![MELPA Stable](https://stable.melpa.org/packages/pythonic-badge.svg)](https://stable.melpa.org/#/pythonic) + +# Pythonic + +[![CI](https://github.com/pythonic-emacs/pythonic/actions/workflows/test.yml/badge.svg)](https://github.com/pythonic-emacs/pythonic/actions/workflows/test.yml) Utility functions for writing pythonic emacs package. From 42df787123c3c2495837dc95f7738b8da5ed347c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 11:35:41 +0000 Subject: [PATCH 09/18] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bbc9581..fe3a9da 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,7 +37,7 @@ jobs: experimental: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: jcs090218/setup-emacs@master with: From 8250de0c1bc27e46175d11cfc14e5dac308cc02e Mon Sep 17 00:00:00 2001 From: JenChieh Date: Fri, 19 Jan 2024 18:02:34 -0800 Subject: [PATCH 10/18] chore: Test 29.2 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fe3a9da..2f321ef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: - 26.3 - 27.2 - 28.2 - - 29.1 + - 29.2 experimental: [false] include: - os: ubuntu-latest From 415cb10c6be935797e046cec751c6b9dbee3f63c Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Wed, 27 Mar 2024 00:11:49 -0700 Subject: [PATCH 11/18] ci: Bump Emacs 29.x to 3 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2f321ef..c533da9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: - 26.3 - 27.2 - 28.2 - - 29.2 + - 29.3 experimental: [false] include: - os: ubuntu-latest From 00f8cafe02bdac0f3e562ffe6881ce654c8eb588 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Tue, 7 May 2024 22:51:57 -0700 Subject: [PATCH 12/18] ci: Exclude macos tests below 27.x --- .github/workflows/test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c533da9..cffa08b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,6 +35,11 @@ jobs: - os: windows-latest emacs-version: snapshot experimental: true + exclude: + - os: macos-latest + emacs-version: 26.3 + - os: macos-latest + emacs-version: 27.2 steps: - uses: actions/checkout@v4 From c1e5643e044f1faaf6ecfadc719b981c048aeb79 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Sun, 21 Jul 2024 03:59:05 -0700 Subject: [PATCH 13/18] ci: Test Emacs 29.4 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cffa08b..950269d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: - 26.3 - 27.2 - 28.2 - - 29.3 + - 29.4 experimental: [false] include: - os: ubuntu-latest From 29464023d3f82b676bd67c2d972dc4613165114f Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Wed, 12 Feb 2025 21:32:24 -0800 Subject: [PATCH 14/18] Update .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index ac0a176..08dcc82 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ /dist *.elc .vagrant/ + +# OS generated +.DS_Store From 9eff417654c1fc3eca367c357b5b2cddb3fd8ce4 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Mon, 24 Feb 2025 09:59:40 -0800 Subject: [PATCH 15/18] c --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 950269d..3acc1ba 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,6 +24,7 @@ jobs: - 27.2 - 28.2 - 29.4 + - 30.1 experimental: [false] include: - os: ubuntu-latest From 5daa1b9f589c2faf0ee8165dbb470a4dc752122f Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Tue, 22 Apr 2025 16:21:40 -0700 Subject: [PATCH 16/18] fix: Warning missing lexical-binding cookie --- Eask | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Eask b/Eask index b9019ea..6e09991 100644 --- a/Eask +++ b/Eask @@ -1,3 +1,5 @@ +;; -*- mode: eask; lexical-binding: t -*- + (package "pythonic" "0.2" "Utility functions for writing pythonic emacs package") From 44d8e661149392cbb3082657b0887ea05082148e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 12:17:07 -0700 Subject: [PATCH 17/18] Bump actions/checkout from 4 to 5 (#24) Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3acc1ba..6d8b2a5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,7 +43,7 @@ jobs: emacs-version: 27.2 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: jcs090218/setup-emacs@master with: From bf364a29e2f21828941ee3d11a27127bc260740f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Nov 2025 04:05:14 -0800 Subject: [PATCH 18/18] Bump actions/checkout from 5 to 6 (#25) Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d8b2a5..6602f60 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,7 +43,7 @@ jobs: emacs-version: 27.2 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: jcs090218/setup-emacs@master with: